cvs commit: apache-1.3 STATUS
dgaudet 98/03/25 20:24:23 Modified:.STATUS Log: a few updates Revision ChangesPath 1.208 +12 -15apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.207 retrieving revision 1.208 diff -u -r1.207 -r1.208 --- STATUS1998/03/25 15:27:04 1.207 +++ STATUS1998/03/26 04:24:22 1.208 @@ -258,10 +258,10 @@ worth adding it by weighting on the advantages and disadvantages. Votes for including APACI (in general): - Ralf +1 + Ralf +1, Dean +1 Votes for commit variants: - CV1: Ralf +1 + CV1: Ralf +1, Dean +1 CV2: Ralf +0 Concepts: @@ -275,25 +275,17 @@ In progress: -* Dean's [PATCH] yet another slow function -[EMAIL PROTECTED] - Status: Dean +1, Jim +1, Martin +1, Paul +1 - Needs to be redone so that it better supports non-ascii hosts. - * Ken's IndexFormat enhancement to mod_autoindex to allow CustomLog-like tailoring of directory listing formats -* Doug's attempt to get mod_perl's Perl config working under win32, - some non-public functions and structures need to exposed +FINAL RELEASE SHOWSTOPPERS: + +* proxy security fixes from 1.2.5 need to be brought forward Needs patch: * Dean's locale project See [EMAIL PROTECTED] - -* os_ abstract is_only_below() in mod_include.c - -* proxy security fixes from 1.2.5 need to be brought forward * Documentation for: 1) htdocs/manual/sourcereorg.html and other files should mention @@ -332,14 +324,14 @@ ap_xxx: Ken +1, Brian +1, Ralf +1, Martin +1, Paul +1 Public API functions (e.g., palloc) - apapi_xxx: Ken +1, Brian +1, Ralf +1, Martin +1, Paul + apapi_xxx: Ken +1, Brian +1, Ralf +1, Martin +1, Paul, Dean appublic_xxx: appub_xxx: Private functions which we can't make static but should be (e.g., new_connection) apprivate_xxx: - appri_xxx: Brian +1 + appri_xxx: Brian +1, Dean httpd_xxx: Ken +1 apint_xxx: Ralf +1 (int = internal) @@ -390,10 +382,13 @@ * Marc's [BUG] include virtual and SCRIPT_NAME w/path_info [EMAIL PROTECTED] + Dean says: please put this in the bugdb * Ken's PR#1053: an error when accessing a negotiated document explicitly names the variant selected. Should it do so, or should the base input name be referenced? + Dean says: doesn't seem important enough to be in the STATUS... + it's probably a pain to fix. * Proposed API Changes: @@ -540,3 +535,5 @@ * SECURITY: numerous uses of strcpy and strcat have potential for buffer overflow, someone should rewrite or verify they're safe + +* SECURITY: os_ abstract is_only_below() in mod_include.c
cvs commit: apache-1.3 STATUS
fielding98/03/25 20:47:55 Modified:.STATUS Log: Dark... rain... must be time for a STATUS update. Revision ChangesPath 1.209 +8 -15 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- STATUS1998/03/26 04:24:22 1.208 +++ STATUS1998/03/26 04:47:53 1.209 @@ -258,10 +258,10 @@ worth adding it by weighting on the advantages and disadvantages. Votes for including APACI (in general): - Ralf +1, Dean +1 + Ralf +1, Dean +1, Roy +1 Votes for commit variants: - CV1: Ralf +1, Dean +1 + CV1: Ralf +1, Dean +1, Roy +1 CV2: Ralf +0 Concepts: @@ -308,7 +308,7 @@ changes to be committed without prior review. * Guidelines for commit-then-review are documented at - http://dev.apache.org/guidelines.html#ctr + http://dev.apache.org/guidelines.html * The apache CVS module has been renamed to apache-1.2 and the apachen module to apache-1.3. apache-1.3 has been copied @@ -321,27 +321,20 @@ * Provide consistant prefixes; suggestions: Apache provided general functions (e.g., ap_cpystrn) - ap_xxx: Ken +1, Brian +1, Ralf +1, Martin +1, Paul +1 + ap_xxx: Ken +1, Brian +1, Ralf +1, Martin +1, Paul +1, Roy +1 Public API functions (e.g., palloc) - apapi_xxx: Ken +1, Brian +1, Ralf +1, Martin +1, Paul, Dean + apapi_xxx: Ken +1, Brian +1, Ralf +1, Martin +1, Paul, Dean, Roy appublic_xxx: appub_xxx: Private functions which we can't make static but should be (e.g., new_connection) apprivate_xxx: - appri_xxx: Brian +1, Dean + appri_xxx: Brian +1, Dean, Roy httpd_xxx: Ken +1 apint_xxx: Ralf +1 (int = internal) -* Ken's [POLL] apachen/patches directory - Shall we experiment with allowing patches to be distributed for - voting through cvs, by creating a directory under the source tree - and putting them there? Please vote. - [EMAIL PROTECTED] - Status: Ken +1, Randy 0, Dean 0, Jim +1, Paul 0, Martin +1, Ralf 0 - * Paul would like to see a 'gdbm' option because he uses it a lot. Dean notes that 'gdbm' include 'db' support so we need to watch the library ordering. @@ -397,7 +390,7 @@ field is r-content_languages. Heck it's not even mentioned in apache-devsite/mmn.txt when we got content_languages (note the s!). The proposal is to remove r-content_language: - Status: Dean +1, Paul +1 + Status: Dean +1, Paul +1, Roy +1 - child_exit() is redundant, it can be implemented via cleanups. It is not symmetric in the sense that there is no exit API method to go @@ -406,7 +399,7 @@ mod_mmap_static, and mod_php3 for example). The proposal is to remove the child_exit() method and document cleanups as the method of handling this need. - Status: Dean +1, Rasmus +1, Paul +1 + Status: Dean +1, Rasmus +1, Paul +1, Roy +1 Win32 specific issues:
cvs commit: apache-1.3/src/main gen_test_char.c gen_uri_delims.c .cvsignore Makefile.tmpl util.c util_uri.c
dgaudet 98/03/25 20:58:42 Modified:src Makefile.tmpl src/main .cvsignore Makefile.tmpl util.c util_uri.c Added: src/main gen_test_char.c gen_uri_delims.c Log: Generate test_char_table and uri_delims at compile time so that they can be marked const and save on per-child memory requirements. WIN32 folks, Ben said you could handle this... you've got to compile something and then run it to generate the tables. Revision ChangesPath 1.87 +6 -6 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- Makefile.tmpl 1998/03/25 11:40:46 1.86 +++ Makefile.tmpl 1998/03/26 04:58:37 1.87 @@ -85,9 +85,9 @@ $(OBJS): Makefile # DO NOT REMOVE -buildmark.o: buildmark.c $(INCDIR)/conf.h os/unix/os.h $(INCDIR)/hide.h \ - $(INCDIR)/hsregex.h $(INCDIR)/httpd.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ - $(INCDIR)/ap.h $(INCDIR)/util_uri.h -modules.o: modules.c $(INCDIR)/httpd.h $(INCDIR)/conf.h os/unix/os.h \ - $(INCDIR)/hide.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ - $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h +buildmark.o: buildmark.c include/conf.h os/unix/os.h include/hide.h \ + include/hsregex.h include/httpd.h include/alloc.h include/buff.h \ + include/ap.h include/util_uri.h +modules.o: modules.c include/httpd.h include/conf.h os/unix/os.h \ + include/hide.h include/hsregex.h include/alloc.h include/buff.h \ + include/ap.h include/util_uri.h include/http_config.h 1.4 +4 -0 apache-1.3/src/main/.cvsignore Index: .cvsignore === RCS file: /export/home/cvs/apache-1.3/src/main/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore1998/01/11 07:06:18 1.3 +++ .cvsignore1998/03/26 04:58:38 1.4 @@ -1 +1,5 @@ Makefile +uri_delims.h +gen_uri_delims +test_char.h +gen_test_char 1.20 +24 -3 apache-1.3/src/main/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Makefile.tmpl 1998/03/17 15:42:27 1.19 +++ Makefile.tmpl 1998/03/26 04:58:39 1.20 @@ -27,12 +27,28 @@ $(RANLIB) $@ clean: - rm -f *.o $(LIB) + rm -f *.o $(LIB) uri_delims.h gen_uri_delims test_char.h gen_test_char # Work around broken compilers http_bprintf.o: http_bprintf.c $(CC) -c $(INCLUDES) $(CFLAGS) $(BROKEN_BPRINTF_FLAGS) http_bprintf.c +uri_delims.h: gen_uri_delims + ./gen_uri_delims uri_delims.h + +util_uri.o: uri_delims.h + +gen_uri_delims: gen_uri_delims.o + $(CC) $(CFLAGS) $(LDFLAGS) -o gen_uri_delims gen_uri_delims.o $(LIBS) + +test_char.h: gen_test_char + ./gen_test_char test_char.h + +util.o: test_char.h + +gen_test_char: gen_test_char.o + $(CC) $(CFLAGS) $(LDFLAGS) -o gen_test_char gen_test_char.o $(LIBS) + # We really don't expect end users to use this rule. It works only with # gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after # using it. @@ -59,6 +75,11 @@ $(INCDIR)/http_main.h $(INCDIR)/http_log.h fnmatch.o: fnmatch.c $(INCDIR)/conf.h ../os/unix/os.h \ $(INCDIR)/hide.h $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h +gen_test_char.o: gen_test_char.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ + ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h +gen_uri_delims.o: gen_uri_delims.c http_bprintf.o: http_bprintf.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ @@ -124,7 +145,7 @@ util.o: util.c $(INCDIR)/httpd.h $(INCDIR)/conf.h ../os/unix/os.h \ $(INCDIR)/hide.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ - $(INCDIR)/http_conf_globals.h $(INCDIR)/http_log.h + $(INCDIR)/http_conf_globals.h $(INCDIR)/http_log.h test_char.h util_date.o: util_date.c $(INCDIR)/conf.h ../os/unix/os.h \ $(INCDIR)/hide.h $(INCDIR)/hsregex.h $(INCDIR)/util_date.h util_md5.o: util_md5.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ @@ -143,4 +164,4 @@ ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_conf_globals.h + $(INCDIR)/http_conf_globals.h uri_delims.h 1.108 +6 -39
cvs commit: apache-2.0 STATUS
fielding98/03/25 23:13:44 Modified:.STATUS Log: Add my comments/votes. Fixed the formatting and removed the kindler, gentler form of saying piss off to a proposal. Revision ChangesPath 1.30 +108 -92 apache-2.0/STATUS Index: STATUS === RCS file: /home/cvs/apache-2.0/STATUS,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- STATUS1998/03/17 15:00:24 1.29 +++ STATUS1998/03/26 07:13:43 1.30 @@ -3,9 +3,6 @@ Release: 2.0 : In pre-alpha development - see: http://www.arctic.org/~dgaudet/apache/2.0/process-model -Dean says: This sounds like I'm working on implementing this -proposal. I'm not. Nobody is as far as I know. Plan: @@ -28,14 +25,17 @@ segments should persist until the refcount drops to zero. It would be cool if pools could be created in such segments to allow things like shared tables and arrays. + +1: Roy * Apache ports project - simple-to-install (a la CPAN) one-off tools, scripts (such as counters, guest books, et cetera) + +1: Roy * Improve mod_include SSI handling, perhaps by caching offsets to directives. Also, clean up the conditional syntax to allow formats that bear a faint resemblance to other usages (such as allowing =~ and !~) in other languages. + +1: Roy * Apache reusable code library, wherein we can put some of the stuff developed during the HTTP project that would be useful elsewhere. @@ -43,28 +43,29 @@ to have things like the arrays, tables, pools, and related primitives moved into a library of which httpd is just a client and other things can be too. + +1: Roy * Replace the current Unix compilation model (Configuration.tmpl, home-brew Configure script) with the autoconf toolset. - Status: Brian +1, Roy +1, Dean +1, Ralf +1 + +1: Brian, Roy, Dean, Ralf * Investigate replacing the current Unix compilation model (Configuration.tmpl home-brew Configure script) with the autoconf toolset. (this varies from the above such that if it's shown that the autoconf toolset can do what we want, with less headache than what we have, then we go for it) - Status: Jim +1, Ken +1, Marc +1, MarkC +1, Ben +1, Paul +1, Martin +1 + +1: Jim, Ken, Marc, MarkC, Ben, Paul, Martin * The autoconf toolset should include all three: autoconf, automake, and libtool. - Status: Brian +1, Jim +1, Roy +1, Dean +1, Ken +1, Ralf +1, Martin +1 + +1: Brian, Jim, Roy, Dean, Ken, Ralf, Martin * Whatever we do regarding autoconf, we should be able to configure to build objects other than in the source tree. autoconf allows for this... you can do mkdir obj; cd obj; ../configure. This is great for multiple platforms... or even on a single platform, one copy with profiling another without. -Status: Dean +1 + +1: Dean, Roy * One of the main restrictions on Apache has been that we must assume a very low-level common denominator for the OSs out there. For example, @@ -76,6 +77,11 @@ compile and run. Many of the ideas floating around for 2.0 would, by default, (drastically) change this. Is this a good idea? + [Roy: That overstates most of the changes proposed so far. In any +case, older systems will continue to be supported by older +versions of Apache -- it is not desirable to dull the cutting edge +just so people nowhere near the cutting edge won't get cut.] + FEATURE SET FOR 2.0 Here, we decide how many of the following feature ideas we will set for ourselves as work items for 2.0. We can't do everything we would want @@ -83,105 +89,115 @@ conservative with your votes. Items in no particular order. Feel free to add more, but try not to duplicate earlier items too much. + [Roy: The amount of time it will take to complete 2.0 will have +very little to do with how much change is attempted --- it depends +only on how many people can change things simultaneously, and thus +many suggested changes will actually speed-up the overall schedule +if they can help parallelize development or simplify the core code.] + * multithreading. - Status: Brian +1, Ken +1, Jim +1, Paul +1, Sameer +1, Marc +1, - Ralf +1, MarkC +1, Ben +1, Martin +1 - - Thread Abstraction - Status: Sameer +1, Marc +1, MarkC +1, Ben +1, Dean +1, Paul +1, - Martin +1 - Volunteers: ++1: Brian, Ken, Jim, Paul, Sameer, Marc, Ralf, MarkC, Ben, Martin, Roy + o Thread Abstraction ++1: Sameer,
cvs commit: apache-1.3 STATUS
fielding98/03/25 23:56:33 Modified:.STATUS Log: Put guidelines to the vote. Revision ChangesPath 1.210 +12 -23apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.209 retrieving revision 1.210 diff -u -r1.209 -r1.210 --- STATUS1998/03/26 04:47:53 1.209 +++ STATUS1998/03/26 07:56:32 1.210 @@ -2,17 +2,22 @@ Release: -2.0 : In pre-alpha development - see: http://www.arctic.org/~dgaudet/apache/2.0/process-model 1.3b6: in development 1.3b5: Tagged APACHE_1_3b5 and released -1.3b4: Internal version... not tagged or released. -1.3b3: Released and announced -1.3b1: There is no 1.3b1 -Current Modes: +2.0 : In pre-alpha development, see apache-2.0 repository -o Commit-Then-Review (see http://dev.apache.org/guidelines.html#ctr +Guidelines: + +o For the past few months we have been working on a commit-then-review + basis. It is now time to decide whether or not we want to work + under the guidelines in http://dev.apache.org/guidelines.html + or not, and if not, what changes are needed to make it right. + + Approve guidelines as written: + +1: Roy + +0: + -1: Plan: @@ -299,22 +304,6 @@ supply a dot-notation address. Closed issues: - -* Removal of inetd mode - Ken says he'll try to maintain it, since there are - people/places who need it - -* The decision has been made to experiment with allowing code - changes to be committed without prior review. - -* Guidelines for commit-then-review are documented at - http://dev.apache.org/guidelines.html - -* The apache CVS module has been renamed to apache-1.2 and the - apachen module to apache-1.3. apache-1.3 has been copied - to apache-2.0, but whether that's appropriate or not is - under discussion. A couple of people want that module to - start empty rather than full of 1.3's stuff. Open issues:
cvs commit: apache-1.3 STATUS
dgaudet 98/03/26 00:09:57 Modified:.STATUS Log: Revision ChangesPath 1.211 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.210 retrieving revision 1.211 diff -u -r1.210 -r1.211 --- STATUS1998/03/26 07:56:32 1.210 +++ STATUS1998/03/26 08:09:56 1.211 @@ -15,7 +15,7 @@ or not, and if not, what changes are needed to make it right. Approve guidelines as written: - +1: Roy + +1: Roy, Dean +0: -1:
cvs commit: apache-2.0 STATUS
pcs 98/03/26 00:57:58 Modified:.STATUS Log: Votes! Dull and rainy again. 11-14. Revision ChangesPath 1.31 +5 -5 apache-2.0/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-2.0/STATUS,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- STATUS1998/03/26 07:13:43 1.30 +++ STATUS1998/03/26 08:57:58 1.31 @@ -25,11 +25,11 @@ segments should persist until the refcount drops to zero. It would be cool if pools could be created in such segments to allow things like shared tables and arrays. - +1: Roy + +1: Roy, Paul * Apache ports project - simple-to-install (a la CPAN) one-off tools, scripts (such as counters, guest books, et cetera) - +1: Roy + +1: Roy, Paul * Improve mod_include SSI handling, perhaps by caching offsets to directives. Also, clean up the conditional syntax to allow @@ -43,7 +43,7 @@ to have things like the arrays, tables, pools, and related primitives moved into a library of which httpd is just a client and other things can be too. - +1: Roy + +1: Roy, Paul * Replace the current Unix compilation model (Configuration.tmpl, home-brew Configure script) with the autoconf toolset. @@ -65,7 +65,7 @@ can do mkdir obj; cd obj; ../configure. This is great for multiple platforms... or even on a single platform, one copy with profiling another without. - +1: Dean, Roy + +1: Dean, Roy, Paul * One of the main restrictions on Apache has been that we must assume a very low-level common denominator for the OSs out there. For example, @@ -196,7 +196,7 @@ -1: MarkC, Paul, Roy, Ken * make everything C++ friendly (fix that damned pool decl) -+1: Roy ++1: Roy, Paul Status: nobody has volunteered yet Closed issues:
cvs commit: apache-1.3 STATUS
pcs 98/03/26 01:05:35 Modified:.STATUS Log: Umm, guess what votes! Revision ChangesPath 1.212 +4 -4 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.211 retrieving revision 1.212 diff -u -r1.211 -r1.212 --- STATUS1998/03/26 08:09:56 1.211 +++ STATUS1998/03/26 09:05:34 1.212 @@ -15,7 +15,7 @@ or not, and if not, what changes are needed to make it right. Approve guidelines as written: - +1: Roy, Dean + +1: Roy, Dean, Paul +0: -1: @@ -263,10 +263,10 @@ worth adding it by weighting on the advantages and disadvantages. Votes for including APACI (in general): - Ralf +1, Dean +1, Roy +1 + Ralf +1, Dean +1, Roy +1, Paul +1 Votes for commit variants: - CV1: Ralf +1, Dean +1, Roy +1 + CV1: Ralf +1, Dean +1, Roy +1, Paul +1 CV2: Ralf +0 Concepts: @@ -320,7 +320,7 @@ Private functions which we can't make static but should be (e.g., new_connection) apprivate_xxx: - appri_xxx: Brian +1, Dean, Roy + appri_xxx: Brian +1, Dean, Roy, Paul httpd_xxx: Ken +1 apint_xxx: Ralf +1 (int = internal)
cvs commit: apache-2.0 STATUS
jim 98/03/26 01:36:10 Modified:.STATUS Log: Some votes Revision ChangesPath 1.32 +1 -1 apache-2.0/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-2.0/STATUS,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- STATUS1998/03/26 08:57:58 1.31 +++ STATUS1998/03/26 09:36:08 1.32 @@ -43,7 +43,7 @@ to have things like the arrays, tables, pools, and related primitives moved into a library of which httpd is just a client and other things can be too. - +1: Roy, Paul + +1: Roy, Paul, Jim * Replace the current Unix compilation model (Configuration.tmpl, home-brew Configure script) with the autoconf toolset.
cvs commit: apache-1.3 STATUS
martin 98/03/26 01:58:55 Modified:.STATUS Log: Bright sunny Revision ChangesPath 1.214 +4 -4 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.213 retrieving revision 1.214 diff -u -u -r1.213 -r1.214 --- STATUS1998/03/26 09:33:33 1.213 +++ STATUS1998/03/26 09:58:54 1.214 @@ -115,7 +115,7 @@ * Ken's slight reworking of the Apache LICENSE to clarify the restricted nature of usage of the name Apache in derived products Status: Ken +1, Paul +1, Ben +1, Jim +1, Randy +1, Roy +1, - Chuck +1, MarkC +1, Ralf +1, Sameer +1 + Chuck +1, MarkC +1, Ralf +1, Sameer +1, Martin +1 * Ralf's Apache 1.3 Autoconf-*style* Interface (APACI) @@ -263,10 +263,10 @@ worth adding it by weighting on the advantages and disadvantages. Votes for including APACI (in general): - Ralf +1, Dean +1, Roy +1, Paul +1 + Ralf +1, Dean +1, Roy +1, Paul +1, Martin +1 Votes for commit variants: - CV1: Ralf +1, Dean +1, Roy +1, Paul +1 + CV1: Ralf +1, Dean +1, Roy +1, Paul +1, Martin +1 CV2: Ralf +0 Concepts: @@ -388,7 +388,7 @@ mod_mmap_static, and mod_php3 for example). The proposal is to remove the child_exit() method and document cleanups as the method of handling this need. - Status: Dean +1, Rasmus +1, Paul +1, Roy +1, Jim +1 + Status: Dean +1, Rasmus +1, Paul +1, Roy +1, Jim +1, Martin +1 Win32 specific issues:
cvs commit: apache-1.3/src/modules/proxy mod_proxy.c
martin 98/03/26 02:10:55
Modified:src/modules/proxy mod_proxy.c
Log:
Use HTTP_BAD_REQUEST for BAD_REQUEST everywhere
Revision ChangesPath
1.48 +1 -7 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.47
retrieving revision 1.48
diff -u -u -r1.47 -r1.48
--- mod_proxy.c 1998/03/20 07:56:54 1.47
+++ mod_proxy.c 1998/03/26 10:10:49 1.48
@@ -211,7 +211,7 @@
p = strchr(url, ':');
if (p == NULL || p == url)
- return BAD_REQUEST;
+ return HTTP_BAD_REQUEST;
return OK; /* otherwise; we've done the best we can */
}
@@ -311,14 +311,8 @@
int ii;
struct dirconn_entry *list = (struct dirconn_entry *)
conf-dirconn-elts;
-/*if (*++p == '/' *++p == '/') */
-
for (direct_connect = ii = 0; ii conf-dirconn-nelts
!direct_connect; ii++) {
direct_connect = list[ii].matcher(list[ii], r);
-#if DEBUGGING
- aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, r-server,
- URI and NoProxy: %s: %s, r-uri, list[ii].name);
-#endif
}
#if DEBUGGING
{
cvs commit: apache-1.3 STATUS
jim 98/03/26 02:37:11 Modified:.STATUS Log: Controversial APACI: vote Revision ChangesPath 1.215 +3 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.214 retrieving revision 1.215 diff -u -r1.214 -r1.215 --- STATUS1998/03/26 09:58:54 1.214 +++ STATUS1998/03/26 10:37:10 1.215 @@ -263,10 +263,12 @@ worth adding it by weighting on the advantages and disadvantages. Votes for including APACI (in general): - Ralf +1, Dean +1, Roy +1, Paul +1, Martin +1 + Ralf +1, Dean +1, Roy +1, Paul +1, Martin +1, Jim +1 Votes for commit variants: CV1: Ralf +1, Dean +1, Roy +1, Paul +1, Martin +1 + Jim +1 (iff we remove the present top-level build + capability AND we clearly document the changes) CV2: Ralf +0 Concepts:
cvs commit: apache-2.0 STATUS
coar98/03/26 03:45:11 Modified:.STATUS Log: Votes, votes, votes. Haven't looked outside yet - and what has the weather to do with it, anyway? Revision ChangesPath 1.33 +5 -5 apache-2.0/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-2.0/STATUS,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- STATUS1998/03/26 09:36:08 1.32 +++ STATUS1998/03/26 11:45:10 1.33 @@ -25,17 +25,17 @@ segments should persist until the refcount drops to zero. It would be cool if pools could be created in such segments to allow things like shared tables and arrays. - +1: Roy, Paul + +1: Roy, Paul, Ken * Apache ports project - simple-to-install (a la CPAN) one-off tools, scripts (such as counters, guest books, et cetera) - +1: Roy, Paul + +1: Roy, Paul, Ken * Improve mod_include SSI handling, perhaps by caching offsets to directives. Also, clean up the conditional syntax to allow formats that bear a faint resemblance to other usages (such as allowing =~ and !~) in other languages. - +1: Roy + +1: Roy, Ken * Apache reusable code library, wherein we can put some of the stuff developed during the HTTP project that would be useful elsewhere. @@ -43,7 +43,7 @@ to have things like the arrays, tables, pools, and related primitives moved into a library of which httpd is just a client and other things can be too. - +1: Roy, Paul, Jim + +1: Roy, Paul, Jim, Ken * Replace the current Unix compilation model (Configuration.tmpl, home-brew Configure script) with the autoconf toolset. @@ -196,7 +196,7 @@ -1: MarkC, Paul, Roy, Ken * make everything C++ friendly (fix that damned pool decl) -+1: Roy, Paul ++1: Roy, Paul, Ken Status: nobody has volunteered yet Closed issues:
cvs commit: apache-site bug_report.html
coar98/03/26 03:54:53 Modified:.bug_report.html Log: Some HTML cleanup. (There should be *no* leading space inside anchor text; it gives the highlighted link a tail. It's a SHOULD in the HTML specs for browsers to ignore \w*$\w* between a container start-tag and the first non-whitespace content character, but most browsers ignore this. Hence no newlines or whitespace between LI or A HREF and the text that follows.) Revision ChangesPath 1.11 +46 -35apache-site/bug_report.html Index: bug_report.html === RCS file: /export/home/cvs/apache-site/bug_report.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bug_report.html 1998/03/25 23:47:31 1.10 +++ bug_report.html 1998/03/26 11:54:53 1.11 @@ -16,43 +16,52 @@ PWelcome to the Apache Bug Reporting Page! If you are having trouble with Apache, please fill out a problem report form and submit it. -Before you do that, though, FONT COLOR=redmake bsure/b you have -done ball/b of the following:/FONT/P +Before you do that, though, FONT COLOR=redmake STRONGsure/STRONG you +have done STRONGall/STRONG of the following:/FONT/P OL -LIVerified that the bug exists in A href=mirrors/the most recent version/A -of Apache. There are many bugs in the 1.1/tree that have been fixed -in the 1.2 tree. -LIChecked the A href=docs/misc/known_bugs.htmlknown bugs/A page. -LIChecked the A HREF=docs/misc/known_client_problems.htmlknown client problems/A page. -LIChecked the A href=docs/misc/compat_notes.htmlcompatibility -notes/A page. -LIFollowed the instructions in the codeINSTALL/code file correctly - -you edited the codeConfiguration/code file to set the right platform -and ran the codeConfigure/code script to create the new -codeMakefile/code. -LITried compiling with only the distributed set of modules and with -no other patches (so that we can make sure it's an Apache bug and -not a bug in a module or patch provided by someone else). It is -frustrating to take time and effort to track down a problem only -to figure out it caused by a broken third party module. -LIChecked the A HREF=docs/misc/FAQ.htmlFAQ/A. -LISearched the A HREF=http://www.apache.org/bugdb.cgi;bug report/A -database. When you are doing this, you should be sure to search -closed problem reports in addition to open ones. Also note that -the search is not keyword based, so it requires an exact match -of what you enter to find anything. + LIVerified that the bug exists in A HREF=mirrors/the most recent + version/A of Apache. There are many bugs in the 1.1/tree that have been + fixed in the 1.2 tree. + /LI + LIChecked the A HREF=docs/misc/known_bugs.htmlknown bugs/A page. + /LI + LIChecked the A HREF=docs/misc/known_client_problems.htmlknown client + problems/A page. + /LI + LIChecked the A HREF=docs/misc/compat_notes.htmlcompatibility + notes/A page. + /LI + LIFollowed the instructions in the CODEINSTALL/CODE file correctly - + you edited the CODEConfiguration/CODE file to set the right platform + and ran the CODEConfigure/CODE script to create the new + CODEMakefile/CODE. + /LI + LITried compiling with only the distributed set of modules and with + no other patches (so that we can make sure it's an Apache bug and + not a bug in a module or patch provided by someone else). It is + frustrating to take time and effort to track down a problem only + to figure out it caused by a broken third party module. + /LI + LIChecked the A HREF=docs/misc/FAQ.htmlFAQ/A. + /LI + LISearched the A HREF=http://www.apache.org/bugdb.cgi;bug report/A + database. When you are doing this, you should be sure to search + closed problem reports in addition to open ones. Also note that + the search is not keyword based, so it requires an exact match + of what you enter to find anything. + /LI /OL BLOCKQUOTE STRONG If you're not sure that your problem is specifically related to a - bug in Apache (ie. not something like a client problem or configuration - problem), we strongly recommend that you check in the - A HREF=news:comp.infosystems.www.servers.unix;SAMP - comp.infosystems.www.servers.unix/SAMP/A or A HREF= - news:comp.infosystems.www.servers.ms-windows;SAMP - comp.infosystems.www.servers.ms-windows/SAMP/A (depending on + bug in Apache (EMi.e./EM, not something like a client problem or + configuration problem), we strongly recommend that you check in the + A HREF=news:comp.infosystems.www.servers.unix; + SAMPcomp.infosystems.www.servers.unix/SAMP/A or + A HREF=news:comp.infosystems.www.servers.ms-windows; +
cvs commit: apache-1.3 STATUS
rse 98/03/26 05:32:11 Modified:.STATUS Log: Munich/Germany: Sunny, blue sky and warm temperature... Revision ChangesPath 1.216 +10 -3 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.215 retrieving revision 1.216 diff -u -r1.215 -r1.216 --- STATUS1998/03/26 10:37:10 1.215 +++ STATUS1998/03/26 13:32:10 1.216 @@ -266,10 +266,17 @@ Ralf +1, Dean +1, Roy +1, Paul +1, Martin +1, Jim +1 Votes for commit variants: - CV1: Ralf +1, Dean +1, Roy +1, Paul +1, Martin +1 - Jim +1 (iff we remove the present top-level build - capability AND we clearly document the changes) + CV1: Ralf +1, Dean +1, Roy +1, Paul +1, Martin +1 Jim +1 CV2: Ralf +0 + + Notes: + Jim: [the +1] iff we remove the present top-level build + capability AND we clearly document the changes + Ralf: Sure, top-level Makefile+src/helpers/InstallApache is removed + and the current top-level README file is extended by + documenting APACI and the manual build-only approach with + src/Configure. Just comitting APACI files will not be done. + The existing README has to be adjusted. I'll do this. Concepts:
cvs commit: apache-site/info supportdb.txt
randy 98/03/26 05:50:08 Modified:info supportdb.txt Log: Correct a typo. Revision ChangesPath 1.9 +1 -1 apache-site/info/supportdb.txt Index: supportdb.txt === RCS file: /export/home/cvs/apache-site/info/supportdb.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- supportdb.txt 1998/03/12 08:46:24 1.8 +++ supportdb.txt 1998/03/26 13:50:07 1.9 @@ -1,5 +1,5 @@ # Type NameURL E-mail Phone Fax LocationComments -Comp Covalent Technologies http://www.covalent.net/[EMAIL PROTECTED] (402) 441-5710 (402) 441-5720 Lincoln, Nebraska, USA +Comp Covalent Technologies, Inc. http://www.covalent.net/[EMAIL PROTECTED] (402) 441-5710 (402) 441-5720 Lincoln, Nebraska, USA Covalentdevelops and sells Raven, an SSL add-on module for Apache. Comp Dana Point Communication Systemshttp://www.dpcsys.com/ [EMAIL PROTECTED] (714) 443-4172 (714) 443-9516 Dana Point, California Comp Digituruhttp://www.digit.ee/[EMAIL PROTECTED] Estonia Comp ICONSULThttp://www.iconsult.com/[EMAIL PROTECTED] +49-(0)9131-502864 +49-(0)9131-537873 Erlangen, Germany
cvs commit: apache-site/info support.cgi
randy 98/03/26 05:53:56 Modified:info support.cgi Log: Add background to look more consistant with the rest of the site. Revision ChangesPath 1.2 +3 -1 apache-site/info/support.cgi Index: support.cgi === RCS file: /export/home/cvs/apache-site/info/support.cgi,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- support.cgi 1997/03/25 04:43:17 1.1 +++ support.cgi 1998/03/26 13:53:55 1.2 @@ -9,7 +9,9 @@ \r HTMLHEAD TITLECompanies and Contractors Providing Commercial Support for Apache/TITLE -/HEADBODY +/HEAD +BODY BGCOLOR=#FF TEXT=#00 LINK=#FF VLINK=#80 + ALINK=#FF H1Companies and Contractors Providing Commercial Support for Apache/H1
cvs commit: apache-1.3 STATUS
martin 98/03/26 05:54:04 Modified:.STATUS Log: Note %2F fix Revision ChangesPath 1.217 +2 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.216 retrieving revision 1.217 diff -u -u -r1.216 -r1.217 --- STATUS1998/03/26 13:32:10 1.216 +++ STATUS1998/03/26 13:54:01 1.217 @@ -15,7 +15,7 @@ or not, and if not, what changes are needed to make it right. Approve guidelines as written: - +1: Roy, Dean, Paul, Jim + +1: Roy, Dean, Paul, Jim, Martin +0: -1: @@ -109,6 +109,7 @@ * Ralf's change to make the shared object compilation command more portable * Dean's protect against FD_SETSIZE mismatches * Ralf's fallback stategy because of HIDE for loading shared object modules +* Martin's fix to allow %2F chars in proxy requests and in the uri query part Available Patches:
cvs commit: apache-1.3/src CHANGES
martin 98/03/26 05:54:41 Modified:src CHANGES Log: Document %2F fix in http_request Revision ChangesPath 1.732 +7 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.731 retrieving revision 1.732 diff -u -u -r1.731 -r1.732 --- CHANGES 1998/03/25 09:44:46 1.731 +++ CHANGES 1998/03/26 13:54:39 1.732 @@ -1,5 +1,12 @@ Changes with Apache 1.3b6 + *) Allow %2F in two situations: 1) it is in the query part of the URI, + therefore not exposed to %2F - '/' translations and 2) the request + is a proxy request, so we're not dealing with a local resource anyway. + Without this, the proxy would fail to work for any URL's with + %2f in them (occurs quite often in + http://.../cgi-bin/...?http%3A%2F%2F... references) [Martin Kraemer] + *) Finally fix the shared object loading by using a fallback strategy to overcome the HIDE feature problematic without loosing special cases. Also a huge comment was added to mod_so.c to make the situation more clear
cvs commit: apache-site/info supportdb.txt
randy 98/03/26 05:55:37 Modified:info supportdb.txt Log: ... Revision ChangesPath 1.10 +1 -1 apache-site/info/supportdb.txt Index: supportdb.txt === RCS file: /export/home/cvs/apache-site/info/supportdb.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- supportdb.txt 1998/03/26 13:50:07 1.9 +++ supportdb.txt 1998/03/26 13:55:36 1.10 @@ -1,5 +1,5 @@ # Type NameURL E-mail Phone Fax LocationComments -Comp Covalent Technologies, Inc. http://www.covalent.net/[EMAIL PROTECTED] (402) 441-5710 (402) 441-5720 Lincoln, Nebraska, USA Covalentdevelops and sells Raven, an SSL add-on module for Apache. +Comp Covalent Technologies, Inc. http://www.covalent.net/[EMAIL PROTECTED] (402) 441-5710 (402) 441-5720 Lincoln, Nebraska, USA Covalent develops and sells Raven, an SSL add-on module for Apache. Comp Dana Point Communication Systemshttp://www.dpcsys.com/ [EMAIL PROTECTED] (714) 443-4172 (714) 443-9516 Dana Point, California Comp Digituruhttp://www.digit.ee/[EMAIL PROTECTED] Estonia Comp ICONSULThttp://www.iconsult.com/[EMAIL PROTECTED] +49-(0)9131-502864 +49-(0)9131-537873 Erlangen, Germany
cvs commit: apache-1.3/src/main http_request.c
martin 98/03/26 06:06:49
Modified:src/main http_request.c
Log:
Don't refuse to serve if %2F occurs in the query part only,
or in a proxy request (this shouldn't return a 404 anyway, but a 400)
Revision ChangesPath
1.114 +7 -4 apache-1.3/src/main/http_request.c
Index: http_request.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_request.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -u -r1.113 -r1.114
--- http_request.c1998/03/17 07:54:22 1.113
+++ http_request.c1998/03/26 14:06:48 1.114
@@ -1020,10 +1020,13 @@
return;
}
-access_status = unescape_url(r-uri);
-if (access_status) {
- die(access_status, r);
- return;
+/* Ignore embedded %2F's in path for proxy requests */
+if (!r-proxyreq r-parsed_uri.path) {
+ access_status = unescape_url(r-parsed_uri.path);
+ if (access_status) {
+ die(access_status, r);
+ return;
+ }
}
getparents(r-uri); /* OK --- shrinking transformations... */
cvs commit: apache-1.3/src Configure
martin 98/03/26 06:09:51 Modified:src Configure Log: Move BS2000 compile switches to CC macro, since these flags must be present both for compile and link Revision ChangesPath 1.220 +2 -2 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.219 retrieving revision 1.220 diff -u -u -r1.219 -r1.220 --- Configure 1998/03/25 20:33:39 1.219 +++ Configure 1998/03/26 14:09:50 1.220 @@ -529,8 +529,8 @@ BS2000*-sni-sysv4*) OS='BS2000' OSDIR='os/bs2000' - CC='c89' - CFLAGS=$CFLAGS -DCHARSET_EBCDIC -DSVR4 -D_XPG_IV -XLLML -XLLMK + CC='c89 -XLLML -XLLMK' + CFLAGS=$CFLAGS -DCHARSET_EBCDIC -DSVR4 -D_XPG_IV DEF_WANTHSREGEX=yes LIBS=$LIBS -lsocket -lnsl -lc ;;
cvs commit: apache-1.3 STATUS
rse 98/03/26 06:35:04 Modified:.STATUS Log: votes... Revision ChangesPath 1.218 +5 -4 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.217 retrieving revision 1.218 diff -u -r1.217 -r1.218 --- STATUS1998/03/26 13:54:01 1.217 +++ STATUS1998/03/26 14:35:03 1.218 @@ -15,7 +15,7 @@ or not, and if not, what changes are needed to make it right. Approve guidelines as written: - +1: Roy, Dean, Paul, Jim, Martin + +1: Roy, Dean, Paul, Jim, Martin, Ralf +0: -1: @@ -352,7 +352,7 @@ * Maybe a http_paths.h file? See [EMAIL PROTECTED] - Dean +1, Brian +1, Paul +1 + Dean +1, Brian +1, Paul +1, Ralf +1 * Release builds: Should we provide Configuration or not? Should we 'make all suexec' in src/support? @@ -389,7 +389,7 @@ field is r-content_languages. Heck it's not even mentioned in apache-devsite/mmn.txt when we got content_languages (note the s!). The proposal is to remove r-content_language: - Status: Dean +1, Paul +1, Roy +1 + Status: Dean +1, Paul +1, Roy +1, Ralf +1 - child_exit() is redundant, it can be implemented via cleanups. It is not symmetric in the sense that there is no exit API method to go @@ -398,7 +398,8 @@ mod_mmap_static, and mod_php3 for example). The proposal is to remove the child_exit() method and document cleanups as the method of handling this need. - Status: Dean +1, Rasmus +1, Paul +1, Roy +1, Jim +1, Martin +1 + Status: Dean +1, Rasmus +1, Paul +1, Roy +1, Jim +1, + Martin +1, Ralf +1 Win32 specific issues:
cvs commit: apache-2.0 STATUS
rse 98/03/26 06:48:18 Modified:.STATUS Log: votes... Revision ChangesPath 1.34 +14 -13apache-2.0/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-2.0/STATUS,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- STATUS1998/03/26 11:45:10 1.33 +++ STATUS1998/03/26 14:48:17 1.34 @@ -25,11 +25,11 @@ segments should persist until the refcount drops to zero. It would be cool if pools could be created in such segments to allow things like shared tables and arrays. - +1: Roy, Paul, Ken + +1: Roy, Paul, Ken, Ralf * Apache ports project - simple-to-install (a la CPAN) one-off tools, scripts (such as counters, guest books, et cetera) - +1: Roy, Paul, Ken + +1: Roy, Paul, Ken, Ralf * Improve mod_include SSI handling, perhaps by caching offsets to directives. Also, clean up the conditional syntax to allow @@ -43,7 +43,7 @@ to have things like the arrays, tables, pools, and related primitives moved into a library of which httpd is just a client and other things can be too. - +1: Roy, Paul, Jim, Ken + +1: Roy, Paul, Jim, Ken, Ralf * Replace the current Unix compilation model (Configuration.tmpl, home-brew Configure script) with the autoconf toolset. @@ -64,8 +64,9 @@ objects other than in the source tree. autoconf allows for this... you can do mkdir obj; cd obj; ../configure. This is great for multiple platforms... or even on a single platform, one copy with profiling another -without. - +1: Dean, Roy, Paul +without. (There are a lot of possibilities: creating shadow trees, +VPATH-style Makefile settings, etc.) + +1: Dean, Roy, Paul, Ralf * One of the main restrictions on Apache has been that we must assume a very low-level common denominator for the OSs out there. For example, @@ -98,13 +99,13 @@ * multithreading. +1: Brian, Ken, Jim, Paul, Sameer, Marc, Ralf, MarkC, Ben, Martin, Roy o Thread Abstraction -+1: Sameer, Marc, MarkC, Ben, Dean, Paul, Martin, Roy ++1: Sameer, Marc, MarkC, Ben, Dean, Paul, Martin, Roy, Ralf Status: nobody has volunteered yet * revamped process model (Dean's proposal) Dean says: it's hard to do the multithreading work cleanly without considering a bunch of this -+1: MarkC, Paul, Dean, Martin, Roy, ++1: MarkC, Paul, Dean, Martin, Roy, Ralf Marc (+1 on much of it; threads aren't enough for perf.), Status: nobody has volunteered yet @@ -132,7 +133,7 @@ The only problem is reclaiming buffers so that a large SSI won't suck up all available memory just sending it out the pipe.] +1: Dean, Marc, Ben, Paul, Martin, Roy -+0: Jim [what about examples? Portability concerns?] ++0: Jim [what about examples? Portability concerns?], Ralf * API work @@ -167,8 +168,8 @@ o backward compatibility with 1.3 (just require a recompile) if functions get renamed, old names retained as wrappers -+1: Paul, Sameer, Marc, Ralf, MarkC --1: Roy ++1: Paul, Sameer, Marc, MarkC +-1: Roy, Ralf o make API call syntax rational (e.g., all r*() routines list r as their first argument, et cetera) @@ -178,7 +179,7 @@ o abstract module layering for plugins (e.g., a mod_auth interface into which mod_auth_mumble modules can be plugged) -+1: Ken, Martin ++1: Ken, Martin, Ralf +0: Roy [needs more detailed proposal] Status: Ken has volunteered @@ -188,7 +189,7 @@ Status: Ken has volunteered o use XML -+0: Roy ++0: Roy, Ralf * rewrite in C++ +1: Ben, Martin @@ -196,7 +197,7 @@ -1: MarkC, Paul, Roy, Ken * make everything C++ friendly (fix that damned pool decl) -+1: Roy, Paul, Ken ++1: Roy, Paul, Ken, Ralf Status: nobody has volunteered yet Closed issues:
cvs commit: apache-1.3 STATUS
chuck 98/03/26 07:17:28 Modified:.STATUS Log: Submitted by: Chuck Change to +0 my vote for inclusion APACI. I am still slightly tempted to -1, but for no good reason other than the incredibly condescending comments associated with it. This addition has been a classic exercise in social and political ineptness. C'est la vie; it's good code. No release soon, anyway, so I guess code freeze is over. Revision ChangesPath 1.219 +4 -2 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.218 retrieving revision 1.219 diff -u -r1.218 -r1.219 --- STATUS1998/03/26 14:35:03 1.218 +++ STATUS1998/03/26 15:17:27 1.219 @@ -264,13 +264,15 @@ worth adding it by weighting on the advantages and disadvantages. Votes for including APACI (in general): - Ralf +1, Dean +1, Roy +1, Paul +1, Martin +1, Jim +1 + Ralf +1, Dean +1, Roy +1, Paul +1, Martin +1, Jim +1, Chuck +0 Votes for commit variants: - CV1: Ralf +1, Dean +1, Roy +1, Paul +1, Martin +1 Jim +1 + CV1: Ralf +1, Dean +1, Roy +1, Paul +1, Martin +1 Jim +1, Chuck +0 CV2: Ralf +0 Notes: + Chuck: What the heck. We're not releasing soon anymore. Let users + get used to it if there's time. Jim: [the +1] iff we remove the present top-level build capability AND we clearly document the changes Ralf: Sure, top-level Makefile+src/helpers/InstallApache is removed
cvs commit: apache-1.3/htdocs/manual ebcdic.html
martin 98/03/26 07:48:50 Added: htdocs/manual ebcdic.html Log: Add a preliminary EBCDIC porting paper (derived from README.EBCDIC) Revision ChangesPath 1.1 apache-1.3/htdocs/manual/ebcdic.html Index: ebcdic.html === !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 3.2 Final//EN HTML HEAD TITLEThe Apache EBCDIC Port/TITLE /HEAD !-- Background white, links blue (unvisited), navy (visited), red (active) -- BODY BGCOLOR=#FF TEXT=#00 LINK=#FF VLINK=#80 ALINK=#FF !--#include virtual=header.html -- H1 ALIGN=CENTEROverview of Apache EBCDIC Port/H1 P Version 1.3 of the Apache HTTP Server is the first version which includes a port to a (non-ASCII) mainframe machine which uses the EBCDIC character set as its native codeset.BR (It is the SIEMENS NIXDORF family of mainframes running the A HREF=http://www.sni.de/servers/bs2osd/osdbc_us.htm;BS2000/OSD operating system/A. This mainframe OS nowadays features a SVR4-derived POSIX subsystem). /P P The port was started initially to UL LI prove the feasibility of porting A HREF=http://dev.apache.org/;the Apache HTTP server/A to this platform LI find a worthy and capable successor for the venerable A HREF=http://www.w3.org/Daemon/;CERN-3.0/A daemon (which was ported a couple of years ago), and to LI prove that Apache's preforking process model can on this platform easily outperform the accept-fork-serve model used by CERN by a factor of 5 or more. /UL /P P This document serves as a rationale to describe some of the design decisions of the port to this machine. /P P One objective of the EBCDIC port was to maintain enough backwards compatibility with the (EBCDIC) CERN server to make the transition to the new server attractive and easy. This required the addition of a configurable method to define whether a HTML document was stored in ASCII (the only format accepted by the old server) or in EBCDIC (the native document format in the POSIX subsystem, and therefore the only realistic format in which the other POSIX tools like grep or sed could operate on the documents). The current solution to this is a pseudo-MIME-format which is intercepted and interpreted by the Apache server (see below). Future versions might solve the problem by defining an ebcdic-handler for all documents which must be converted. /P P Since all Apache input and output is based upon the BUFF data type and its methods, the easiest solution was to add the conversion to the BUFF handling routines. The conversion must be settable at any time, so a BUFF flag was added which defines whether a BUFF object has currently enabled conversion or not. This flag is modified at several points in the HTTP protocol: UL LISTRONGset/STRONG before a request is received (because the request and the request header lines are always in ASCII format) LISTRONGset/unset/STRONG when the request body is received - depending on the content type of the request body (because the request body may contain ASCII text or a binary file) LISTRONGset/STRONG before a reply header is sent (because the response header lines are always in ASCII format) LISTRONGset/unset/STRONG when the response body is sent - depending on the content type of the response body (because the response body may contain text or a binary file) /UL /P H1 ALIGN=CENTERPorting Notes/H1 P OL LI The relevant changes in the source are #ifdef'ed into two categories: DL DTCODESTRONG#ifdef CHARSET_EBCDIC/STRONG/CODE DDCode which is needed for any EBCDIC based machine. This includes character translations, differences in in contiguity of the two character sets, flags which indicate which part of the HTTP protocol has to be converted and which part doesn't etc. DTCODESTRONG#ifdef _OSD_POSIX/STRONG/CODE DDCode which is needed for the BS2000 SIEMENS NIXDORF mainframe platform only. This deals with include file differences and socket implementations topics which are only required on the BS2000/OSD platform. /DL /LIBR LI The possibility to translate between ASCII and EBCDIC at the socket level (on BS2000 POSIX, there is a socket option which supports this) was intentionally EMnot/EM chosen, because the byte stream at the HTTP protocol level consists of a mixture of protocol related strings and non-protocol related raw file data. HTTP protocol strings are always encoded in ASCII (the GET request, any Header: lines, the chunking
cvs commit: apache-1.3/htdocs/manual ebcdic.html
martin 98/03/26 08:19:48 Modified:htdocs/manual ebcdic.html Log: typo Revision ChangesPath 1.2 +1 -1 apache-1.3/htdocs/manual/ebcdic.html Index: ebcdic.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/ebcdic.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -u -r1.1 -r1.2 --- ebcdic.html 1998/03/26 15:48:49 1.1 +++ ebcdic.html 1998/03/26 16:19:47 1.2 @@ -13,7 +13,7 @@ ALINK=#FF !--#include virtual=header.html -- -H1 ALIGN=CENTEROverview of Apache EBCDIC Port/H1 +H1 ALIGN=CENTEROverview of the Apache EBCDIC Port/H1 P Version 1.3 of the Apache HTTP Server is the first version which
cvs commit: apache-1.2/src CHANGES buff.c
dgaudet 98/03/26 10:52:54
Modified:src CHANGES buff.c
Log:
Fix an incompatible pointer type assignment.
PR: 2001
Revision ChangesPath
1.301 +3 -0 apache-1.2/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.2/src/CHANGES,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- CHANGES 1998/03/16 19:38:53 1.300
+++ CHANGES 1998/03/26 18:52:48 1.301
@@ -1,5 +1,8 @@
Changes with Apache 1.2.7
+ *) Fix an incompatible pointer type assignment warning in buff.c.
+ [Dean Gaudet] PR#2001
+
*) mod_proxy was not clearing the Proxy-Connection header from
requests; now it does. This did not violate any spec, however
causes poor interactions when you are talking to remote proxies.
1.30 +1 -1 apache-1.2/src/buff.c
Index: buff.c
===
RCS file: /export/home/cvs/apache-1.2/src/buff.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- buff.c1998/02/07 10:26:12 1.29
+++ buff.c1998/03/26 18:52:50 1.30
@@ -234,7 +234,7 @@
end_chunk( BUFF *fb )
{
int i;
-char *strp;
+unsigned char *strp;
if( fb-outchunk == -1 ) {
/* not chunking */
cvs commit: apache-1.2/src CHANGES http_main.c
dgaudet 98/03/26 10:59:39
Modified:src CHANGES http_main.c
Log:
After a SIGHUP the listening sockets in the parent weren't
properly marked for closure on fork().
PR: 2000
Submitted by: Jürgen Keil [EMAIL PROTECTED]
Revision ChangesPath
1.302 +4 -0 apache-1.2/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.2/src/CHANGES,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- CHANGES 1998/03/26 18:52:48 1.301
+++ CHANGES 1998/03/26 18:59:36 1.302
@@ -1,5 +1,9 @@
Changes with Apache 1.2.7
+ *) After a SIGHUP the listening sockets in the parent weren't
+ properly marked for closure on fork().
+ [Jürgen Keil [EMAIL PROTECTED]] PR#2000
+
*) Fix an incompatible pointer type assignment warning in buff.c.
[Dean Gaudet] PR#2001
1.152 +3 -0 apache-1.2/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-1.2/src/http_main.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- http_main.c 1998/02/17 01:45:58 1.151
+++ http_main.c 1998/03/26 18:59:37 1.152
@@ -2255,6 +2255,9 @@
if (fd 0) {
fd = make_sock (pconf, lr-local_addr);
}
+ else {
+ note_cleanups_for_fd(pconf, fd);
+ }
FD_SET (fd, listenfds);
if (fd listenmaxfd) listenmaxfd = fd;
lr-fd = fd;
cvs commit: apache-1.3/src/main http_main.c
dgaudet 98/03/26 11:03:04
Modified:src CHANGES
src/main http_main.c
Log:
After a SIGHUP the listening sockets in the parent weren't
properly marked for closure on fork().
PR: 2000
Submitted by: Jürgen Keil [EMAIL PROTECTED]
Revision ChangesPath
1.733 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.732
retrieving revision 1.733
diff -u -r1.732 -r1.733
--- CHANGES 1998/03/26 13:54:39 1.732
+++ CHANGES 1998/03/26 19:02:59 1.733
@@ -1,4 +1,8 @@
Changes with Apache 1.3b6
+
+ *) After a SIGHUP the listening sockets in the parent weren't
+ properly marked for closure on fork().
+ [Jürgen Keil [EMAIL PROTECTED]] PR#2000
*) Allow %2F in two situations: 1) it is in the query part of the URI,
therefore not exposed to %2F - '/' translations and 2) the request
1.312 +3 -0 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.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- http_main.c 1998/03/25 10:07:50 1.311
+++ http_main.c 1998/03/26 19:03:02 1.312
@@ -2816,6 +2816,9 @@
if (fd 0) {
fd = make_sock(p, lr-local_addr);
}
+ else {
+ note_cleanups_for_socket(p, fd);
+ }
if (fd = 0) {
FD_SET(fd, listenfds);
if (fd listenmaxfd)
cvs commit: apache-1.2/src CHANGES conf.h
dgaudet 98/03/26 11:24:13 Modified:src CHANGES conf.h Log: It seems foolish to define SIGURG SIGUSR1 especially when SIGUSR1 is used for graceful restarts. Given that the only usage of SIGURG is now protected by a #ifdef we don't really need the definition. Revision ChangesPath 1.303 +2 -0 apache-1.2/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.2/src/CHANGES,v retrieving revision 1.302 retrieving revision 1.303 diff -u -r1.302 -r1.303 --- CHANGES 1998/03/26 18:59:36 1.302 +++ CHANGES 1998/03/26 19:24:11 1.303 @@ -1,5 +1,7 @@ Changes with Apache 1.2.7 + *) PORT: Clean up undefined signals on SCO. [Dean Gaudet] + *) After a SIGHUP the listening sockets in the parent weren't properly marked for closure on fork(). [Jürgen Keil [EMAIL PROTECTED]] PR#2000 1.102 +0 -3 apache-1.2/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache-1.2/src/conf.h,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- conf.h1998/02/14 13:37:22 1.101 +++ conf.h1998/03/26 19:24:12 1.102 @@ -277,13 +277,11 @@ #define NEED_INITGROUPS #define NO_WRITEV #define JMP_BUF sigjmp_buf -#define SIGURG SIGUSR1 /* but note, this signal will be sent to a process group if enabled (for OOB data). It is not currently enabled. */ #include sys/time.h #elif defined(SCO5) #define JMP_BUF sigjmp_buf -#define SIGURG SIGUSR1 #define HAVE_SYS_SELECT_H #define USE_FCNTL_SERIALIZED_ACCEPT #define HAVE_MMAP @@ -504,7 +502,6 @@ #define NO_KILLPG #undef NO_SETSID #define HAVE_SHMGET -#define SIGURG SIGUSR1 #define JMP_BUF sigjmp_buf #define USE_FCNTL_SERIALIZED_ACCEPT
cvs commit: apache-1.3/src/include conf.h
dgaudet 98/03/26 11:26:26 Modified:src CHANGES src/include conf.h Log: It seems foolish to define SIGURG SIGUSR1 especially when SIGUSR1 is used for graceful restarts. Given that the only usage of SIGURG is now protected by a #ifdef we don't really need the definition. ... similarly for BeOS, why define SIGBUS SIGSEGV? Revision ChangesPath 1.734 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.733 retrieving revision 1.734 diff -u -r1.733 -r1.734 --- CHANGES 1998/03/26 19:02:59 1.733 +++ CHANGES 1998/03/26 19:26:23 1.734 @@ -1,5 +1,8 @@ Changes with Apache 1.3b6 + *) PORT: Clean up undefined signals on some platforms (SCO, BeOS). + [Dean Gaudet] + *) After a SIGHUP the listening sockets in the parent weren't properly marked for closure on fork(). [Jürgen Keil [EMAIL PROTECTED]] PR#2000 1.195 +0 -7 apache-1.3/src/include/conf.h Index: conf.h === RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- conf.h1998/03/17 19:51:48 1.194 +++ conf.h1998/03/26 19:26:25 1.195 @@ -391,13 +391,11 @@ #undef NO_SETSID #define NEED_INITGROUPS #define NO_WRITEV -#define SIGURG SIGUSR1 /* but note, this signal will be sent to a process group if enabled (for OOB data). It is not currently enabled. */ #include sys/time.h #define HAVE_SYSLOG 1 #elif defined(SCO5) -#define SIGURG SIGUSR1 #define HAVE_SYS_SELECT_H 1 #define USE_FCNTL_SERIALIZED_ACCEPT #define HAVE_MMAP 1 @@ -682,7 +680,6 @@ #undef NO_SETSID #define HAVE_SHMGET 1 #define USE_SHMGET_SCOREBOARD -#define SIGURG SIGUSR1 #define USE_FCNTL_SERIALIZED_ACCEPT #define HAVE_SYSLOG 1 @@ -718,10 +715,6 @@ #define NO_WRITEV #define NO_KILLPG #define NEED_INITGROUPS - -/* BeOS doesn't have a couple signals... redefine to close ones */ -#define SIGBUS SIGSEGV -#define SIGURG SIGPIPE #define isascii(c) (!((c) ~0177))
cvs commit: apache-1.3 STATUS
dgaudet 98/03/26 11:44:46 Modified:.STATUS Log: So it's sunny now, and the outdoors is calling me... and any monumental fixes I've been thinking about are somewhere deep in my mind I can't find at the moment. I'm ready to throw in the towel so that unix 1.3.0 can get out there, and get into reviewer's hot little hands. I know of a few groups that want to benchmark it, but really would prefer to benchmark something released. I really don't want to see us with win32 tied to unix release schedule forever... it's pointless. It's all just names anyhow. Whether we call it a beta or a current release it's just a name. It's time we at least had a release candidate to use the 1.2 terminology... I'm with Roy, I want to drop the x.ybz designations. I want x.y.z, a single numbering scheme. Revision ChangesPath 1.220 +15 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.219 retrieving revision 1.220 diff -u -r1.219 -r1.220 --- STATUS1998/03/26 15:17:27 1.219 +++ STATUS1998/03/26 19:44:45 1.220 @@ -116,7 +116,7 @@ * Ken's slight reworking of the Apache LICENSE to clarify the restricted nature of usage of the name Apache in derived products Status: Ken +1, Paul +1, Ben +1, Jim +1, Randy +1, Roy +1, - Chuck +1, MarkC +1, Ralf +1, Sameer +1, Martin +1 + Chuck +1, MarkC +1, Ralf +1, Sameer +1, Martin +1, Dean +1 * Ralf's Apache 1.3 Autoconf-*style* Interface (APACI) @@ -402,6 +402,20 @@ handling this need. Status: Dean +1, Rasmus +1, Paul +1, Roy +1, Jim +1, Martin +1, Ralf +1 + +* Don't wait for WIN32: It's been quite some time and WIN32 doesn't seem + to be progressing, and Unix seems quite stable. It would be in Apache's + best interest to continue to support Unix to its utmost, and not delay + a release of 1.3.0 waiting for WIN32 issues to be resolved. + + Proposal: the next release should be named 1.3.0 and should be labelled + stable on unix, beta on NT. + +1: Dean + + Proposal: the next release should be named 1.3b6, and labelled release + candidate on unix, beta on NT. The release after that will be + called 1.3.0 stable on unix, beta on NT. + +0: Dean Win32 specific issues:
cvs commit: apache-1.3 STATUS
jim 98/03/26 12:08:50 Modified:.STATUS Log: Just a vote... thoughts on whether to drop naming each beta release to come later, but, in short, I think it just will cause major confusion for the outside world Revision ChangesPath 1.221 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.220 retrieving revision 1.221 diff -u -r1.220 -r1.221 --- STATUS1998/03/26 19:44:45 1.220 +++ STATUS1998/03/26 20:08:48 1.221 @@ -415,6 +415,7 @@ Proposal: the next release should be named 1.3b6, and labelled release candidate on unix, beta on NT. The release after that will be called 1.3.0 stable on unix, beta on NT. + +1: Jim +0: Dean Win32 specific issues:
cvs commit: apache-1.3/src/main http_core.c
dgaudet 98/03/26 13:08:38
Modified:src CHANGES
src/main http_core.c
Log:
really make the hostnamelookups default off
Revision ChangesPath
1.735 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.734
retrieving revision 1.735
diff -u -r1.734 -r1.735
--- CHANGES 1998/03/26 19:26:23 1.734
+++ CHANGES 1998/03/26 21:08:35 1.735
@@ -1,5 +1,8 @@
Changes with Apache 1.3b6
+ *) The default for HostnameLookups was changed to Off, but there
+ was a problem and it wasn't taking effect. [Dean Gaudet]
+
*) PORT: Clean up undefined signals on some platforms (SCO, BeOS).
[Dean Gaudet]
1.176 +3 -0 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- http_core.c 1998/03/17 19:38:42 1.175
+++ http_core.c 1998/03/26 21:08:37 1.176
@@ -503,6 +503,9 @@
hostname_lookups =
((core_dir_config *)get_module_config(dir_config, core_module))
-hostname_lookups;
+ if (hostname_lookups == HOSTNAME_LOOKUP_UNSET) {
+ hostname_lookups = HOSTNAME_LOOKUP_OFF;
+ }
} else {
/* the default */
hostname_lookups = HOSTNAME_LOOKUP_OFF;
cvs commit: apache-1.3/src/include http_core.h httpd.h
dgaudet 98/03/26 13:17:42 Modified:src CHANGES src/include http_core.h httpd.h Log: I think it was Marc that pointed this out ages ago... I don't remember. We need to mark various bitfields as signed to follow the spec. Revision ChangesPath 1.736 +4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.735 retrieving revision 1.736 diff -u -r1.735 -r1.736 --- CHANGES 1998/03/26 21:08:35 1.735 +++ CHANGES 1998/03/26 21:17:37 1.736 @@ -1,5 +1,9 @@ Changes with Apache 1.3b6 + *) ANSI C doesn't guarantee that int foo : 2 in a structure will + be a signed bitfield. So mark a few bitfields as signed to + ensure correct code. [Dean Gaudet] + *) The default for HostnameLookups was changed to Off, but there was a problem and it wasn't taking effect. [Dean Gaudet] 1.40 +3 -3 apache-1.3/src/include/http_core.h Index: http_core.h === RCS file: /export/home/cvs/apache-1.3/src/include/http_core.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- http_core.h 1998/03/17 19:38:40 1.39 +++ http_core.h 1998/03/26 21:17:40 1.40 @@ -184,11 +184,11 @@ #define HOSTNAME_LOOKUP_ON 1 #define HOSTNAME_LOOKUP_DOUBLE 2 #define HOSTNAME_LOOKUP_UNSET3 -int hostname_lookups : 4; +unsigned int hostname_lookups : 4; -int do_rfc1413 : 2; /* See if client is advertising a username? */ +signed int do_rfc1413 : 2; /* See if client is advertising a username? */ -int content_md5 : 2; /* calculate Content-MD5? */ +signed int content_md5 : 2; /* calculate Content-MD5? */ unsigned use_canonical_name : 2; /* bit 0 = on/off, bit 1 = unset/set */ 1.200 +2 -2 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- httpd.h 1998/03/17 07:54:13 1.199 +++ httpd.h 1998/03/26 21:17:40 1.200 @@ -722,10 +722,10 @@ char *auth_type; /* Ditto. */ unsigned aborted:1; /* Are we still talking? */ -int keepalive:2; /* Are we using HTTP Keep-Alive? +signed int keepalive:2; /* Are we using HTTP Keep-Alive? * -1 fatal error, 0 undecided, 1 yes */ unsigned keptalive:1;/* Did we use HTTP Keep-Alive? */ -int double_reverse:2;/* have we done double-reverse DNS? +signed int double_reverse:2;/* have we done double-reverse DNS? * -1 yes/failure, 0 not yet, 1 yes/success */ int keepalives; /* How many times have we used it? */ };
cvs commit: apache-1.3/src/modules/standard mod_status.c
dgaudet 98/03/26 13:20:53
Modified:src CHANGES
src/include scoreboard.h
src/main http_core.c http_main.c
src/modules/standard mod_status.c
Log:
a few changes to scoreboard definitions to generate better code
Revision ChangesPath
1.737 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.736
retrieving revision 1.737
diff -u -r1.736 -r1.737
--- CHANGES 1998/03/26 21:17:37 1.736
+++ CHANGES 1998/03/26 21:20:46 1.737
@@ -1,5 +1,8 @@
Changes with Apache 1.3b6
+ *) A few changes to scoreboard definitions which helps gcc generate
+ better code. [Dean Gaudet]
+
*) ANSI C doesn't guarantee that int foo : 2 in a structure will
be a signed bitfield. So mark a few bitfields as signed to
ensure correct code. [Dean Gaudet]
1.37 +4 -5 apache-1.3/src/include/scoreboard.h
Index: scoreboard.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/scoreboard.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- scoreboard.h 1998/01/21 19:17:44 1.36
+++ scoreboard.h 1998/03/26 21:20:48 1.37
@@ -68,11 +68,10 @@
* Status values:
*/
-#define SERVER_UNKNOWN (-1) /* should never be in this state */
#define SERVER_DEAD 0
-#define SERVER_READY 1 /* Waiting for connection (or accept()
lock) */
-#define SERVER_STARTING 3/* Server Starting up */
-#define SERVER_BUSY_READ 2 /* Reading a client request */
+#define SERVER_STARTING 1/* Server Starting up */
+#define SERVER_READY 2 /* Waiting for connection (or accept()
lock) */
+#define SERVER_BUSY_READ 3 /* Reading a client request */
#define SERVER_BUSY_WRITE 4 /* Processing a client request */
#define SERVER_BUSY_KEEPALIVE 5 /* Waiting for more requests via
keepalive */
#define SERVER_BUSY_LOG 6/* Logging the request */
@@ -101,7 +100,7 @@
vtime_t cur_vtime; /* the child's current vtime */
unsigned short timeout_len; /* length of the timeout */
#endif
-signed char status;
+unsigned char status;
#if defined(STATUS)
unsigned long access_count;
unsigned long bytes_served;
1.177 +2 -2 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- http_core.c 1998/03/26 21:08:37 1.176
+++ http_core.c 1998/03/26 21:20:49 1.177
@@ -495,7 +495,7 @@
struct hostent *hptr;
int hostname_lookups;
#ifdef STATUS
-int old_stat = SERVER_UNKNOWN;
+int old_stat = SERVER_DEAD; /* we shouldn't ever be in this state */
#endif
/* If we haven't checked the host name, and we want to */
@@ -542,7 +542,7 @@
}
}
#ifdef STATUS
-if (old_stat != SERVER_UNKNOWN) {
+if (old_stat != SERVER_DEAD) {
(void)update_child_status(conn-child_num,old_stat,(request_rec*)NULL);
}
#endif /* STATUS */
1.313 +22 -20apache-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.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- http_main.c 1998/03/26 19:03:02 1.312
+++ http_main.c 1998/03/26 21:20:50 1.313
@@ -3581,35 +3581,37 @@
sync_scoreboard_image();
for (i = 0; i daemons_limit; ++i) {
+ int status;
+
if (i = max_daemons_limit free_length == idle_spawn_rate)
break;
ss = scoreboard_image-servers[i];
- switch (ss-status) {
- /* We consider a starting server as idle because we started it
- * at least a cycle ago, and if it still hasn't finished starting
- * then we're just going to swamp things worse by forking more.
- * So we hopefully won't need to fork more if we count it.
- */
- case SERVER_STARTING:
- case SERVER_READY:
- ++ idle_count;
- /* always kill the highest numbered child if we have to...
- * no really well thought out reason ... other than observing
- * the server behaviour under linux where lower numbered children
- * tend to service more hits (and hence are more likely to have
- * their data in cpu caches).
- */
- to_kill = i;
- break;
- case
cvs commit: apache-1.2/src CHANGES http_protocol.c
dgaudet 98/03/26 13:27:47
Modified:src CHANGES http_protocol.c
Log:
Fixed a bug in URL parsing that caused a wrong decoding of
URLs with empty paths.
Submitted by: Alvaro Martínez Echevarría [EMAIL PROTECTED]
Revision ChangesPath
1.304 +4 -0 apache-1.2/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.2/src/CHANGES,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- CHANGES 1998/03/26 19:24:11 1.303
+++ CHANGES 1998/03/26 21:27:44 1.304
@@ -1,5 +1,9 @@
Changes with Apache 1.2.7
+ *) Fixed a bug in URL parsing that caused a wrong decoding of
+ URLs with empty paths.
+ [Alvaro Martínez Echevarría [EMAIL PROTECTED]]
+
*) PORT: Clean up undefined signals on SCO. [Dean Gaudet]
*) After a SIGHUP the listening sockets in the parent weren't
1.133 +14 -2 apache-1.2/src/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache-1.2/src/http_protocol.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- http_protocol.c 1998/03/10 06:14:57 1.132
+++ http_protocol.c 1998/03/26 21:27:45 1.133
@@ -528,6 +528,12 @@
}
else {
r-proxyreq = 0;
+ /* If the uri is empty (), then we have a http://host[:port];
+ * request, so we'll use / instead (RFC2068).
+ */
+ if (!*uri) {
+ uri = pstrdup (r-pool, /);
+ }
r-uri = getword (r-pool, uri, '?');
#ifdef __EMX__
@@ -561,7 +567,9 @@
/* Find the hostname, assuming a valid request */
i = ind(name, '/');
- name[i] = '\0';
+ if (i=0) {
+name[i] = '\0';
+ }
/* Find the port */
host = getword_nc(r-pool, name, ':');
@@ -579,7 +587,11 @@
/* Save it for later use */
r-hostname = pstrdup(r-pool, host);
- r-hostlen = 7 + i;
+ if (i=0) {
+r-hostlen = 7 + i;
+ } else {
+r-hostlen = strlen(uri);
+ }
/* The easy cases first */
if (!strcasecmp(host, r-server-server_hostname)) {
