cvs commit: apache/src/modules/example mod_example.c
coar97/04/15 03:27:15 Modified:src/modules/example mod_example.c Log: Comment out prototype declarations, since the lack of instantiation causes some compilers to [reasonably] complain. Also add some more information here and there, primarily from Dean's comments. Submitted by: Dean Gaudet, Roy Fielding Revision ChangesPath 1.5 +76 -41apache/src/modules/example/mod_example.c Index: mod_example.c === RCS file: /export/home/cvs/apache/src/modules/example/mod_example.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C3 -r1.4 -r1.5 *** mod_example.c 1997/04/15 05:23:20 1.4 --- mod_example.c 1997/04/15 10:27:14 1.5 *** *** 89,95 /* server, or combination). */ #define CONFIG_MODE_SERVER 1 #define CONFIG_MODE_DIRECTORY 2 ! #define CONFIG_MODE_COMBO 3 int local; /* Boolean: was Example directive declared here? */ int congenital; /* Boolean: did we inherit an Example? */ char*trace; /* Pointer to trace string. */ --- 89,95 /* server, or combination). */ #define CONFIG_MODE_SERVER 1 #define CONFIG_MODE_DIRECTORY 2 ! #define CONFIG_MODE_COMBO 3 /* Shouldn't ever happen. */ int local; /* Boolean: was Example directive declared here? */ int congenital; /* Boolean: did we inherit an Example? */ char*trace; /* Pointer to trace string. */ *** *** 122,199 /* * Command handler for a NO_ARGS directive. ! */ ! static const char *handle_NO_ARGS ! (cmd_parms *cmd, void *mconfig); ! /* * Command handler for a RAW_ARGS directive. The args argument is the text * of the commandline following the directive itself. */ - static const char *handle_RAW_ARGS - (cmd_parms *cmd, void *mconfig, const char *args); /* * Command handler for a TAKE1 directive. The single parameter is passed in * word1. */ - static const char *handle_TAKE1 - (cmd_parms *cmd, void *mconfig, char *word1); /* * Command handler for a TAKE2 directive. TAKE2 commands must always have * exactly two arguments. */ - static const char *handle_TAKE2 - (cmd_parms *cmd, void *mconfig, char *word1, char *word2); /* * Command handler for a TAKE3 directive. Like TAKE2, these must have exactly * three arguments, or the parser complains and doesn't bother calling us. */ - static const char *handle_TAKE3 - (cmd_parms *cmd, void *mconfig, char *word1, char *word2, char *word3); /* * Command handler for a TAKE12 directive. These can take either one or two * arguments. * - word2 is a NULL pointer if no second argument was specified. */ - static const char *handle_TAKE12 - (cmd_parms *cmd, void *mconfig, char *word1, char *word2); /* * Command handler for a TAKE123 directive. A TAKE123 directive can be given, * as might be expected, one, two, or three arguments. * - word2 is a NULL pointer if no second argument was specified. * - word3 is a NULL pointer if no third argument was specified. */ - static const char *handle_TAKE123 - (cmd_parms *cmd, void *mconfig, char *word1, char *word2, char *word3); /* * Command handler for a TAKE13 directive. Either one or three arguments are * permitted - no two-parameters-only syntax is allowed. * - word2 and word3 are NULL pointers if only one argument was specified. */ - static const char *handle_TAKE13 - (cmd_parms *cmd, void *mconfig, char *word1, char *word2, char *word3); /* * Command handler for a TAKE23 directive. At least two and as many as three * arguments must be specified. * - word3 is a NULL pointer if no third argument was specified. */ - static const char *handle_TAKE23 - (cmd_parms *cmd, void *mconfig, char *word1, char *word2, char *word3); /* * Command handler for a ITERATE directive. * - Handler is called once for each of n arguments given to the directive. * - word1 points to each argument in turn. */ - static const char *handle_ITERATE - (cmd_parms *cmd, void *mconfig, char *word1); /* * Command handler for a ITERATE2 directive. --- 122,209 /* * Command handler for a NO_ARGS directive. ! * ! * static const char *handle_NO_ARGS ! * (cmd_parms *cmd, void *mconfig); ! * ! /* * Command handler for a RAW_ARGS directive. The args argument is the text * of the commandline following the
cvs commit: apache/htdocs/manual/misc compat_notes.html
pcs 97/04/15 06:31:11 Modified:htdocs/manual/misc compat_notes.html Log: Add note that Apache pre-1.2 ignores last line when final newline is missing. Apparently NCSA does not ignore the final line in this situation. Revision ChangesPath 1.5 +6 -0 apache/htdocs/manual/misc/compat_notes.html Index: compat_notes.html === RCS file: /export/home/cvs/apache/htdocs/manual/misc/compat_notes.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C3 -r1.4 -r1.5 *** compat_notes.html 1997/03/25 04:57:58 1.4 --- compat_notes.html 1997/04/15 13:31:10 1.5 *** *** 98,103 --- 98,109 it added one automatically if the .asis file contained a Location header. 0.8.14 requires a Status header. p + P + LIApache versions before 1.2b1 will ignore the last line of configuration + files if the last line does not have a trailing newline. This affects + configuration files (httpd.conf, access.conf and srm.conf), and + htpasswd and htgroup files. + /OL More to come when we notice them
cvs commit: apache/htdocs/manual/mod core.html
coar97/04/15 08:56:48 Modified:htdocs/manual/mod core.html Log: Correct typo. Reviewed by: Ken Coar Submitted by: Ralf Engelschall Revision ChangesPath 1.45 +1 -1 apache/htdocs/manual/mod/core.html Index: core.html === RCS file: /export/home/cvs/apache/htdocs/manual/mod/core.html,v retrieving revision 1.44 retrieving revision 1.45 diff -C3 -r1.44 -r1.45 *** core.html 1997/04/10 22:53:18 1.44 --- core.html 1997/04/15 15:56:46 1.45 *** *** 308,314 lt;Directory /home/*gt;br AllowOverride FileInfobr lt;/Directorygt;/code/blockquote ! The for access to the document code/home/web/dir/doc.html/code the steps are: menu liApply directive codeAllowOverride None/code (disabling --- 308,314 lt;Directory /home/*gt;br AllowOverride FileInfobr lt;/Directorygt;/code/blockquote ! for access to the document code/home/web/dir/doc.html/code the steps are: menu liApply directive codeAllowOverride None/code (disabling
cvs commit: apache/src CHANGES Configuration.tmpl Configure conf.h
dgaudet 97/04/15 13:00:24 Modified:src CHANGES Configuration.tmpl Configure conf.h Log: Linux platforms have various differences that make it difficult to enable the HAVE_SHMGET and disable the USE_FCNTL_SERIALIZED_ACCEPT reliably. So instead we'll let the user shoot themselves. Reviewed by: Jim, Ralf, Chuck Revision ChangesPath 1.232 +6 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.231 retrieving revision 1.232 diff -C3 -r1.231 -r1.232 *** CHANGES 1997/04/14 01:09:12 1.231 --- CHANGES 1997/04/15 20:00:20 1.232 *** *** 1,5 --- 1,11 Changes with Apache 1.2 + *) Back out the HAVE_SHMGET change for Linux because it's too late in + the beta cycle to deal cleanly with compilation problems on the + myriad of linux systems out there. Linux users should see + Configuration.tmpl about defining Rule LINUX_TWEAKS=yes. + [Dean Gaudet] PR#336, PR#340 + *) Redirect did not preserve ?query_strings when present in the client's request. [Dean Gaudet] 1.58 +9 -1 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.57 retrieving revision 1.58 diff -C3 -r1.57 -r1.58 *** Configuration.tmpl1997/04/15 04:32:54 1.57 --- Configuration.tmpl1997/04/15 20:00:20 1.58 *** *** 57,63 # functions. The format is: Rule RULE=value # # At present, only the following RULES are known: WANTHSREGEX, SOCKS4, ! # STATUS and IRIXNIS. # # For all Rules, if set to yes, then Configure knows we want that # capability and does what is required to add it in. If set to default --- 57,63 # functions. The format is: Rule RULE=value # # At present, only the following RULES are known: WANTHSREGEX, SOCKS4, ! # STATUS, IRIXNIS, and LINUX_TWEAK. # # For all Rules, if set to yes, then Configure knows we want that # capability and does what is required to add it in. If set to default *** *** 80,89 --- 80,97 # SGI IRIX. If you are, and you are using NIS, you should set this # to 'yes' # + # LINUX_TWEAK: + # Only takes effect if Configure determines that you are running a Linux + # system. This enables two optimizations that work well on i386 linux 2.0 + # or later systems. They aren't enabled by default because of kernel and + # library problems with various versions of linux. We'd rather release + # something known stable and let you choose the optimizations yourself. + # Rule STATUS=yes Rule SOCKS4=no Rule IRIXNIS=no + Rule LINUX_TWEAK=no # The following rules should be set automatically by Configure. However, if # they are not set by Configure (because we don't know the correct value for 1.92 +4 -0 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.91 retrieving revision 1.92 diff -C3 -r1.91 -r1.92 *** Configure 1997/04/14 11:52:20 1.91 --- Configure 1997/04/15 20:00:21 1.92 *** *** 133,138 --- 133,139 RULE_STATUS=`./helpers/CutRule STATUS $file` RULE_SOCKS4=`./helpers/CutRule SOCKS4 $file` RULE_IRIXNIS=`./helpers/CutRule IRIXNIS $file` + RULE_LINUX_TWEAK=`./helpers/CutRule LINUX_TWEAK $file` # # Now we determine the OS/Platform automagically, thanks to *** *** 262,267 --- 263,271 DEF_WANTHSREGEX=yes OS='Linux' CFLAGS=$CFLAGS -DLINUX + if [ $RULE_LINUX_TWEAK = yes ]; then + CFLAGS=$CFLAGS -DLINUX_TWEAK + fi ;; *-lynx-lynxos*) OS='LynxOS' 1.93 +14 -2 apache/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.92 retrieving revision 1.93 diff -C3 -r1.92 -r1.93 *** conf.h1997/04/09 01:40:51 1.92 --- conf.h1997/04/15 20:00:21 1.93 *** *** 253,265 #define NO_USE_SIGACTION #elif defined(LINUX) #undef HAVE_GMTOFF #undef NO_KILLPG #undef NO_SETSID #undef NEED_STRDUP - #define HAVE_SHMGET #define JMP_BUF sigjmp_buf - #define USE_FCNTL_SERIALIZED_ACCEPT #include sys/time.h #elif defined(SCO) --- 253,277 #define NO_USE_SIGACTION #elif defined(LINUX) + #ifndef LINUX_TWEAK + /* the old stable way ... it's
cvs commit: apache/src CHANGES
dgaudet 97/04/15 13:23:00 Modified:src CHANGES Log: typo fix Revision ChangesPath 1.233 +1 -1 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.232 retrieving revision 1.233 diff -C3 -r1.232 -r1.233 *** CHANGES 1997/04/15 20:00:20 1.232 --- CHANGES 1997/04/15 20:22:58 1.233 *** *** 3,9 *) Back out the HAVE_SHMGET change for Linux because it's too late in the beta cycle to deal cleanly with compilation problems on the myriad of linux systems out there. Linux users should see ! Configuration.tmpl about defining Rule LINUX_TWEAKS=yes. [Dean Gaudet] PR#336, PR#340 *) Redirect did not preserve ?query_strings when present in the client's --- 3,9 *) Back out the HAVE_SHMGET change for Linux because it's too late in the beta cycle to deal cleanly with compilation problems on the myriad of linux systems out there. Linux users should see ! Configuration.tmpl about defining Rule LINUX_TWEAK=yes. [Dean Gaudet] PR#336, PR#340 *) Redirect did not preserve ?query_strings when present in the client's
cvs commit: apache/src/modules/proxy mod_proxy.h
chuck 97/04/15 17:13:06 Modified:src/modules/proxy mod_proxy.h Log: Clean up TODO list; fix mailing address. Revision ChangesPath 1.11 +2 -4 apache/src/modules/proxy/mod_proxy.h Index: mod_proxy.h === RCS file: /export/home/cvs/apache/src/modules/proxy/mod_proxy.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C3 -r1.10 -r1.11 *** mod_proxy.h 1997/04/11 05:10:50 1.10 --- mod_proxy.h 1997/04/16 00:13:05 1.11 *** *** 88,98 4. Use a cache expiry database for more efficient GC (Jeremy Wohl) ! 5. Handle multiple IPs for doconnect() ! 6. Bulletproof GC against SIGALRM ! ! Chuck Murcko [EMAIL PROTECTED] 1 Oct 96 */ --- 88,96 4. Use a cache expiry database for more efficient GC (Jeremy Wohl) ! 5. Bulletproof GC against SIGALRM ! Chuck Murcko [EMAIL PROTECTED] 15 April 1997 */
cvs commit: apache/src/modules/example mod_example.c
fielding97/04/15 22:47:59 Modified:src/modules/example mod_example.c Log: More warnings plugged about overlapping comments. It would be nice to find a use for our_sconfig in the example, since we still get mod_example.c:245: warning: `our_sconfig' defined but not used when compiled. Revision ChangesPath 1.6 +3 -3 apache/src/modules/example/mod_example.c Index: mod_example.c === RCS file: /export/home/cvs/apache/src/modules/example/mod_example.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C3 -r1.5 -r1.6 *** mod_example.c 1997/04/15 10:27:14 1.5 --- mod_example.c 1997/04/16 05:47:58 1.6 *** *** 125,131 * * static const char *handle_NO_ARGS * (cmd_parms *cmd, void *mconfig); ! * /* * Command handler for a RAW_ARGS directive. The args argument is the text --- 125,131 * * static const char *handle_NO_ARGS * (cmd_parms *cmd, void *mconfig); ! */ /* * Command handler for a RAW_ARGS directive. The args argument is the text *** *** 913,920 * a NULL block, since it can be of variable length. * * Note that content-handlers are invoked on a most-specific to least-specific ! * basis; that is, an handler that is declared for text/plain will be ! * invoked before one that was declared for text/*. Note also that * if a content-handler returns anything except DECLINED, no other * content-handlers will be called. */ --- 913,920 * a NULL block, since it can be of variable length. * * Note that content-handlers are invoked on a most-specific to least-specific ! * basis; that is, a handler that is declared for text/plain will be ! * invoked before one that was declared for text / *. Note also that * if a content-handler returns anything except DECLINED, no other * content-handlers will be called. */
