cvs commit: apache/src CHANGES Configure
jim 97/05/12 17:20:32 Modified:src CHANGES Configure Log: Allow whitespace in Configuration when appropriate Revision ChangesPath 1.272 +5 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.271 retrieving revision 1.272 diff -C3 -r1.271 -r1.272 *** CHANGES 1997/05/11 22:30:36 1.271 --- CHANGES 1997/05/13 00:20:29 1.272 *** *** 1,5 --- 1,10 Changes with Apache 1.2 + *) Configure changes: Allow for whitespace at the start of a + Module declaration. Also, be more understanding about the + CC=/OPTIM= format in Configuration. Finally, fix compiler + flags if using HP-UX's cc compiler. [Jim Jagielski] + *) Subrequests and internal redirect now inherit the_request from the original request-line. [Roy Fielding] 1.96 +7 -5 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.95 retrieving revision 1.96 diff -C3 -r1.95 -r1.96 *** Configure 1997/05/10 21:53:53 1.95 --- Configure 1997/05/13 00:20:30 1.96 *** *** 45,56 fi # First, strip comments and blank lines and then change Rules to comments sed 's/#.*//' $file | \ sed '/^[ ]*$/d' | \ sed 's/[ ]*$//' | \ ! sed 's/^Rule[ ]*/##Rule:/' \ ! $tmpfile # Check for syntax errors... --- 45,58 fi # First, strip comments and blank lines and then change Rules to comments + # and then remove whitespace before Module declarations sed 's/#.*//' $file | \ sed '/^[ ]*$/d' | \ sed 's/[ ]*$//' | \ ! sed 's/^Rule[ ]*/##Rule:/' | \ ! sed 's/^[ ]*Module/Module/' | \ ! sed 's/^[]*%Module/%Module/' $tmpfile # Check for syntax errors... *** *** 169,175 # # We now look for popular compilers. As with ranlib, we ! # do this early but because some options may depend # on which compiler we use/find # for compilers in gcc cc acc c89 --- 171,177 # # We now look for popular compilers. As with ranlib, we ! # do this early because some options may depend # on which compiler we use/find # for compilers in gcc cc acc c89 *** *** 494,500 # and set a safe optimization level # ! if grep CC= Makefile /dev/null; then CC= # clear it just in case else if [ x$CC = x ]; then --- 496,502 # and set a safe optimization level # ! if egrep ^CC[ ]*= Makefile /dev/null; then CC= # clear it just in case else if [ x$CC = x ]; then *** *** 512,518 # # Ditto for optimization # ! if grep OPTIM= Makefile /dev/null; then OPTIM=# ditto else if [ x$OPTIM = x ]; then --- 514,520 # # Ditto for optimization # ! if egrep ^OPTIM[ ]*= Makefile /dev/null; then OPTIM=# ditto else if [ x$OPTIM = x ]; then
cvs commit: apache/src CHANGES http_main.c
fielding97/05/12 20:44:25
Modified:src CHANGES http_main.c
Log:
If a soft_timeout occurs after keepalive is set, then the main child
loop would try to read another request even though the connection
has been aborted.
Reviewed by: Randy Terbush, Dean Gaudet, Chuck Murcko
Revision ChangesPath
1.273 +5 -1 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.272
retrieving revision 1.273
diff -C3 -r1.272 -r1.273
*** CHANGES 1997/05/13 00:20:29 1.272
--- CHANGES 1997/05/13 03:44:22 1.273
***
*** 1,11
Changes with Apache 1.2
*) Configure changes: Allow for whitespace at the start of a
Module declaration. Also, be more understanding about the
CC=/OPTIM= format in Configuration. Finally, fix compiler
flags if using HP-UX's cc compiler. [Jim Jagielski]
! *) Subrequests and internal redirect now inherit the_request from the
original request-line. [Roy Fielding]
*) Test for error conditions before creating output header fields, since
--- 1,15
Changes with Apache 1.2
+ *) If a soft_timeout occurs after keepalive is set, then the main child
+ loop would try to read another request even though the connection
+ has been aborted. [Roy Fielding]
+
*) Configure changes: Allow for whitespace at the start of a
Module declaration. Also, be more understanding about the
CC=/OPTIM= format in Configuration. Finally, fix compiler
flags if using HP-UX's cc compiler. [Jim Jagielski]
! *) Subrequests and internal redirects now inherit the_request from the
original request-line. [Roy Fielding]
*) Test for error conditions before creating output header fields, since
1.144 +5 -6 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -C3 -r1.143 -r1.144
*** http_main.c 1997/05/08 07:57:44 1.143
--- http_main.c 1997/05/13 03:44:23 1.144
***
*** 1861,1868
* until no requests are left or we decide to close.
*/
! for (;;) {
! r = read_request(current_conn);
/* ok we've read the request... it's a little too late
* to do a graceful restart, so ignore them for now.
--- 1861,1867
* until no requests are left or we decide to close.
*/
! while ((r = read_request(current_conn)) != NULL) {
/* ok we've read the request... it's a little too late
* to do a graceful restart, so ignore them for now.
***
*** 1871,1881
(void)update_child_status(child_num, SERVER_BUSY_WRITE, r);
! if (r) process_request(r); /* else premature EOF --- ignore */
#if defined(STATUS)
! if (r) increment_counts(child_num, r);
#endif
! if (!r || !current_conn-keepalive)
break;
destroy_pool(r-pool);
--- 1870,1880
(void)update_child_status(child_num, SERVER_BUSY_WRITE, r);
! process_request(r);
#if defined(STATUS)
! increment_counts(child_num, r);
#endif
! if (!current_conn-keepalive || current_conn-aborted)
break;
destroy_pool(r-pool);
***
*** 2468,2474
r = read_request (conn);
if (r) process_request (r); /* else premature EOF (ignore) */
! while (r conn-keepalive) {
destroy_pool(r-pool);
r = read_request (conn);
if (r) process_request (r);
--- 2467,2473
r = read_request (conn);
if (r) process_request (r); /* else premature EOF (ignore) */
! while (r conn-keepalive !conn-aborted) {
destroy_pool(r-pool);
r = read_request (conn);
if (r) process_request (r);
cvs commit: apache/src CHANGES mod_dir.c
fielding97/05/12 21:01:51
Modified:src CHANGES mod_dir.c
Log:
If the lookup for a DirectoryIndex name with content negotiation
has found matching variants, but none are acceptable, return the
negotiation result if there are no more DirectoryIndex names to lookup.
Submitted by: Petr Lampa and Roy Fielding
Reviewed by: Randy Terbush, Dean Gaudet
Revision ChangesPath
1.274 +5 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.273
retrieving revision 1.274
diff -C3 -r1.273 -r1.274
*** CHANGES 1997/05/13 03:44:22 1.273
--- CHANGES 1997/05/13 04:01:49 1.274
***
*** 1,5
--- 1,10
Changes with Apache 1.2
+ *) If the lookup for a DirectoryIndex name with content negotiation
+ has found matching variants, but none are acceptable, return the
+ negotiation result if there are no more DirectoryIndex names lookup.
+ [Petr Lampa and Roy Fielding]
+
*) If a soft_timeout occurs after keepalive is set, then the main child
loop would try to read another request even though the connection
has been aborted. [Roy Fielding]
1.26 +5 -3 apache/src/mod_dir.c
Index: mod_dir.c
===
RCS file: /export/home/cvs/apache/src/mod_dir.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C3 -r1.25 -r1.26
*** mod_dir.c 1997/04/18 02:56:14 1.25
--- mod_dir.c 1997/05/13 04:01:50 1.26
***
*** 807,813
char *name_ptr = getword_conf (r-pool, names_ptr);
request_rec *rr = sub_req_lookup_uri (name_ptr, r);
! if (rr-status == 200 rr-finfo.st_mode != 0) {
char* new_uri = escape_uri(r-pool, rr-uri);
if (rr-args != NULL)
--- 807,813
char *name_ptr = getword_conf (r-pool, names_ptr);
request_rec *rr = sub_req_lookup_uri (name_ptr, r);
! if (rr-status == HTTP_OK rr-finfo.st_mode != 0) {
char* new_uri = escape_uri(r-pool, rr-uri);
if (rr-args != NULL)
***
*** 822,828
/* If the request returned a redirect, propagate it to the client */
! if (is_HTTP_REDIRECT(rr-status)) {
error_notfound = rr-status;
r-notes = overlay_tables(r-pool, r-notes, rr-notes);
r-headers_out = overlay_tables(r-pool, r-headers_out,
--- 822,830
/* If the request returned a redirect, propagate it to the client */
! if (is_HTTP_REDIRECT(rr-status) ||
! (rr-status == HTTP_NOT_ACCEPTABLE *names_ptr == '\0')) {
!
error_notfound = rr-status;
r-notes = overlay_tables(r-pool, r-notes, rr-notes);
r-headers_out = overlay_tables(r-pool, r-headers_out,
***
*** 842,848
* exist, we return the last error response we got, instead
* of a directory listing.
*/
! if (rr-status rr-status != 404 rr-status != 200)
error_notfound = rr-status;
destroy_sub_req (rr);
--- 844,850
* exist, we return the last error response we got, instead
* of a directory listing.
*/
! if (rr-status rr-status != HTTP_NOT_FOUND rr-status != HTTP_OK)
error_notfound = rr-status;
destroy_sub_req (rr);
cvs commit: apache-site/contributors index.html
fielding97/05/12 22:05:54 Modified:contributors index.html Log: Updated my entry and added Dean's. Revision ChangesPath 1.4 +23 -5 apache-site/contributors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/contributors/index.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C3 -r1.3 -r1.4 *** index.html1997/05/11 17:17:06 1.3 --- index.html1997/05/13 05:05:53 1.4 *** *** 20,26 LIBA HREF=#rseRalf S. Engelschall/A/B nbsp;nbsp;nbsp;URL rewriting module. LIBA HREF=#fearHoward Fear/A/B nbsp;nbsp;nbsp;SSI extensions. ! LIBA HREF=#fieldingRoy T. Fielding/A/B nbsp;nbsp;nbsp;Standards Cop, catalyst. LIBA HREF=#grayMatthew Gray/A/B nbsp;nbsp;nbsp;NCSA1.4 logging compatibility modules, miscellaneous patches. LIBA HREF=#hartillRob Hartill/A/B nbsp;nbsp;nbsp;general trouble maker, comments to offend all. LIBA HREF=#jagielskiJim Jagielski/A/B nbsp;nbsp;nbsp;Porter and general hacks. --- 20,27 LIBA HREF=#rseRalf S. Engelschall/A/B nbsp;nbsp;nbsp;URL rewriting module. LIBA HREF=#fearHoward Fear/A/B nbsp;nbsp;nbsp;SSI extensions. ! LIBA HREF=#fieldingRoy T. Fielding/A/B nbsp;nbsp;nbsp;Standards Cop. ! LIBA HREF=#dgaudetDean Gaudet/A/B nbsp;nbsp;nbsp;Performance freak. LIBA HREF=#grayMatthew Gray/A/B nbsp;nbsp;nbsp;NCSA1.4 logging compatibility modules, miscellaneous patches. LIBA HREF=#hartillRob Hartill/A/B nbsp;nbsp;nbsp;general trouble maker, comments to offend all. LIBA HREF=#jagielskiJim Jagielski/A/B nbsp;nbsp;nbsp;Porter and general hacks. *** *** 100,106 P BName:/B A NAME=fieldingRoy T. Fielding/ABR ! BEmail:/B A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR BURL:/B A HREF=http://www.ics.uci.edu/~fielding/; http://www.ics.uci.edu/~fielding//ABR BOrganization:/B University of California, IrvineBR --- 101,107 P BName:/B A NAME=fieldingRoy T. Fielding/ABR ! BEmail:/B [EMAIL PROTECTED]BR BURL:/B A HREF=http://www.ics.uci.edu/~fielding/; http://www.ics.uci.edu/~fielding//ABR BOrganization:/B University of California, IrvineBR *** *** 109,121 BContributions:/B Roy is the standards cop. He keeps the group informed of changes to the standards for HTTP, HTML and URI, and makes sure that Apache !conforms to those worth conforming to. Roy also acts as the unofficial !contact between the Apache Group and the W3 Consortium. On a good day, he'll even test the code, dabble in software engineering practice, !and submit an occasional patch.BR P BName:/B A NAME=grayMatthew Gray/ABR BEmail:/B A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR --- 110,139 BContributions:/B Roy is the standards cop. He keeps the group informed of changes to the standards for HTTP, HTML and URI, and makes sure that Apache !conforms to those worth conforming to. On a good day, he'll even test the code, dabble in software engineering practice, !submit a few patches, and squeeze out an Agenda.BR P + BName:/B A NAME=dgaudetDean Gaudet/ABR + !-- I hate mailto:s because of spiders that collect them for spam -- + BEmail:/B [EMAIL PROTECTED]br + BURL:/B A HREF=http://www.arctic.org/~dgaudet/;http://www.arctic.org/~dga + udet//abr + BOrganization:/B a href=http://www.steam.com/;Steam Tunnel Operations/a + br + BOccupation:/B Technical ConsultantBR + BLocation:/B San Francisco, CA, USABR + BComments:/B Performance freak.BR + BOS Expertise:/B Linux, IRIX, SolarisBR + BContributions:/B + Late comer, responsible for HotWired's continuing use of Apache. + Performance/reliability coding, and general bug fixes. Likes + to point out tiny things causing Roy find huge bugs requiring + large patches leading to extra beta cycles. Occasionally known + to generate large volumes of mail.BR + P BName:/B A NAME=grayMatthew Gray/ABR BEmail:/B A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR
