>Number: 2270 >Category: general >Synopsis: Required Patches to Apache sources for FrontPage Module >Confidential: no >Severity: non-critical >Priority: medium >Responsible: apache >State: open >Class: change-request >Submitter-Id: apache >Arrival-Date: Sat May 23 13:10:00 PDT 1998 >Last-Modified: >Originator: [EMAIL PROTECTED] >Organization: apache >Release: 1.3b8-dev >Environment: FreeBSD 2.26-STABLE, gcc >Description: I am maintaning the Apache FrontPage port for FreeBSD, and have successfully made the FrontPage module compile with apache v1.2. Recently, I have modified the FrontPage module to work with Apache v1.3b6 & b8. The b8 version of mod_frontpage.c uses the ap_add_version_component function to add the FrontPage modules version info to the server version.
With out the attached patches, the FrontPage module could not be destributed as a compiled DSO module to Apache 1.3 servers. Thanks Scot W. Hetzel PS: The FrontPage Module is available from; http://www.westbend.net/~hetzels/apache-fp/apache-fp.13b8-dev/files/mod_frontpage.c >How-To-Repeat: >Fix: Index: apache-1.3/Makefile.tmpl =================================================================== RCS file: /cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.36 diff -c -u -r1.36 Makefile.tmpl /usr/bin/diff: conflicting specifications of output style --- Makefile.tmpl 1998/05/12 11:52:11 1.36 +++ Makefile.tmpl 1998/05/23 19:38:16 @@ -367,9 +367,10 @@ cat $(TOP)/conf/$${conf}-dist ) |\ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \ -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \ - -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \ + -e 's;@@ServerRoot@@/srm.conf;$(sysconfdir)/srm.conf;' \ + -e 's;@@ServerRoot@@/access.conf;$(sysconfdir)/access.conf;' \ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \ -e 's;@@ServerRoot@@;$(prefix);' \ -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \ Index: apache-1.3/conf/httpd.conf-dist =================================================================== RCS file: /cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.27 diff -c -u -r1.27 httpd.conf-dist /usr/bin/diff: conflicting specifications of output style --- httpd.conf-dist 1998/05/06 21:12:39 1.27 +++ httpd.conf-dist 1998/05/23 19:38:16 @@ -65,6 +65,16 @@ ServerRoot @@ServerRoot@@ +# AccessConfig: The name and location of the Access Configuration file +# + +AccessConfig @@ServerRoot@@/access.conf + +# ResourceConfig: The name and location of the Resource Configuration file +# + +ResourceConfig @@ServerRoot@@/srm.conf + # BindAddress: You can support virtual hosts with this option. This option # is used to tell the server which IP address to listen to. It can either # contain "*", an IP address, or a fully qualified Internet domain name. Index: apache-1.3/src/include/httpd.h =================================================================== RCS file: /cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.214 diff -c -u -r1.214 httpd.h /usr/bin/diff: conflicting specifications of output style --- httpd.h 1998/05/22 00:37:29 1.214 +++ httpd.h 1998/05/23 19:38:18 @@ -689,7 +689,12 @@ char *unparsed_uri; /* the uri without any parsing performed */ char *uri; /* the path portion of the URI */ - char *filename; + char *execfilename; /* physical filename to exec */ + char *filename; /* logical filename to exec -- always the same + * except for FrontPage CGI programs where we + * will execute the CGI program in + * /usr/local/frontpage.... + */ char *path_info; char *args; /* QUERY_ARGS, if any */ struct stat finfo; /* ST_MODE set to zero if no such file */ Index: apache-1.3/src/main/http_request.c =================================================================== RCS file: /cvs/apache-1.3/src/main/http_request.c,v retrieving revision 1.121 diff -c -u -r1.121 http_request.c /usr/bin/diff: conflicting specifications of output style --- http_request.c 1998/05/02 23:25:46 1.121 +++ http_request.c 1998/05/23 19:38:19 @@ -186,6 +186,8 @@ return OK; } + if (r->execfilename) path = r->execfilename; + #ifdef WIN32 /* If the path is x:/, then convert it to x:/., coz that's what stat needs to work properly */ if(strlen(path) == 3 && path[1] == ':') { @@ -460,9 +462,11 @@ res = ap_parse_htaccess(&htaccess_conf, r, overrides_here, ap_pstrdup(r->pool, test_dirname), sconf->access_name); + if (res && r-execfilename) r->filename = r->execfilename; if (res) return res; + if (r->execfilename) r->filename = r->execfilename; if (htaccess_conf) per_dir_defaults = ap_merge_per_dir_configs(r->pool, per_dir_defaults, Index: apache-1.3/src/main/util.c =================================================================== RCS file: /cvs/apache-1.3/src/main/util.c,v retrieving revision 1.115 diff -c -u -r1.115 util.c /usr/bin/diff: conflicting specifications of output style --- util.c 1998/05/09 14:27:27 1.115 +++ util.c 1998/05/23 19:38:19 @@ -582,7 +582,7 @@ char *res; for (x = 0; (*line)[x]; x++) { - if (isspace((*line)[x])) { + if (isspace((*line)[x]) && ((*line)[x] & 0x80)==0) { pos = x; break; } >Audit-Trail: >Unformatted: [In order for any reply to be added to the PR database, ] [you need to include <[EMAIL PROTECTED]> in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ]
