fielding 97/05/28 20:10:56
Modified: src http_main.c http_protocol.c httpd.h Log: Revert the logging 408 changes, since it is unsafe to set method_number to a negative value (it is used in bit shift operations) and because there is a much easier way to do the same thing. Revision Changes Path 1.148 +0 -5 apache/src/http_main.c Index: http_main.c =================================================================== RCS file: /export/home/cvs/apache/src/http_main.c,v retrieving revision 1.147 retrieving revision 1.148 diff -C3 -r1.147 -r1.148 *** http_main.c 1997/05/28 23:51:57 1.147 --- http_main.c 1997/05/29 03:10:52 1.148 *************** *** 415,425 **** else log_req = log_req->prev; } - /* If we didn't get SIGPIPE and we didn't set the method number, - * then it's safe to say the client timed out - */ - if (sig != SIGPIPE && log_req->method_number == M_NONE) - log_req->status = HTTP_REQUEST_TIME_OUT; if (!current_conn->keptalive) log_transaction(log_req); --- 415,420 ---- 1.125 +0 -1 apache/src/http_protocol.c Index: http_protocol.c =================================================================== RCS file: /export/home/cvs/apache/src/http_protocol.c,v retrieving revision 1.124 retrieving revision 1.125 diff -C3 -r1.124 -r1.125 *** http_protocol.c 1997/05/28 23:51:58 1.124 --- http_protocol.c 1997/05/29 03:10:53 1.125 *************** *** 790,796 **** * Only changed by die(), or (bletch!) * scan_script_header... */ - r->method_number = M_NONE; /* Until we finish reading a request */ /* Get the request... */ --- 790,795 ---- 1.107 +0 -1 apache/src/httpd.h Index: httpd.h =================================================================== RCS file: /export/home/cvs/apache/src/httpd.h,v retrieving revision 1.106 retrieving revision 1.107 diff -C3 -r1.106 -r1.107 *** httpd.h 1997/05/28 23:51:59 1.106 --- httpd.h 1997/05/29 03:10:54 1.107 *************** *** 347,353 **** #define METHODS 8 - #define M_NONE -1 #define M_GET 0 #define M_PUT 1 #define M_POST 2 --- 347,352 ----