httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@jaguNET.com>
Subject Re: svn commit: r571203 - /httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c
Date Thu, 30 Aug 2007 15:46:48 GMT

On Aug 30, 2007, at 11:39 AM, Jim Jagielski wrote:

> Ummm.... 2 things:
>
> First of all, this is not even patched in trunk yet.
> Secondly, this completely bypasses the normal backporting
> process that everyone is required to use.
>
> Please revert these patches, patch trunk and submit these
> patches for backport.
>

By "these" I mean:

    http://svn.apache.org/viewvc?rev=571203&view=rev
    http://svn.apache.org/viewvc?rev=571209&view=rev

I think once applied to trunk then proposed, we
should see a quick set of 3 +1s for backport
in order to make it for 2.2.6...


> martin@apache.org wrote:
>>
>> Author: martin
>> Date: Thu Aug 30 08:22:58 2007
>> New Revision: 571203
>>
>> URL: http://svn.apache.org/viewvc?rev=571203&view=rev
>> Log:
>> Add missing end-of-string checks by using strcmp in place of memcmp
>>
>> Modified:
>>     httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c
>>
>> Modified: httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c
>> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/ 
>> modules/proxy/ajp_header.c?rev=571203&r1=571202&r2=571203&view=diff
>> ===================================================================== 
>> =========
>> --- httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c (original)
>> +++ httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c Thu Aug  
>> 30 08:22:58 2007
>> @@ -51,7 +51,7 @@
>>      const char *p = header_name;
>>      int i = 0;
>>
>> -    /* ACCEPT-LANGUAGE is the longest headeer
>> +    /* ACCEPT-LANGUAGE is the longest header
>>       * that is of interest.
>>       */
>>      if (len < 4 || len > 15)
>> @@ -69,11 +69,11 @@
>>                      return SC_ACCEPT;
>>                  else if (header[6] == '-') {
>>                      p += 6;
>> -                    if (memcmp(p, "CHARSET", 7) == 0)
>> +                    if (strcmp(p, "CHARSET") == 0)
>>                          return SC_ACCEPT_CHARSET;
>> -                    else if (memcmp(p,  "ENCODING", 8) == 0)
>> +                    else if (strcmp(p,  "ENCODING") == 0)
>>                          return SC_ACCEPT_ENCODING;
>> -                    else if (memcmp(p, "LANGUAGE", 8) == 0)
>> +                    else if (strcmp(p, "LANGUAGE") == 0)
>>                          return SC_ACCEPT_LANGUAGE;
>>                      else
>>                          return UNKNOWN_METHOD;
>> @@ -81,45 +81,45 @@
>>                  else
>>                      return UNKNOWN_METHOD;
>>              }
>> -            else if (memcmp(p, "UTHORIZATION", 12) == 0)
>> +            else if (strcmp(p, "UTHORIZATION") == 0)
>>                  return SC_AUTHORIZATION;
>>              else
>>                  return UNKNOWN_METHOD;
>>          break;
>>          case 'C':
>> -            if(memcmp(p, "OOKIE2", 6) == 0)
>> +            if(strcmp(p, "OOKIE2") == 0)
>>                  return SC_COOKIE2;
>> -	    else if (memcmp(p, "OOKIE", 5) == 0)
>> +	    else if (strcmp(p, "OOKIE") == 0)
>>                  return SC_COOKIE;
>> -            else if(memcmp(p, "ONNECTION", 9) == 0)
>> +            else if(strcmp(p, "ONNECTION") == 0)
>>                  return SC_CONNECTION;
>> -            else if(memcmp(p, "ONTENT-TYPE", 11) == 0)
>> +            else if(strcmp(p, "ONTENT-TYPE") == 0)
>>                  return SC_CONTENT_TYPE;
>> -            else if(memcmp(p, "ONTENT-LENGTH", 13) == 0)
>> +            else if(strcmp(p, "ONTENT-LENGTH") == 0)
>>                  return SC_CONTENT_LENGTH;
>>              else
>>                  return UNKNOWN_METHOD;
>>          break;
>>          case 'H':
>> -            if(memcmp(p, "OST", 3) == 0)
>> +            if(strcmp(p, "OST") == 0)
>>                  return SC_HOST;
>>              else
>>                  return UNKNOWN_METHOD;
>>          break;
>>          case 'P':
>> -            if(memcmp(p, "RAGMA", 5) == 0)
>> +            if(strcmp(p, "RAGMA") == 0)
>>                  return SC_PRAGMA;
>>              else
>>                  return UNKNOWN_METHOD;
>>          break;
>>          case 'R':
>> -            if(memcmp(p, "EFERER", 6) == 0)
>> +            if(strcmp(p, "EFERER") == 0)
>>                  return SC_REFERER;
>>              else
>>                  return UNKNOWN_METHOD;
>>          break;
>>          case 'U':
>> -            if(memcmp(p, "SER-AGENT", 9) == 0)
>> +            if(strcmp(p, "SER-AGENT") == 0)
>>                  return SC_USER_AGENT;
>>              else
>>                  return UNKNOWN_METHOD;
>> @@ -561,7 +561,7 @@
>>          apr_table_add(r->headers_out, stringname, value);
>>
>>          /* Content-type needs an additional handling */
>> -        if (memcmp(stringname, "Content-Type", 12) == 0) {
>> +        if (strncasecmp(stringname, "Content-Type", 12) == 0) {
>>               /* add corresponding filter */
>>              ap_set_content_type(r, apr_pstrdup(r->pool, value));
>>              ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
>>
>>
>
>
> -- 
> ====================================================================== 
> =====
>    Jim Jagielski   [|]   jim@jaguNET.com   [|]   http:// 
> www.jaguNET.com/
> 	    "If you can dodge a wrench, you can dodge a ball."
>


Mime
View raw message