cvs commit: apache-1.3 STATUS
fielding98/08/01 17:10:30 Modified:.STATUS Log: Add status of binary builds. Revision ChangesPath 1.452 +27 -0 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.451 retrieving revision 1.452 diff -u -r1.451 -r1.452 --- STATUS1998/07/29 06:53:07 1.451 +++ STATUS1998/08/02 00:10:29 1.452 @@ -482,3 +482,30 @@ accomodate it, though it does add complexity to suexec.c. PR #1120 Brian: +1 + +Binaries + The goal here is to have two columns of all-Y (where applicable) + for the two stable release versions, and nothing under Old unless + the new version just doesn't work on that platform. + +1.2.6 1.3.1 Old + aix_4.1N Y 1.2.5, 1.3.0 + alphalinux N N 1.3.0 + aux_3.1N N 1.3.0 + decalphaNT N N 1.3b6 + dunix_4.0 N Y 1.2.4, 1.3.0 + freebsd_2.1N N 1.2.4 + freebsd_2.2N N 1.2.5 + hpux_10.20 N N 1.2.5 + hpux_11N Y + irix_6.2 N N 1.2.5 + linux_2.x N N 1.2.4, 1.3.0 + netbsd_1.2 N N 1.2.4 + os2N Y 1.3b6, 1.3b7 + reliantunix_5.4Y N 1.3.0 + solarisN Y*1.2.5, 1.3.0 (* for Solaris 2.6) + sparclinux N Y 1.3.0 + sunos_4.1.xN N 1.2.5 + ultrix_4.4 N N 1.2.4 + win32 - Y +
cvs commit: apache-1.3/src/main http_main.c http_protocol.c
fielding98/08/01 21:43:19
Modified:src CHANGES
src/main http_main.c http_protocol.c
Log:
Allow ap_read_request errors to propagate through the normal request
handling loop so that the connection can be properly closed with
lingering_close, thus avoiding a potential TCP reset that would
cause the client to miss the HTTP error response.
Revision ChangesPath
1.993 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.992
retrieving revision 1.993
diff -u -r1.992 -r1.993
--- CHANGES 1998/07/28 17:26:43 1.992
+++ CHANGES 1998/08/02 04:43:15 1.993
@@ -1,5 +1,10 @@
Changes with Apache 1.3.2
+ *) Allow ap_read_request errors to propagate through the normal request
+ handling loop so that the connection can be properly closed with
+ lingering_close, thus avoiding a potential TCP reset that would
+ cause the client to miss the HTTP error response. [Roy Fielding]
+
*) One more portability fix for APACI shadow tree support: Swap order of
awk
and sed in top-level configure script to avoid sed fails on some
platforms (for instance SunOS 4.1.3 and NCR SysV) because of the
1.376 +14 -9 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.375
retrieving revision 1.376
diff -u -r1.375 -r1.376
--- http_main.c 1998/07/20 16:37:11 1.375
+++ http_main.c 1998/08/02 04:43:17 1.376
@@ -3699,8 +3699,11 @@
(void) ap_update_child_status(my_child_num, SERVER_BUSY_WRITE, r);
- ap_process_request(r);
+ /* process the request if it was read without error */
+ if (r-status == HTTP_OK)
+ ap_process_request(r);
+
#if defined(STATUS)
increment_counts(my_child_num, r);
#endif
@@ -4466,15 +4469,16 @@
conn = new_connection(ptrans, server_conf, cio,
(struct sockaddr_in *) sa_client,
(struct sockaddr_in *) sa_server, -1);
- r = ap_read_request(conn);
- if (r)
- ap_process_request(r); /* else premature EOF (ignore) */
- while (r conn-keepalive !conn-aborted) {
- ap_destroy_pool(r-pool);
- r = ap_read_request(conn);
- if (r)
+ while ((r = ap_read_request(conn)) != NULL) {
+
+ if (r-status == HTTP_OK)
ap_process_request(r);
+
+ if (!conn-keepalive || conn-aborted)
+ break;
+
+ ap_destroy_pool(r-pool);
}
ap_bclose(cio);
@@ -4779,7 +4783,8 @@
while ((r = ap_read_request(current_conn)) != NULL) {
(void) ap_update_child_status(child_num, SERVER_BUSY_WRITE, r);
- ap_process_request(r);
+ if (r-status == HTTP_OK)
+ ap_process_request(r);
#if defined(STATUS)
increment_counts(child_num, r);
1.227 +2 -3 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- http_protocol.c 1998/07/22 05:48:21 1.226
+++ http_protocol.c 1998/08/02 04:43:18 1.227
@@ -803,8 +803,8 @@
ap_send_error_response(r, 0);
ap_bflush(r-connection-client);
ap_log_transaction(r);
+return r;
}
-r-connection-aborted = 1;
return NULL;
}
if (!r-assbackwards) {
@@ -819,8 +819,7 @@
ap_send_error_response(r, 0);
ap_bflush(r-connection-client);
ap_log_transaction(r);
-r-connection-aborted = 1;
-return NULL;
+return r;
}
}
else {
cvs commit: apache-1.3/htdocs/manual/mod mod_rewrite.html
rse 98/08/02 04:18:26
Modified:src CHANGES
htdocs/manual/mod mod_rewrite.html
Log:
Fixed examples in mod_rewrite.html document.
PR: 2756
Revision ChangesPath
1.994 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.993
retrieving revision 1.994
diff -u -r1.993 -r1.994
--- CHANGES 1998/08/02 04:43:15 1.993
+++ CHANGES 1998/08/02 11:18:24 1.994
@@ -1,5 +1,8 @@
Changes with Apache 1.3.2
+ *) Fixed examples in mod_rewrite.html document.
+ [Youichirou Koga [EMAIL PROTECTED], Ralf S. Engelschall] PR#2756
+
*) Allow ap_read_request errors to propagate through the normal request
handling loop so that the connection can be properly closed with
lingering_close, thus avoiding a potential TCP reset that would
1.34 +4 -4 apache-1.3/htdocs/manual/mod/mod_rewrite.html
Index: mod_rewrite.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_rewrite.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mod_rewrite.html 1998/07/25 12:16:37 1.33
+++ mod_rewrite.html 1998/08/02 11:18:26 1.34
@@ -660,7 +660,7 @@
P
TABLE BORDER=0 CELLSPACING=1 CELLPADDING=5 BGCOLOR=#F0F0F0
TRTDPRE
-RewriteMap real-to-host txt:/path/to/file/map.txt
+RewriteMap real-to-user txt:/path/to/file/map.txt
/PRE/TD/TR
/TABLE
@@ -1764,13 +1764,13 @@
/BLOCKQUOTE
P
We take the rewrite mapfile from above and save it under
-CODE/anywhere/map.real-to-user/CODE. Then we only have to add the
+CODE/path/to/file/map.txt/CODE. Then we only have to add the
following lines to the Apache server configuration file:
BLOCKQUOTE
PRE
-RewriteLog /anywhere/rewrite.log
-RewriteMap real-to-user txt:/anywhere/map.real-to-host
+RewriteLog /path/to/file/rewrite.log
+RewriteMap real-to-user txt:/path/to/file/map.txt
RewriteRule ^/([^/]+)/~([^/]+)/(.*)$ /u/${real-to-user:$2|nobody}/$3.$1
/PRE
/BLOCKQUOTE
