cvs commit: jakarta-tomcat-connectors/ajp/ajplib/test ajp_header.c

[jfclere]

jfclere     2004/08/01 09:50:27

  Modified:    ajp/ajplib/test ajp_header.c
  Log:
  Arrange uri handling.
  
  Revision  Changes    Path
  1.24      +12 -1     jakarta-tomcat-connectors/ajp/ajplib/test/ajp_header.c
  
  Index: ajp_header.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp_header.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ajp_header.c      1 Aug 2004 15:23:23 -0000       1.23
  +++ ajp_header.c      1 Aug 2004 16:50:27 -0000       1.24
  @@ -210,6 +210,7 @@
       apr_uint32_t i, num_headers = 0;
       apr_byte_t is_ssl;
       char *remote_host;
  +    char *uri;
       
   
       ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
  @@ -229,14 +230,24 @@
           const apr_array_header_t *t = apr_table_elts(r->headers_in);
           num_headers = t->nelts;
       }
  +
       remote_host = (char *)ap_get_remote_host(r->connection, r->per_dir_config, 
REMOTE_HOST, NULL);
   
  +    uri = apr_pstrdup(r->pool, r->uri);
  +    if (uri != NULL) {
  +        char *query_str = strchr(uri, '?');
  +        if (query_str != NULL) {
  +            *query_str = 0;
  +        }
  +    }
  +    
  +
       ajp_msg_reset(msg);
   
       if (ajp_msg_append_uint8(msg, CMD_AJP13_FORWARD_REQUEST)     ||
           ajp_msg_append_uint8(msg, method)                        ||
           ajp_msg_append_string(msg, r->protocol)                  ||
  -        ajp_msg_append_string(msg, r->uri)                       ||
  +        ajp_msg_append_string(msg, uri)                          ||
           ajp_msg_append_string(msg, r->connection->remote_ip)     ||
           ajp_msg_append_string(msg, remote_host)                  ||
           ajp_msg_append_string(msg, ap_get_server_name(r))        ||
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]