tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/iis jk_isapi_plugin.c
Date Fri, 23 Sep 2005 06:54:16 GMT
mturk       2005/09/22 23:54:16

  Modified:    jk/native/iis jk_isapi_plugin.c
  Log:
  Remove temporary HTTP_TOMCATQUERY header from
  ALL_HTTP. Patch provided by Tim Whittington that fixes #36765
  
  Revision  Changes    Path
  1.55      +13 -2     jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- jk_isapi_plugin.c	23 Sep 2005 06:35:10 -0000	1.54
  +++ jk_isapi_plugin.c	23 Sep 2005 06:54:16 -0000	1.55
  @@ -1529,7 +1529,10 @@
               size_t len_of_http_prefix = strlen("HTTP_");
               BOOL need_content_length_header = (s->content_length == 0);
   
  -            cnt -= 2;           /* For our two special headers */
  +            cnt -= 2;           /* For our two special headers:
  +                                 * HTTP_TOMCATURI_XXXXXXXX
  +                                 * HTTP_TOMCATWORKER_XXXXXXXX
  +                                 */
               /* allocate an extra header slot in case we need to add a content-length header
*/
               s->headers_names =
                   jk_pool_alloc(&private_data->p, (cnt + 1) * sizeof(char *));
  @@ -1551,6 +1554,14 @@
                                    strlen(WORKER_HEADER_NAME))) {
                       real_header = JK_FALSE;
                   }
  +                else if (!strnicmp(tmp, QUERY_HEADER_NAME,
  +                                   strlen(QUERY_HEADER_NAME))) {
  +                    /* HTTP_TOMCATQUERY_XXXXXXXX was supplied,
  +                     * remove it from the count and skip
  +                     */
  +                    cnt--;
  +                    real_header = JK_FALSE;
  +                }
                   else if (need_content_length_header &&
                            !strnicmp(tmp, CONTENT_LENGTH,
                                      strlen(CONTENT_LENGTH))) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message