dgaudet 97/12/26 10:27:00
Modified: . STATUS
src CHANGES
src/main 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
1.32 +1 -4 apachen/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apachen/STATUS,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- STATUS 1997/12/26 18:21:43 1.31
+++ STATUS 1997/12/26 18:26:56 1.32
@@ -55,12 +55,9 @@
* Jim's/Ken's move of main/util_snprintf.c to ap/ap_snprintf.c
* [PATCH] Re: [BUGFIXES] Wrong GID for PID file and UMASK for logs
* Dean's [PATCH] fix Rasmus' chunking error
+ * [PATCH] PR#1366: fix result of send_fd_length
Available:
-
- * [PATCH] PR#1366: fix result of send_fd_length
- <[EMAIL PROTECTED]>
- Status: Dean +1, Dirk +1
* Jim's [PATCH] ap_cpystrn() function (replace strncpy)
<[EMAIL PROTECTED]>
1.545 +3 -0 apachen/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -r1.544 -r1.545
--- CHANGES 1997/12/26 18:21:44 1.544
+++ CHANGES 1997/12/26 18:26:57 1.545
@@ -1,4 +1,7 @@
Changes with Apache 1.3b4
+
+ *) send_fd_length() did not calculate total_bytes_sent properly.
+ [Ben Reser <[EMAIL PROTECTED]>] PR#1366
*) The large_write() changes tickled a bug in bputc(), this would
show up as certain modules not working with Internet Explorer 4.0.
1.172 +1 -1 apachen/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_protocol.c,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- http_protocol.c 1997/12/21 08:18:16 1.171
+++ http_protocol.c 1997/12/26 18:26:59 1.172
@@ -1638,12 +1638,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;
}
