dgaudet 97/06/30 23:46:05
Modified: src http_protocol.c http_request.c httpd.h Log: We can use read_length instead of adding the new field begun_read_body. Submitted by: Roy Fielding Reviewed by: Dean Gaudet Revision Changes Path 1.131 +1 -4 apache/src/http_protocol.c Index: http_protocol.c =================================================================== RCS file: /export/home/cvs/apache/src/http_protocol.c,v retrieving revision 1.130 retrieving revision 1.131 diff -C3 -r1.130 -r1.131 *** http_protocol.c 1997/07/01 01:13:41 1.130 --- http_protocol.c 1997/07/01 06:46:02 1.131 *************** *** 871,877 **** rnew->read_length = r->read_length; rnew->read_body = REQUEST_NO_BODY; - rnew->begun_read_body = r->begun_read_body; rnew->main = (request_rec *)r; } --- 871,876 ---- *************** *** 1349,1355 **** int should_client_block (request_rec *r) { ! if (r->begun_read_body || is_HTTP_ERROR(r->status)) return 0; if (!r->read_chunked && (r->remaining <= 0)) --- 1348,1354 ---- int should_client_block (request_rec *r) { ! if (r->read_length || is_HTTP_ERROR(r->status)) return 0; if (!r->read_chunked && (r->remaining <= 0)) *************** *** 1400,1407 **** int c; long len_read, len_to_read; long chunk_start = 0; - - r->begun_read_body = 1; if (!r->read_chunked) { /* Content-length read */ len_to_read = (r->remaining > bufsiz) ? bufsiz : r->remaining; --- 1399,1404 ---- 1.56 +1 -1 apache/src/http_request.c Index: http_request.c =================================================================== RCS file: /export/home/cvs/apache/src/http_request.c,v retrieving revision 1.55 retrieving revision 1.56 diff -C3 -r1.55 -r1.56 *** http_request.c 1997/07/01 01:13:42 1.55 --- http_request.c 1997/07/01 06:46:02 1.56 *************** *** 1112,1118 **** */ new->no_local_copy = r->no_local_copy; ! new->begun_read_body = r->begun_read_body; /* We can only read it once */ ap_snprintf (t, sizeof(t), "%d", r->status); table_set (new->subprocess_env, "REDIRECT_STATUS", pstrdup (r->pool, t)); --- 1112,1118 ---- */ new->no_local_copy = r->no_local_copy; ! new->read_length = r->read_length; /* We can only read it once */ ap_snprintf (t, sizeof(t), "%d", r->status); table_set (new->subprocess_env, "REDIRECT_STATUS", pstrdup (r->pool, t)); 1.123 +0 -1 apache/src/httpd.h Index: httpd.h =================================================================== RCS file: /export/home/cvs/apache/src/httpd.h,v retrieving revision 1.122 retrieving revision 1.123 diff -C3 -r1.122 -r1.123 *** httpd.h 1997/07/01 01:13:42 1.122 --- httpd.h 1997/07/01 06:46:03 1.123 *************** *** 502,508 **** long read_length; /* bytes that have been read */ int read_body; /* how the request body should be read */ int read_chunked; /* reading chunked transfer-coding */ - int begun_read_body; /* false (0) until first get_client_block */ /* MIME header environments, in and out. Also, an array containing * environment variables to be passed to subprocesses, so people can --- 502,507 ----