From c5503f14e458ac12e6422454ac6d0b7ec59bc346 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 25 Nov 2003 13:54:39 +0000 Subject: [PATCH] * modules/dav/main/util.c (dav_validate_resource_state): Simplify weak etag comparison to avoid unnecessary tests and pstrdup calls. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101884 13f79535-47bb-0310-9956-ffa450edef68 --- modules/dav/main/util.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/modules/dav/main/util.c b/modules/dav/main/util.c index 5620c4cf43..93dfa8eb35 100644 --- a/modules/dav/main/util.c +++ b/modules/dav/main/util.c @@ -1073,28 +1073,21 @@ static dav_error * dav_validate_resource_state(apr_pool_t *p, case dav_if_etag: { const char *given_etag, *current_etag; - char *new_etag; int mismatch; /* Do a weak entity comparison function as defined in * RFC 2616 13.3.3. */ if (state_list->etag[0] == 'W' && - state_list->etag[1] == '/' && - state_list->etag[2] == '"') { - new_etag = apr_pstrdup(p, state_list->etag); - new_etag += 2; - given_etag = new_etag; + state_list->etag[1] == '/') { + given_etag = state_list->etag + 2; } else { given_etag = state_list->etag; } if (etag[0] == 'W' && - etag[1] == '/' && - etag[2] == '"') { - new_etag = apr_pstrdup(p, etag); - new_etag += 2; - current_etag = new_etag; + etag[1] == '/') { + current_etag = etag + 2; } else { current_etag = etag; -- 2.50.1