cvs commit: apache-1.3 STATUS
coar98/07/20 16:38:35 Modified:.STATUS Log: Some 80-col cleanups and votes. Revision ChangesPath 1.445 +27 -20apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.444 retrieving revision 1.445 diff -u -r1.444 -r1.445 --- STATUS1998/07/20 17:16:40 1.444 +++ STATUS1998/07/20 23:38:34 1.445 @@ -21,68 +21,74 @@ Documentation that needs writing: * Need a document explaining mod_rewrite/UseCanonicalName off based - virtualhosting. (If it exists already I can't find it easily.) + virtualhosting. (If it exists already I can't find it easily.) Available Patches: -* [PATCH] PR2356 - SSI exec - Message-ID: [EMAIL PROTECTED] +* Bill Stoddard's [PATCH] PR2356 - SSI exec This is an update of a patch I sent in earlier. There are 13 new lines of code to detect and handle shellcmd. COMMAND.COM is used to exec the script on Win95, CMD.EXE on NT. + Message-ID: [EMAIL PROTECTED] + Status: Ken +1 (on concept) * [PATCH] Link DSO modules against possible libraries from $(LIBS) - Message-ID: [EMAIL PROTECTED] In the configuration process we already determine the variable LDFLAGS and LIBS. They hold -L and -l options for linking executables. We parse these options and separate them into three classes: OBJ, PIC and DSO. And then we re-assemble a LIBS_SHLIB variable from only the options in classes PIC and DSO. This variable is then used on the build command for mod_xxx.so. - Status: Ralf +1 + Message-ID: [EMAIL PROTECTED] + Status: Ralf +1 * Filenames containing whitespace characters caused problems for directives Bill Stoddard [EMAIL PROTECTED] Message-ID: [EMAIL PROTECTED] -* PR#2483 reports that RewriteMap program still don't work under Win32 because - of a SIGSEGV. The reporter is right, ap_spawn_child_core() calls the child - function with NULL while in the child function the file handles have to be - available. I've assembled the above patch from the reporters description/patch - for testing by our Win32 folks. (I cannot test it myself). +* PR#2483 reports that RewriteMap program still don't work under Win32 + because of a SIGSEGV. The reporter is right, ap_spawn_child_core() + calls the child function with NULL while in the child function the + file handles have to be available. I've assembled the above patch + from the reporters description/patch for testing by our Win32 folks. + (I cannot test it myself). Ralf S. Engelschall [EMAIL PROTECTED] Message-ID: [EMAIL PROTECTED] Status: Ralf +1 -* This patch makes some structural changes to ap_call_exec to make it more - readable and friendly to a couple of patches that will follow (capability to - query the Win32 registry for interpreter name and a fix for mod_include - exec=cmd processing). This patch does not change the function of ap_call_exec. - W G Stoddard [EMAIL PROTECTED] +* Bill Stoddard's patch to make some structural changes to ap_call_exec to + make it more readable and friendly to a couple of patches that will + follow (capability to query the Win32 registry for interpreter name + and a fix for mod_include exec=cmd processing). This patch does not + change the function of ap_call_exec. Message-ID: [EMAIL PROTECTED] + Status: Ken +1 (on concept) * Configure tweaks to support building outside the source tree, and add more customizeability for installation layout, by Wilfredo Sanchez [EMAIL PROTECTED] Message-Id: [EMAIL PROTECTED] - Status: Ralf -1 (because it is too huge, has to be cleaned up and splitted) + Status: Ralf -1 (because it is too huge, has to be cleaned up and + split) * Rhapsody port, by Wilfredo Sanchez [EMAIL PROTECTED] Message-Id: [EMAIL PROTECTED] + Status: Ken +1 (on concept) * Ralf's [PATCH] Fix module init This fixes the mod_so/mod_perl problems described under FINAL RELEASE SHOWSTOPPERS by doing a more correct init of the modules after loading through two new core API functions. - [EMAIL PROTECTED] - Status: Ralf +1 + Message-ID: [EMAIL PROTECTED] + Status: Ralf +1 * Paul's patch to add integrated restart/shutdown signalling (Win32) This patch make Apache listen on predictable event names to allow restarts and shutdowns to be initiated. Also adds a new command line option to send the shutdown or restart signal to the running parent
cvs commit: apache-1.3/src/os/win32 modules.c
manoj 98/07/20 17:07:00 Modified:src/os/win32 modules.c Log: Correcting misleading comment about manually editing this file Revision ChangesPath 1.9 +3 -2 apache-1.3/src/os/win32/modules.c Index: modules.c === RCS file: /export/home/cvs/apache-1.3/src/os/win32/modules.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- modules.c 1998/04/11 12:01:06 1.8 +++ modules.c 1998/07/21 00:06:59 1.9 @@ -1,5 +1,6 @@ -/* modules.c --- automatically generated by Apache - * configuration script. DO NOT HAND EDIT! +/* modules.c --- major modules compiled into Apache for Win32. + * Only insert an entry for a module if it must be compiled into + * the core server */ #include httpd.h
cvs commit: apache-1.3/htdocs/manual windows.html
pcs 98/07/21 02:33:29 Modified:htdocs/manual windows.html Log: Be more explicit when explaining how to compile from DSP files. Add references to the projects to build uri_delims and test_chars files. Give a suggested compilation order. Revision ChangesPath 1.18 +18 -10apache-1.3/htdocs/manual/windows.html Index: windows.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/windows.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- windows.html 1998/06/16 02:40:32 1.17 +++ windows.html 1998/07/21 09:33:29 1.18 @@ -413,17 +413,25 @@ track down problems./P PApache can also be compiled using VC++'s Visual Studio development - environment. Although compiling Apache in this manner is not as simple, - it makes it possible to easily modify the Apache source, or to compile - Apache if the command-line tools are not installed./P + environment. Although compiling Apache in this manner is not as + simple, it makes it possible to easily modify the Apache source, or + to compile Apache if the command-line tools are not installed. + Project files (CODE.DSP/CODE) are included for each of the + portions of Apache. To build Apache from the these projects files + you will need to build the following projects iin this order/i: -PProject files (CODE.DSP/CODE) are included for each of the - portions of Apache. The three projects that are necessary for - Apache to run are CODEApache.dsp/CODE, CODEap/ap.dsp/CODE, - CODEregex/regex.dsp/CODE, CODEApacheCore.dsp/CODE and - CODEos/win32/ApacheOS.dsp/CODE. The CODEsrc/win32/CODE - subdirectory contains project files for the optional modules (see - below)./P + OL + LICODEos\win32\ApacheOS.dsp/CODE + LICODEregex\regex.dsp/CODE + LICODEap\ap.dsp/CODE + LICODEmain\gen_uri_delims.dsp/CODE + LICODEmain\gen_test_char.dsp/CODE + LICODEApacheCore.dsp/CODE + LICODEApache.dsp/CODE + /OL + + In addition, the CODEsrc\os\win32/CODE subdirectory contains + project files for the optional modules (see below)./P POnce Apache has been compiled, it needs to be installed in its server root directory. The default is the CODE\Apache/CODE
cvs commit: apache-1.3/src CHANGES Configure
rse 98/07/21 03:20:27 Modified:src CHANGES Configure Log: Fix SHARED_CORE rule: The CFLAGS_SHLIB variable is no longer doubled (compilers complained) and the .so.V.R.P filename extension was adjusted to correctly reflect the 1.3.2 version. PR: 2644 Revision ChangesPath 1.974 +5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.973 retrieving revision 1.974 diff -u -r1.973 -r1.974 --- CHANGES 1998/07/20 16:40:37 1.973 +++ CHANGES 1998/07/21 10:20:24 1.974 @@ -1,5 +1,10 @@ Changes with Apache 1.3.2 + *) Fix SHARED_CORE rule: The CFLAGS_SHLIB variable is no longer doubled + (compilers complained) and the .so.V.R.P filename extension was adjusted + to correctly reflect the 1.3.2 version. + [Ralf S. Engelschall] PR#2644 + *) SECURITY: Plug ... and other canonicalization holes under OS/2. [Brian Havard] 1.280 +21 -21apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.279 retrieving revision 1.280 diff -u -r1.279 -r1.280 --- Configure 1998/07/18 10:51:52 1.279 +++ Configure 1998/07/21 10:20:25 1.280 @@ -1057,25 +1057,6 @@ fi -## Set the value of the shared libary flags, if they aren't explicitly -## set in the configuration file -## -if [ x$using_shlib = x1 ] ; then -if [ x$TCFLAGS_SHLIB = x ]; then -echo CFLAGS_SHLIB=$CFLAGS_SHLIB -DSHARED_MODULE Makefile.config -fi -if [ x$TLD_SHLIB = x ]; then -echo LD_SHLIB=$LD_SHLIB Makefile.config -fi -if [ x$TLDFLAGS_SHLIB = x ]; then -echo LDFLAGS_SHLIB=$LDFLAGS_SHLIB Makefile.config -fi -if [ x$TLDFLAGS_SHLIB_EXPORT = x ]; then -echo LDFLAGS_SHLIB_EXPORT=$LDFLAGS_SHLIB_EXPORT Makefile.config -fi -fi - - ## Now we do some OS specific adjustments... for some OSs, we need ## to adjust CFLAGS and/or OPTIM depending on which compiler we ## are going to use. This is easy, since this can be gleamed from @@ -1401,7 +1382,7 @@ RULE_SHARED_CORE=$DEF_SHARED_CORE fi if [ .$RULE_SHARED_CORE = .yes ]; then -echo + enabling generation of Apache core as DSO +echo + enabling generation of Apache core as DSO #shuffle compiler flags from shlib variant to standard CFLAGS=$CFLAGS $CFLAGS_SHLIB CFLAGS_SHLIB= @@ -1410,7 +1391,7 @@ #select the special subtarget for shared core generation SUBTARGET=target_shared #determine additional suffixes for libhttpd.so -V=1 R=3 P=0 +V=1 R=3 P=2 if [ .$SHLIB_SUFFIX_DEPTH = .0 ]; then SHLIB_SUFFIX_LIST= fi @@ -1426,6 +1407,25 @@ if [ .$SHLIB_SUFFIX_DEPTH = .all ]; then SHLIB_SUFFIX_LIST=$V $V.$R $V.$R.$P fi +fi +fi + + +## Set the value of the shared libary flags, if they aren't explicitly +## set in the configuration file +## +if [ x$using_shlib = x1 ] ; then +if [ x$TCFLAGS_SHLIB = x ]; then +echo CFLAGS_SHLIB=$CFLAGS_SHLIB -DSHARED_MODULE Makefile.config +fi +if [ x$TLD_SHLIB = x ]; then +echo LD_SHLIB=$LD_SHLIB Makefile.config +fi +if [ x$TLDFLAGS_SHLIB = x ]; then +echo LDFLAGS_SHLIB=$LDFLAGS_SHLIB Makefile.config +fi +if [ x$TLDFLAGS_SHLIB_EXPORT = x ]; then +echo LDFLAGS_SHLIB_EXPORT=$LDFLAGS_SHLIB_EXPORT Makefile.config fi fi
cvs commit: apache-devsite how-to-release.html
rse 98/07/21 03:28:45 Modified:.how-to-release.html Log: Make sure the V.R.P triple for SHARED_CORE is correct when releasing. Revision ChangesPath 1.42 +7 -1 apache-devsite/how-to-release.html Index: how-to-release.html === RCS file: /export/home/cvs/apache-devsite/how-to-release.html,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- how-to-release.html 1998/06/07 01:49:58 1.41 +++ how-to-release.html 1998/07/21 10:28:43 1.42 @@ -135,9 +135,15 @@ ``CODE1XXYYZZ/CODE'' to ``CODE1XXYYSTRONG99/STRONG/CODE''. The format is something like CODEprintf(%d%02d%02d%02d, major, minor, bugfix, - betaseq)/CODE.BR + betaseq)/CODE. Additionally make sure the Configure scripts version + knowledge for the CODESHARED_CORE/CODE reflects the correct + version.revision.patchlevel triple. Look for the line ``CODEV=1 R=3 + P=2/CODE'' inside CODEsrc/Configure/CODE and adjust it accordingly. + BR CODESTRONG$ vi src/include/httpd.h/STRONG/CODEBR CODESTRONG$ cvs commit src/include/httpd.h/STRONG/CODE + CODESTRONG$ vi src/Configure/STRONG/CODEBR + CODESTRONG$ cvs commit src/Configure/STRONG/CODE P If the release is going from beta to non-beta, or non-beta to a beta, also update the Windows registry key release. See
cvs commit: apache-1.3/src/include ap_config.h
dgaudet 98/07/21 08:03:08 Modified:src/include ap_config.h Log: OS/2 should only need serialization when multiple listens Revision ChangesPath 1.229 +1 -0 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- ap_config.h 1998/07/20 16:37:09 1.228 +++ ap_config.h 1998/07/21 15:03:06 1.229 @@ -672,6 +672,7 @@ #define USE_OS2_SCOREBOARD #define NO_RELIABLE_PIPED_LOGS #define USE_OS2SEM_SERIALIZED_ACCEPT +#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT #elif defined(__MACHTEN__) typedef int rlim_t;
cvs commit: apache-1.3/src/modules/proxy mod_proxy.c
martin 98/07/21 08:39:44
Modified:.STATUS
src CHANGES
src/modules/proxy mod_proxy.c
Log:
Added Max-Forwards: trace support to the proxy
Revision ChangesPath
1.446 +3 -1 apache-1.3/STATUS
Index: STATUS
===
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -u -r1.445 -r1.446
--- STATUS1998/07/20 23:38:34 1.445
+++ STATUS1998/07/21 15:39:39 1.446
@@ -269,6 +269,8 @@
In progress:
+* Martin's busy adding Via: support to the proby
+
* Ben's ASP work... All agree it sounds cool.
* DDA's adding a tray application to the Windoze version for ease of
@@ -433,7 +435,7 @@
2) Expect
3) byte range error handling
4) update the Accept-Encoding parser to allow q-values
-5) would be nice if the proxy used Via and Max-Forwards, even as
+5) would be nice if the proxy used Via, even as
HTTP/1.0
* #ifdef __EMX__ -- #ifdef OS2.
1.975 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.974
retrieving revision 1.975
diff -u -u -r1.974 -r1.975
--- CHANGES 1998/07/21 10:20:24 1.974
+++ CHANGES 1998/07/21 15:39:40 1.975
@@ -1,5 +1,9 @@
Changes with Apache 1.3.2
+ *) Add support for the Max-Forwards: header line required by RFC2068 for
+ the TRACE method. This allows apache to TRACE along a chain of proxies
+ up to a predetermined depth. [Martin Kraemer]
+
*) Fix SHARED_CORE rule: The CFLAGS_SHLIB variable is no longer doubled
(compilers complained) and the .so.V.R.P filename extension was adjusted
to correctly reflect the 1.3.2 version.
1.56 +17 -0 apache-1.3/src/modules/proxy/mod_proxy.c
Index: mod_proxy.c
===
RCS file: /home/cvs/apache-1.3/src/modules/proxy/mod_proxy.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -u -r1.55 -r1.56
--- mod_proxy.c 1998/07/09 19:45:55 1.55
+++ mod_proxy.c 1998/07/21 15:39:42 1.56
@@ -290,9 +290,26 @@
int i, rc;
struct cache_req *cr;
int direct_connect = 0;
+const char *maxfwd_str;
if (!r-proxyreq || strncmp(r-filename, proxy:, 6) != 0)
return DECLINED;
+
+if (r-method_number == M_TRACE
+ (maxfwd_str = ap_table_get(r-headers_in, Max-Forwards)) != NULL) {
+ int maxfwd = strtol(maxfwd_str, NULL, 10);
+ if (maxfwd 1) {
+ int access_status;
+ r-proxyreq = 0;
+ if ((access_status = ap_send_http_trace(r)))
+ ap_die(access_status, r);
+ else
+ ap_finalize_request_protocol(r);
+ return OK;
+ }
+ ap_table_setn(r-headers_in, Max-Forwards,
+ ap_psprintf(r-pool, %d, (maxfwd 0) ? maxfwd-1 : 0));
+}
if ((rc = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR)))
return rc;
