fielding 97/01/29 18:27:09
Modified: src CHANGES http_protocol.c
Log:
Allow keep_alive to continue if the response is 304 Not Modified
even though there is no body.
Submitted by: Dean Gaudet
Reviewed by: Alexei Kosut, Randy Terbush, Jim Jagielski, Roy Fielding
Revision Changes Path
1.139 +4 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.138
retrieving revision 1.139
diff -C3 -r1.138 -r1.139
*** CHANGES 1997/01/27 01:28:11 1.138
--- CHANGES 1997/01/30 02:27:06 1.139
***************
*** 1,5 ****
--- 1,9 ----
Changes with Apache 1.2b6
+ *) Continue persistent connection after 304 response. [Dean Gaudet]
+
+ Changes with Apache 1.2b6
+
*) Allow whitespace in imagemap mapfile coordinates. [Marc Slemko]
*) Fix typo introduced in fix for potential infinite loop around
1.94 +1 -1 apache/src/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_protocol.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -C3 -r1.93 -r1.94
*** http_protocol.c 1997/01/26 01:15:13 1.93
--- http_protocol.c 1997/01/30 02:27:07 1.94
***************
*** 216,222 ****
else if (r->server->keep_alive && (!r->server->keep_alive_max ||
(r->server->keep_alive_max > r->connection->keepalives)) &&
(r->server->keep_alive_timeout > 0) &&
! (r->header_only || length || tenc ||
((r->proto_num >= 1001) && (r->byterange > 1 || (r->chunked = 1)))) &&
(!find_token(r->pool, conn, "close")) &&
((ka_sent = find_token(r->pool, conn, "keep-alive")) ||
--- 216,222 ----
else if (r->server->keep_alive && (!r->server->keep_alive_max ||
(r->server->keep_alive_max > r->connection->keepalives)) &&
(r->server->keep_alive_timeout > 0) &&
! (r->status == USE_LOCAL_COPY || r->header_only || length || tenc ||
((r->proto_num >= 1001) && (r->byterange > 1 || (r->chunked = 1)))) &&
(!find_token(r->pool, conn, "close")) &&
((ka_sent = find_token(r->pool, conn, "keep-alive")) ||
