You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by br...@apache.org on 2001/12/06 03:57:20 UTC
cvs commit: httpd-2.0/modules/http http_protocol.c
brianp 01/12/05 18:57:20
Modified: modules/http http_protocol.c
Log:
Small performance fix: delay variable initialization in
ap_meets_conditions() until after the point where we
short-circuit out of the function on subrequests
Revision Changes Path
1.382 +3 -1 httpd-2.0/modules/http/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -r1.381 -r1.382
--- http_protocol.c 2001/11/24 07:38:52 1.381
+++ http_protocol.c 2001/12/06 02:57:19 1.382
@@ -198,7 +198,7 @@
AP_DECLARE(int) ap_meets_conditions(request_rec *r)
{
- const char *etag = apr_table_get(r->headers_out, "ETag");
+ const char *etag;
const char *if_match, *if_modified_since, *if_unmodified, *if_nonematch;
apr_time_t mtime;
@@ -216,6 +216,8 @@
if (!ap_is_HTTP_SUCCESS(r->status) || r->no_local_copy) {
return OK;
}
+
+ etag = apr_table_get(r->headers_out, "ETag");
/* XXX: we should define a "time unset" constant */
mtime = (r->mtime != 0) ? r->mtime : apr_time_now();