From owner-freebsd-ports Sat May 30 10:50:17 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id KAA08138 for freebsd-ports-outgoing; Sat, 30 May 1998 10:50:17 -0700 (PDT) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id KAA08120 for ; Sat, 30 May 1998 10:50:12 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id KAA05892; Sat, 30 May 1998 10:50:01 -0700 (PDT) Received: (from nobody@localhost) by hub.freebsd.org (8.8.8/8.8.8) id KAA06842; Sat, 30 May 1998 10:43:08 -0700 (PDT) (envelope-from nobody) Message-Id: <199805301743.KAA06842@hub.freebsd.org> Date: Sat, 30 May 1998 10:43:08 -0700 (PDT) From: hetzels@westbend.net To: freebsd-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: www-1.0 Subject: ports/6797: The requested URL /_vti_bin/shtml.dll/prod01.htm not found Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 6797 >Category: ports >Synopsis: The requested URL /_vti_bin/shtml.dll/prod01.htm not found >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat May 30 10:50:00 PDT 1998 >Last-Modified: >Originator: Scot W. Hetzel >Organization: West Bend Internet >Release: FreeBSD 2.2.6-STABLE >Environment: >Description: I have seen reports where FrontPage tries to use shtml.dll instead of shtml.exe on forms, which will give the file not found error. The problem is most likely caused by ftping the files from a Windows web server to a Unix web server. >How-To-Repeat: Unknown - I have tried to re-create the problem with Forms on a unix server and FrontPage, but all the pages I created had shtml.exe in them. >Fix: The attached patch will mask this problem by replacing shtml.dll with shtml.exe when the url is run through the FrontPage Module. diff -ruN apache-fp/patches/patch-ad apache-fp.126.f/patches/patch-ad --- apache-fp/patches/patch-ad Thu May 28 23:46:54 1998 +++ apache-fp.126.f/patches/patch-ad Tue May 26 20:18:44 1998 @@ -13,7 +13,7 @@ # This is combined with the information in the "Configuration" file # by the configure script to make the actual Makefile. -! CFLAGS+=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) -DSERVER_SUBVERSION=\"FrontPage/3.0.4\" +! CFLAGS+=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) -DSERVER_SUBVERSION=\"FrontPage/3.0.4.1\" LIBS=$(EXTRA_LIBS) $(LIBS1) INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES) LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS) diff -ruN apache-fp/patches/patch-fc apache-fp.126.f/patches/patch-fc --- apache-fp/patches/patch-fc Thu May 28 23:46:54 1998 +++ apache-fp.126.f/patches/patch-fc Fri May 29 20:53:23 1998 @@ -1,5 +1,5 @@ -*** src/mod_frontpage.c.orig Wed Apr 29 15:08:30 1998 ---- src/mod_frontpage.c Wed Apr 29 15:22:45 1998 +*** src/mod_frontpage.c.orig Fri May 29 20:40:34 1998 +--- src/mod_frontpage.c Fri May 29 20:51:53 1998 *************** *** 44,50 **** #if defined(SCO) @@ -46,21 +46,29 @@ #else #define RAND_CMD "/bin/ps -ea | /bin/sum ; /bin/ps -ea | /bin/sum" *************** -*** 706,718 **** - /* - * Test for FrontPage server extenders: - * .../_vti_bin/shtml.exe... - * .../_vti_bin/fpcount.exe... - * .../_vti_bin/_vti_aut/author.exe... - * .../_vti_bin/_vti_adm/admin.exe... - */ - if (szCgi = strstr(szVti, AUTHOR )) - return FrontPageAlias(r, szCgi, AUTHOR); -! if (szCgi = strstr(szVti, SHTML )) - return FrontPageAlias(r, szCgi, SHTML); - if (szCgi = strstr(szVti, ADMIN )) - return FrontPageAlias(r, szCgi, ADMIN); ---- 708,721 ---- +*** 675,680 **** +--- 677,694 ---- + return OK; + } + ++ char *rightstr( ++ char src[], ++ int offset) ++ { ++ int i; ++ char *save = src; ++ ++ for (i=0; src[offset+i] != '\0'; i++) ++ src[i] = src[i + offset]; ++ src[i] = '\0'; ++ return(save); ++ } + + /* + * This routine looks for shtml.exe, fpcount.exe, author.exe and admin.exe +*************** +*** 706,711 **** +--- 720,726 ---- /* * Test for FrontPage server extenders: * .../_vti_bin/shtml.exe... @@ -68,10 +76,17 @@ * .../_vti_bin/fpcount.exe... * .../_vti_bin/_vti_aut/author.exe... * .../_vti_bin/_vti_adm/admin.exe... - */ - if (szCgi = strstr(szVti, AUTHOR )) +*************** +*** 714,719 **** +--- 729,739 ---- return FrontPageAlias(r, szCgi, AUTHOR); -! if ((szCgi = strstr(szVti, SHTML )) || (szCgi = strstr(szVti, SHTML2))) + if (szCgi = strstr(szVti, SHTML )) return FrontPageAlias(r, szCgi, SHTML); ++ if (szCgi = strstr(szVti, SHTML2 )) ++ { ++ szCgi = pstrcat(r->pool, SHTML, rightstr(szCgi, strlen(SHTML2)), NULL); ++ return FrontPageAlias(r, szCgi, SHTML); ++ } if (szCgi = strstr(szVti, ADMIN )) return FrontPageAlias(r, szCgi, ADMIN); + if (szCgi = strstr(szVti, FPCOUNT)) >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message