cvs commit: apache-1.3/src/os/win32 ApacheModuleStatus.mak
ben 98/08/12 12:22:21 Modified:src/include http_conf_globals.h src/main http_main.c src/os/win32 ApacheModuleStatus.mak Log: Make Win32 work again. Revision ChangesPath 1.34 +1 -1 apache-1.3/src/include/http_conf_globals.h Index: http_conf_globals.h === RCS file: /export/home/cvs/apache-1.3/src/include/http_conf_globals.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- http_conf_globals.h 1998/08/11 00:09:43 1.33 +++ http_conf_globals.h 1998/08/12 19:22:18 1.34 @@ -85,7 +85,7 @@ extern MODULE_VAR_EXPORT int ap_suexec_enabled; extern int ap_listenbacklog; extern int ap_dump_settings; -extern int ap_extended_status; +extern API_VAR_EXPORT int ap_extended_status; extern char *ap_pid_fname; extern char *ap_scoreboard_fname; 1.386 +1 -1 apache-1.3/src/main/http_main.c Index: http_main.c === RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.385 retrieving revision 1.386 diff -u -r1.385 -r1.386 --- http_main.c 1998/08/12 10:33:39 1.385 +++ http_main.c 1998/08/12 19:22:18 1.386 @@ -247,7 +247,7 @@ int ap_suexec_enabled = 0; int ap_listenbacklog; int ap_dump_settings; -int ap_extended_status = 0; +API_VAR_EXPORT int ap_extended_status = 0; /* * The max child slot ever assigned, preserved across restarts. Necessary 1.13 +63 -33apache-1.3/src/os/win32/ApacheModuleStatus.mak Index: ApacheModuleStatus.mak === RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleStatus.mak,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ApacheModuleStatus.mak1998/04/09 08:20:33 1.12 +++ ApacheModuleStatus.mak1998/08/12 19:22:20 1.13 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleStatus - Win32 Release" OUTDIR=.\ApacheModuleStatusR @@ -62,12 +58,46 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\ "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleStatus.pch" /YX\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\ApacheModuleStatusR/ CPP_SBRS=. + +.c{$(CPP_OBJS)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(CPP_OBJS)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(CPP_OBJS)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(CPP_SBRS)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(CPP_SBRS)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(CPP_SBRS)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleStatus.bsc" BSC32_SBRS= \ @@ -117,32 +147,13 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" +CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\ "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleStatus.pch"\ /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\ApacheModuleStatusD/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleStatus.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb" /debug\ - /machine:I386 /out:"$(OUTDIR)\ApacheModuleStatus.dll"\ - /implib:"$(OUTDIR)\ApacheModuleStatus.lib" -LINK32_OBJS= \ - "$(INTDIR)\mod_status.obj" -"$(OUTDIR)\ApacheModuleStatus.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) -$(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - .c{$(CPP_OBJS)}.obj:: $(CPP) @<< $(CPP_PROJ) $< @@ -173,7 +184,30 @@ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleStatus.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ + winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ + /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb" /debug\ + /machine:I38
cvs commit: apache-1.3/src Configure
jim 98/08/12 10:04:49 Modified:src Configure Log: Work around broken sed/awk on AUX Revision ChangesPath 1.284 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.283 retrieving revision 1.284 diff -u -r1.283 -r1.284 --- Configure 1998/08/03 19:59:56 1.283 +++ Configure 1998/08/12 17:04:47 1.284 @@ -1476,7 +1476,7 @@ ## Now create modules.c ## -sed 's/_module//' $tmpfile | awk >modules.c ' +cat $tmpfile | sed 's/_module//' | awk >modules.c ' BEGIN { modules[n++] = "core" pmodules[pn++] = "core"
cvs commit: apache-1.3 Makefile.tmpl
rse 98/08/12 04:33:38 Modified:src CHANGES .Makefile.tmpl Log: Fix suexec installation under `make install root=xxx' situation. Revision ChangesPath 1.1022+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1021 retrieving revision 1.1022 diff -u -r1.1021 -r1.1022 --- CHANGES 1998/08/12 10:39:09 1.1021 +++ CHANGES 1998/08/12 11:33:35 1.1022 @@ -1,5 +1,8 @@ Changes with Apache 1.3.2 + *) Fix suexec installation under `make install root=xxx' situation. + [Ralf S. Engelschall] + *) Extend the output of the -V switch to include the paths of all compiled-in configuration files, if they were overridden at compile time, for least astonishment of the user. 1.45 +4 -4 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- Makefile.tmpl 1998/07/25 12:43:20 1.44 +++ Makefile.tmpl 1998/08/12 11:33:37 1.45 @@ -315,10 +315,10 @@ [EMAIL PROTECTED] [ ".$(suexec)" = .1 ]; then \ echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec"; \ $(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec; \ - echo "chown root $(sbindir)/suexec"; \ - chown root $(sbindir)/suexec; \ - echo "chmod 4711 $(sbindir)/suexec"; \ - chmod 4711 $(sbindir)/suexec; \ + echo "chown root $(root)$(sbindir)/suexec"; \ + chown root $(root)$(sbindir)/suexec; \ + echo "chmod 4711 $(root)$(sbindir)/suexec"; \ + chmod 4711 $(root)$(sbindir)/suexec; \ echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8"; \ $(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8; \ fi
cvs commit: apache-1.3/src CHANGES
martin 98/08/12 03:39:14 Modified:src CHANGES Log: Note change in output of -V switch Revision ChangesPath 1.1021+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1020 retrieving revision 1.1021 diff -u -u -r1.1020 -r1.1021 --- CHANGES 1998/08/11 20:28:17 1.1020 +++ CHANGES 1998/08/12 10:39:09 1.1021 @@ -1,5 +1,10 @@ Changes with Apache 1.3.2 + *) Extend the output of the -V switch to include the paths of all + compiled-in configuration files, if they were overridden at + compile time, for least astonishment of the user. + [Martin Kraemer] + *) When READing a request in ExtendedStatus mode, the "old" vhost, request and client information is not displayed. [Jim Jagielski]
cvs commit: apache-1.3/src/main http_main.c
martin 98/08/12 03:33:40 Modified:src/main http_main.c Log: Extend the output of the -V switch to include the paths of all compiled-in configuration files, if they were overridden at compile time, for least astonishment of the user. Revision ChangesPath 1.385 +38 -3 apache-1.3/src/main/http_main.c Index: http_main.c === RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.384 retrieving revision 1.385 diff -u -u -r1.384 -r1.385 --- http_main.c 1998/08/11 20:28:22 1.384 +++ http_main.c 1998/08/12 10:33:39 1.385 @@ -3232,9 +3232,6 @@ #ifdef SECURITY_HOLE_PASS_AUTHORIZATION printf(" -D SECURITY_HOLE_PASS_AUTHORIZATION\n"); #endif -#ifdef HTTPD_ROOT -printf(" -D HTTPD_ROOT=\"" HTTPD_ROOT "\"\n"); -#endif #ifdef HAVE_MMAP printf(" -D HAVE_MMAP\n"); #endif @@ -3306,6 +3303,44 @@ #endif #ifdef SHARED_CORE printf(" -D SHARED_CORE\n"); +#endif + +/* This list displays the compiled-in default paths: */ +#ifdef HTTPD_ROOT +printf(" -D HTTPD_ROOT=\"" HTTPD_ROOT "\"\n"); +#endif +#ifdef SUEXEC_BIN +printf(" -D SUEXEC_BIN=\"" SUEXEC_BIN "\"\n"); +#endif +#ifdef SHARED_CORE_DIR +printf(" -D SHARED_CORE_DIR=\"" SHARED_CORE_DIR "\"\n"); +#endif +#ifdef DEFAULT_PIDLOG +printf(" -D DEFAULT_PIDLOG=\"" DEFAULT_PIDLOG "\"\n"); +#endif +#ifdef DEFAULT_SCOREBOARD +printf(" -D DEFAULT_SCOREBOARD=\"" DEFAULT_SCOREBOARD "\"\n"); +#endif +#ifdef DEFAULT_LOCKFILE +printf(" -D DEFAULT_LOCKFILE=\"" DEFAULT_LOCKFILE "\"\n"); +#endif +#ifdef DEFAULT_XFERLOG +printf(" -D DEFAULT_XFERLOG=\"" DEFAULT_XFERLOG "\"\n"); +#endif +#ifdef DEFAULT_ERRORLOG +printf(" -D DEFAULT_ERRORLOG=\"" DEFAULT_ERRORLOG "\"\n"); +#endif +#ifdef TYPES_CONFIG_FILE +printf(" -D TYPES_CONFIG_FILE=\"" TYPES_CONFIG_FILE "\"\n"); +#endif +#ifdef SERVER_CONFIG_FILE +printf(" -D SERVER_CONFIG_FILE=\"" SERVER_CONFIG_FILE "\"\n"); +#endif +#ifdef ACCESS_CONFIG_FILE +printf(" -D ACCESS_CONFIG_FILE=\"" ACCESS_CONFIG_FILE "\"\n"); +#endif +#ifdef RESOURCE_CONFIG_FILE +printf(" -D RESOURCE_CONFIG_FILE=\"" RESOURCE_CONFIG_FILE "\"\n"); #endif }
cvs commit: apache-1.3/src/modules/standard mod_status.c
martin 98/08/12 03:23:47 Modified:src/modules/standard mod_status.c Log: Add missing space Revision ChangesPath 1.98 +1 -1 apache-1.3/src/modules/standard/mod_status.c Index: mod_status.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_status.c,v retrieving revision 1.97 retrieving revision 1.98 diff -u -u -r1.97 -r1.98 --- mod_status.c 1998/08/12 00:13:33 1.97 +++ mod_status.c 1998/08/12 10:23:46 1.98 @@ -692,7 +692,7 @@ } else { -ap_rputs("To obtain a full report with current status information", r); +ap_rputs("To obtain a full report with current status information ", r); ap_rputs("you need to use the ExtendedStatus On directive. \n", r); }
cvs commit: apache-1.3/htdocs/manual/mod core.html
fielding98/08/11 17:31:45 Modified:htdocs/manual/mod core.html Log: Forgot that LimitRequestBody is allowed everywhere. Revision ChangesPath 1.132 +2 -1 apache-1.3/htdocs/manual/mod/core.html Index: core.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/core.html,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- core.html 1998/08/12 00:29:14 1.131 +++ core.html 1998/08/12 00:31:44 1.132 @@ -1345,7 +1345,8 @@ Context: server config +>Context: server config, virtual host, directory, +.htaccess
cvs commit: apache-1.3/htdocs/manual/mod core.html directives.html
fielding98/08/11 17:29:16 Modified:htdocs/manual/mod core.html directives.html Log: Documentation for the LimitRequest* directives. Revision ChangesPath 1.131 +199 -1apache-1.3/htdocs/manual/mod/core.html Index: core.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/core.html,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- core.html 1998/08/11 15:37:49 1.130 +++ core.html 1998/08/12 00:29:14 1.131 @@ -49,6 +49,10 @@ KeepAlive KeepAliveTimeout+LimitRequestBody +LimitRequestFields +LimitRequestFieldsize +LimitRequestLine Listen ListenBacklog @@ -1324,7 +1328,201 @@ OPTIONS. The method name is case-sensitive. If GET is used it will also restrict HEAD requests. If you wish to limit all methods, do not include any - directive at all. + directive at all. + + + +LimitRequestBody directive + +Syntax: LimitRequestBody number +Default: LimitRequestBody 0 +Context: server config +Status: core +Compatibility: LimitRequestBody is only available in +Apache 1.3.2 and later. + + +Number is a long integer from 0 (meaning unlimited) to 2147483647 +(2GB). The default value is defined by the compile-time constant +DEFAULT_LIMIT_REQUEST_BODY (0 as distributed). + + +The LimitRequestBody directive allows the user to set a +limit on the allowed size of an HTTP request message body within +the context in which the directive is given (server, per-directory, +per-file or per-location). If the client request exceeds that limit, +the server will return an error response instead of servicing the request. +The size of a normal request message body will vary greatly depending +on the nature of the resource and the methods allowed on that resource. +CGI scripts typically use the message body for passing form information +to the server. Implementations of the PUT method will require a value +at least as large as any representation that the server wishes +to accept for that resource. + + +This directive gives the server administrator greater control over abnormal +client request behavior, which may be useful for avoiding some forms +of denial-of-service attacks. + + + + +LimitRequestFields directive + +Syntax: LimitRequestFields number +Default: LimitRequestFields 100 +Context: server config +Status: core +Compatibility: LimitRequestFields is only available in +Apache 1.3.2 and later. + + +Number is an integer from 0 (meaning unlimited) to 32767. +The default value is defined by the compile-time constant +DEFAULT_LIMIT_REQUEST_FIELDS (100 as distributed). + + +The LimitRequestFields directive allows the server administrator to modify +the limit on the number of request header fields allowed in an HTTP request. +A server needs this value to be larger than the number of fields that a +normal client request might include. The number of request header fields +used by a client rarely exceeds 20, but this may vary among different +client implementations, often depending upon the extent to which a user +has configured their browser to support detailed content negotiation. +Optional HTTP extensions are often expressed using request header fields. + + +This directive gives the server administrator greater control over abnormal +client request behavior, which may be useful for avoiding some forms +of denial-of-service attacks. The value should be increased if normal +clients see an error response from the server that indicates too many +fields were sent in the request. + + + +LimitRequestFieldsize directive + +Syntax: LimitRequestFieldsize number +Default: LimitRequestFieldsize 8190 +Context: server config +Status: core +Compatibility: LimitRequestFieldsize is only available in +Apache 1.3.2 and later. + + +Number is an integer size in bytes from 0 to the value of the +compile-time constant DEFAULT_LIMIT_REQUEST_FIELDSIZE +(8190 as distributed). + + +The LimitRequestFieldsize directive allows the server administrator to reduce +the limit on the allowed size of an HTTP request header field below the +normal input buffer size compiled with the server. A server needs this +value to be large enough to hold any one header field from a normal client +request. The size of a normal request header field will vary greatly +among different client implementations, often depending upon the extent +to which a user has configured their browser to support detailed +content negotiation. + + +This directive gives the server administrator greater control over abnormal +client request behavior, which may be useful for avoiding some forms +of denial-of-service attacks. Under normal conditions, the value should +not be chang
cvs commit: apache-1.3/src/modules/standard mod_status.c
jim 98/08/11 17:13:34 Modified:src/modules/standard mod_status.c Log: Cosmetic changes... try to make better use of space when printing out the PID key. Also, be consistant with use of NO_TIMES Revision ChangesPath 1.97 +15 -8 apache-1.3/src/modules/standard/mod_status.c Index: mod_status.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_status.c,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- mod_status.c 1998/08/11 20:40:28 1.96 +++ mod_status.c 1998/08/12 00:13:33 1.97 @@ -450,14 +450,22 @@ ap_rputs("\".\" Open slot with no current process\n", r); ap_rputs("\n", r); if (!ap_extended_status) { + int j = 0; ap_rputs("PID Key: \n", r); - ap_rputs("\n", r); + ap_rputs("\n", r); for (i = 0; i < HARD_SERVER_LIMIT; ++i) { - if (stat_buffer[i] != '.') - ap_rprintf(r, "%d in state: %c \n", pid_buffer[i], + if (stat_buffer[i] != '.') { + ap_rprintf(r, " %d in state: %c ", pid_buffer[i], stat_buffer[i]); + if (++j >= 3) { + ap_rputs("\n", r); + j = 0; + } else + ap_rputs(",", r); + } } - ap_rputs("\n", r); + ap_rputs("\n", r); + ap_rputs("\n", r); } } @@ -650,7 +658,7 @@ } /* for () */ if (!(short_report || no_table_report)) { -#ifdef OS2 +#ifdef NO_TIMES ap_rputs("\n \ \ \n \ @@ -684,9 +692,8 @@ } else { -ap_rputs("To obtain a full report with current status information and", r); -ap_rputs(" DNS and LOGGING status codes \n", r); -ap_rputs("you need to use the ExtendedStatus Ondirective. \n", r); +ap_rputs("To obtain a full report with current status information", r); +ap_rputs("you need to use the ExtendedStatus On directive. \n", r); }