cvs commit: apache-1.3/src/support httpd.exp
fielding99/01/03 04:04:41 Modified:src ApacheCore.def CHANGES src/include alloc.h ap_mmn.h src/main alloc.c src/modules/standard mod_negotiation.c src/support httpd.exp Log: Major overhaul of mod_negotiation.c, part 2. - properly handle identity within Accept-Encoding. - allow encoded variants in RVSA negotiation and let them appear in the Alternates field using the non-standard encoding tag-list. - fixed both negotiation algorithms so that an explicitly accepted encoding is preferred over no encoding if identity is not included within Accept-Encoding. - added ap_array_pstrcat() to alloc.c for efficient concatenation of large substring sequences. Bumped MMN. - replaced O(n^2) memory hogs in mod_negotiation with ap_array_pstrcat. Revision ChangesPath 1.5 +1 -0 apache-1.3/src/ApacheCore.def Index: ApacheCore.def === RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ApacheCore.def1998/12/29 09:46:12 1.4 +++ ApacheCore.def1999/01/03 12:04:34 1.5 @@ -322,4 +322,5 @@ ap_single_module_configure @315 ap_single_module_init @316 ap_make_etag @317 + ap_array_pstrcat @318 1.1196+13 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1195 retrieving revision 1.1196 diff -u -r1.1195 -r1.1196 --- CHANGES 1999/01/02 14:12:18 1.1195 +++ CHANGES 1999/01/03 12:04:34 1.1196 @@ -50,7 +50,19 @@ module's token was being added first before the Apache token. This has been fixed. [Jim Jagielski] - *) Major overhaul of mod_negotiation.c. + *) Major overhaul of mod_negotiation.c, part 2. + - properly handle identity within Accept-Encoding. + - allow encoded variants in RVSA negotiation and let them appear in + the Alternates field using the non-standard encoding tag-list. + - fixed both negotiation algorithms so that an explicitly accepted + encoding is preferred over no encoding if identity is not + included within Accept-Encoding. + - added ap_array_pstrcat() to alloc.c for efficient concatenation + of large substring sequences. + - replaced O(n^2) memory hogs in mod_negotiation with ap_array_pstrcat. + [Roy Fielding] + + *) Major overhaul of mod_negotiation.c, part 1. - cleanups to mod_negotiation comments and code structure - made compliant with HTTP/1.1 proposed standard (rfc2068) and added support for everything in the upcoming HTTP/1.1 1.66 +9 -0 apache-1.3/src/include/alloc.h Index: alloc.h === RCS file: /home/cvs/apache-1.3/src/include/alloc.h,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- alloc.h 1999/01/01 19:04:38 1.65 +++ alloc.h 1999/01/03 12:04:36 1.66 @@ -149,6 +149,15 @@ API_EXPORT(array_header *) ap_append_arrays(pool *, const array_header *, const array_header *); +/* ap_array_pstrcat generates a new string from the pool containing + * the concatenated sequence of substrings referenced as elements within + * the array. The string will be empty if all substrings are empty or null, + * or if there are no elements in the array. + * If sep is non-NUL, it will be inserted between elements as a separator. + */ +API_EXPORT(char *) ap_array_pstrcat(pool *p, const array_header *arr, +const char sep); + /* copy_array copies the *entire* array. copy_array_hdr just copies * the header, and arranges for the elements to be copied if (and only * if) the code subsequently does a push or arraycat. 1.18 +3 -2 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ap_mmn.h 1999/01/01 20:27:47 1.17 +++ ap_mmn.h 1999/01/03 12:04:36 1.18 @@ -193,13 +193,14 @@ * 19981229 - mod_negotiation overhaul -- added ap_make_etag() *and added vlist_validator to request_rec. * 19990101 - renamed macro escape_uri() to ap_escape_uri() - * - Added MODULE_MAGIC_COOKIE to identify module structures + * - added MODULE_MAGIC_COOKIE to identify module structs + * 19990103 (1.3.4-dev) - added
cvs commit: apache-1.3/src/main http_main.c
fielding99/01/03 05:09:49 Modified:src CHANGES src/main http_main.c Log: In order to prevent some errant library code from setting an alarm on one request and having it affect some later connection, force the alarm to be cleared before each connection even if Apache's own timeouts are being handled by the parent. This doesn't help for multiple requests on the same connection, but it is extremely unlikely that a request stream would persist longer than a non-Apache errant timeout, and this limits the problem to a single user without impacting performance. Revision ChangesPath 1.1197+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1196 retrieving revision 1.1197 diff -u -r1.1196 -r1.1197 --- CHANGES 1999/01/03 12:04:34 1.1196 +++ CHANGES 1999/01/03 13:09:46 1.1197 @@ -1,5 +1,10 @@ Changes with Apache 1.3.4 + *) In order to prevent some errant library code from setting an alarm + on one request and having it affect some later connection, force the + alarm to be cleared before each connection even if Apache's own + timeouts are being handled by the parent. [Roy Fielding] + *) Make sure under ELF-based NetBSD (now) and OpenBSD (future) we don't search for an underscore on dlsym() (as it's already the case for FreeBSD 3.0). [Todd Vierling [EMAIL PROTECTED]] PR#2462 1.417 +4 -1 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.416 retrieving revision 1.417 diff -u -r1.416 -r1.417 --- http_main.c 1999/01/01 19:04:49 1.416 +++ http_main.c 1999/01/03 13:09:48 1.417 @@ -3610,7 +3610,10 @@ * (Re)initialize this child to a pre-connection state. */ - ap_kill_timeout(0); /* Cancel any outstanding alarms. */ + ap_kill_timeout(0); /* Cancel any outstanding alarms */ +#ifdef OPTIMIZE_TIMEOUTS + alarm(0); /* even if not set by Apache routines */ +#endif current_conn = NULL; ap_clear_pool(ptrans);
cvs commit: apache-1.3/src/include httpd.h
fielding99/01/03 05:35:33 Modified:.STATUS src CHANGES src/include httpd.h Log: Change the ap_assert macro to a variant that works on all platforms. PR: 2575 Submitted by: Richard Prinz [EMAIL PROTECTED] Reviewed by: Roy Fielding, Dirk-Willem van Gulik Revision ChangesPath 1.585 +1 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.584 retrieving revision 1.585 diff -u -r1.584 -r1.585 --- STATUS1999/01/02 13:30:20 1.584 +++ STATUS1999/01/03 13:35:29 1.585 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/01/02 13:30:20 $] + Last modified at [$Date: 1999/01/03 13:35:29 $] Release: @@ -123,10 +123,6 @@ * Ronald Tschalär's ap_uuencode() bugfix Message-ID: PR#3411 Status: Lars +1 (on concept) - -* PR#2575 problem with ap_assert macro -Message-ID: [EMAIL PROTECTED] -Status: * Michael van Elst's patch [PR#3160] to improve mod_rewrite's in-core cache handling by using a hash table. 1.1198+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1197 retrieving revision 1.1198 diff -u -r1.1197 -r1.1198 --- CHANGES 1999/01/03 13:09:46 1.1197 +++ CHANGES 1999/01/03 13:35:30 1.1198 @@ -1,5 +1,8 @@ Changes with Apache 1.3.4 + *) Change the ap_assert macro to a variant that works on all platforms. + [Richard Prinz [EMAIL PROTECTED]] PR#2575 + *) In order to prevent some errant library code from setting an alarm on one request and having it affect some later connection, force the alarm to be cleared before each connection even if Apache's own 1.257 +1 -1 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.256 retrieving revision 1.257 diff -u -r1.256 -r1.257 --- httpd.h 1999/01/01 19:04:41 1.256 +++ httpd.h 1999/01/03 13:35:32 1.257 @@ -1080,7 +1080,7 @@ */ API_EXPORT(void) ap_log_assert(const char *szExp, const char *szFile, int nLine) __attribute__((noreturn)); -#define ap_assert(exp) (void)( (exp) || (ap_log_assert(#exp, __FILE__, __LINE__), 0) ) +#define ap_assert(exp) ((exp) ? (void)0 : ap_log_assert(#exp,__FILE__,__LINE__)) /* The optimized timeout code only works if we're not MULTITHREAD and we're * also not using a scoreboard file
cvs commit: apache-1.3 STATUS
fielding99/01/03 05:46:17 Modified:.STATUS Log: what the heck am I doing up so late? Revision ChangesPath 1.586 +1 -35 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.585 retrieving revision 1.586 diff -u -r1.585 -r1.586 --- STATUS1999/01/03 13:35:29 1.585 +++ STATUS1999/01/03 13:46:16 1.586 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/01/03 13:35:29 $] + Last modified at [$Date: 1999/01/03 13:46:16 $] Release: @@ -113,13 +113,6 @@ Message-ID: PR#2838 Status: -* Ask Bjoern Hansen's patch to make Apache set Cache-Control and Pragma - headers in addition to the autogenerated Expires - if r-no_cache is set and r-headers_out contains no - Expires header yet. -Message-ID: PR#3023 -Status: Martin +1, Roy -1 (see PR for reason) - * Ronald Tschalär's ap_uuencode() bugfix Message-ID: PR#3411 Status: Lars +1 (on concept) @@ -204,26 +197,6 @@ Open issues: -* Underscores on symbols in DSO situation is broken for NetBSD: - Here is a private conversation between me (rse) and Charles Hannum of - the NetBSD project: - - From: Charles M. Hannum [EMAIL PROTECTED] - We have a bug report at the Apache BugDB (see - http://bugs.apache.org/private/index/full/2462) where a user says - under a particular NetBSD platform (NetBSD/pmax 1.3.2) the symbols on - dlsym() don't need an underscore. In FreeBSD world we always had the - underscore, - [...] - This is less an issue of OS, and more an issue of a.out vs. ELF. The - underscores are always used for a.out, and are never used for ELF. - Therefore, on any platform where we use ELF (that would be Alpha, MIPS, - PowerPC and UltraSPARC currently, although there are plans to eventually - switch on other platforms), the underscores should not be added, and on - all other platforms they should be. - You can differentiate by comparing the output of `uname -m' with any - of: alpha bebox macppc newsmips ofppc pica pmax sparc64. - * Redefine APACHE_RELEASE. Add another 'bit' to signify whether it's a beta or final release. Maybe 'MMNNFFRBB' which means: MM: Major release # @@ -306,13 +279,6 @@ * In ap_bclose() there's no test that (fb-fd != -1) -- so it's possible that it'll do something completely bogus when it's used for read-only things. - Dean Gaudet - -* Okay, so our negotiation strategy needs a bit of refinement. See - [EMAIL PROTECTED]. - In general, we need to go through and clean up the negotiation - module to make it compliant with the final HTTP/1.1 draft, and at the - very least we should make it more copacetic to the idea of transferring - gzipped variants of files when both variants exist on the server. * Roy's HTTP/1.1 Wishlist items: 1) byte range error handling
cvs commit: apache-1.3/src/main http_main.c
dgaudet 99/01/03 08:45:27 Modified:src CHANGES src/main http_main.c Log: Back out roy's previous change -- this sort of thing should be handled by a cleanup if a module really needs it. Unless someone can demonstrate that there is broken libc code somewhere that absolutely needs this... Revision ChangesPath 1.1199+0 -5 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1198 retrieving revision 1.1199 diff -u -r1.1198 -r1.1199 --- CHANGES 1999/01/03 13:35:30 1.1198 +++ CHANGES 1999/01/03 16:45:23 1.1199 @@ -3,11 +3,6 @@ *) Change the ap_assert macro to a variant that works on all platforms. [Richard Prinz [EMAIL PROTECTED]] PR#2575 - *) In order to prevent some errant library code from setting an alarm - on one request and having it affect some later connection, force the - alarm to be cleared before each connection even if Apache's own - timeouts are being handled by the parent. [Roy Fielding] - *) Make sure under ELF-based NetBSD (now) and OpenBSD (future) we don't search for an underscore on dlsym() (as it's already the case for FreeBSD 3.0). [Todd Vierling [EMAIL PROTECTED]] PR#2462 1.418 +1 -4 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.417 retrieving revision 1.418 diff -u -r1.417 -r1.418 --- http_main.c 1999/01/03 13:09:48 1.417 +++ http_main.c 1999/01/03 16:45:25 1.418 @@ -3610,10 +3610,7 @@ * (Re)initialize this child to a pre-connection state. */ - ap_kill_timeout(0); /* Cancel any outstanding alarms */ -#ifdef OPTIMIZE_TIMEOUTS - alarm(0); /* even if not set by Apache routines */ -#endif + ap_kill_timeout(0); /* Cancel any outstanding alarms. */ current_conn = NULL; ap_clear_pool(ptrans);
cvs commit: apache-site/info apache_on_linux.html
brian 99/01/03 15:48:07 Modified:info apache_on_linux.html Log: Remove reference to qosina.com due to complaints from their webmaster. Revision ChangesPath 1.7 +1 -9 apache-site/info/apache_on_linux.html Index: apache_on_linux.html === RCS file: /home/cvs/apache-site/info/apache_on_linux.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- apache_on_linux.html 1998/05/20 15:20:51 1.6 +++ apache_on_linux.html 1999/01/03 23:48:07 1.7 @@ -17,15 +17,7 @@ /DIV -H3 align=center -These pages are very old. The new version of these pages can be found -at A -HREF=http://www.qosina.com/apache/;http://www.qosina.com/apache//A -util I can move them over to www.apache.org. I also need to convert -HTML 3.0 code to HTML 2.0 code, so if you have Netscape 2.0 you may -want to look at my site anyway. If you an have any questions you can -email me at: A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/A. -/H3 +H3Warning: this document has been unmaintained for a very long time./H3 P H1 ALIGN=CENTERConfiguring linux to run Apache 0.8 + with virtual hosts/H1
