dgaudet 98/01/19 16:54:42
Modified: . Tag: APACHE_1_2_X STATUS
src Tag: APACHE_1_2_X CHANGES http_protocol.c
Log:
send_fd_length() did not calculate total_bytes_sent properly.
PR: 1366
Submitted by: Ben Reser <[EMAIL PROTECTED]>
Reviewed by: Dean Gaudet, Dirk-Willem van Gulik, Jim Jagielski
Revision Changes Path
No revision
No revision
1.1.2.19 +1 -0 apache/Attic/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache/Attic/STATUS,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- STATUS 1998/01/20 00:52:12 1.1.2.18
+++ STATUS 1998/01/20 00:54:37 1.1.2.19
@@ -16,6 +16,7 @@
* protocol/1683: The Connection header may contain multiple close tokens
* proxy was sending HTTP/1.1 responses in error
* PR#1500: allocate r->connection->user in correct pool
+ * PR#1366: send_fd_length did not calculate total_bytes_sent properly
Available:
No revision
No revision
1.286.2.71 +3 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.286.2.70
retrieving revision 1.286.2.71
diff -u -r1.286.2.70 -r1.286.2.71
--- CHANGES 1998/01/20 00:52:14 1.286.2.70
+++ CHANGES 1998/01/20 00:54:38 1.286.2.71
@@ -1,4 +1,7 @@
Changes with Apache 1.2.6
+
+ *) send_fd_length() did not calculate total_bytes_sent properly in error
+ cases. [Ben Reser <[EMAIL PROTECTED]>] PR#1366
*) r->connection->user was allocated in the wrong pool causing corruption
in some cases when used with mod_cern_meta. [Dean Gaudet] PR#1500
1.126.2.11 +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.126.2.10
retrieving revision 1.126.2.11
diff -u -r1.126.2.10 -r1.126.2.11
--- http_protocol.c 1998/01/20 00:52:15 1.126.2.10
+++ http_protocol.c 1998/01/20 00:54:39 1.126.2.11
@@ -1588,12 +1588,12 @@
break;
}
o=0;
- total_bytes_sent += n;
while (n && !r->connection->aborted) {
w = bwrite(r->connection->client, &buf[o], n);
if (w > 0) {
reset_timeout(r); /* reset timeout after successful write */
+ total_bytes_sent += w;
n-=w;
o+=w;
}
