From: Paul Querna Date: Sun, 20 Nov 2005 00:41:09 +0000 (+0000) Subject: Merge r345686 from trunk: X-Git-Tag: 2.1.10~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9dc9b9389c6848eae6dcc71cf0cce04875ab5cc;p=thirdparty%2Fapache%2Fhttpd.git Merge r345686 from trunk: * Minor performance tweak by reusing already calculated strlen in get_body. Submitted by: Christophe Jaillet Reviewed by: Ruediger Pluem git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@345694 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index dcb32e833fc..b4e14a8eff6 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes with Apache 2.1.10 + *) mod_negotiation: Minor performance tweak by reusing already calculated + strlen. + [Ruediger Pluem, Christophe Jaillet ] + *) Remove support for 'On' and 'Off' for AuthBasicProvider and AuthDigestProvider. [Joshua Slive, Justin Erenkrantz] diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c index 86a50d797e7..37c665eb946 100644 --- a/modules/mappers/mod_negotiation.c +++ b/modules/mappers/mod_negotiation.c @@ -854,7 +854,7 @@ static apr_off_t get_body(char *buffer, apr_size_t *len, const char *tag, return -1; } bodylen = endbody - buffer; - endbody += strlen(tag); + endbody += taglen; /* Skip all the trailing cruft after the end tag to the next line */ while (*endbody) { if (*endbody == '\n') {