cvs: php4 /sapi/thttpd thttpd.c

sas Tue Jan 9 00:45:06 2001 EDT Modified files: /php4/sapi/thttpd thttpd.c Log: Account the number of sent bytes properly Index: php4/sapi/thttpd/thttpd.c diff -u php4/sapi/thttpd/thttpd.c:1.30 php4/sapi/thttpd/thttpd.c:1.31 --- php4/sapi/thttpd/thttpd.c:1.30 Tue Jan 2 14:49:31 2001 +++ php4/sapi/thttpd/thttpd.c Tue Jan 9 00:45:05 2001 @@ -50,6 +50,8 @@ php_handle_aborted_connection(); } + TG(hc)->bytes += n; + return n; } @@ -58,8 +60,12 @@ char buf[1024]; if (!SG(sapi_headers).http_status_line) { + size_t len; + snprintf(buf, 1023, "HTTP/1.0 %d Something\r\n", SG(sapi_headers).http_response_code); - send(TG(hc)->conn_fd, buf, strlen(buf), 0); + len = strlen(buf); + send(TG(hc)->conn_fd, buf, len, 0); + TG(hc)->bytes += len; } return SAPI_HEADER_DO_SEND; @@ -69,9 +75,12 @@ { TLS_FETCH(); - if (sapi_header) + if (sapi_header) { send(TG(hc)->conn_fd, sapi_header->header, sapi_header->header_len, 0); + TG(hc)->bytes += sapi_header->header_len; + } send(TG(hc)->conn_fd, "\r\n", sizeof("\r\n") - 1, 0); + TG(hc)->bytes += 2; } static int sapi_thttpd_read_post(char *buffer, uint count_bytes SLS_DC) @@ -122,7 +131,7 @@ php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array ELS_CC PLS_CC); php_register_variable("SERVER_SOFTWARE", SERVER_SOFTWARE, track_vars_array ELS_CC PLS_CC); php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array ELS_CC PLS_CC); - php_register_variable("REQUEST_METHOD", SG(request_info).request_method, track_vars_array ELS_CC PLS_CC); + php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, track_vars_array ELS_CC PLS_CC); php_register_variable("REQUEST_URI", SG(request_info).request_uri, track_vars_array ELS_CC PLS_CC); php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, track_vars_array ELS_CC PLS_CC); @@ -274,6 +283,7 @@ TLS_FETCH(); TG(hc) = hc; + hc->bytes = 0; thttpd_request_ctor(TLS_C SLS_CC);