httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/main util_script.c
Date Sat, 21 Oct 2000 15:02:45 GMT
rbb         00/10/21 08:02:45

  Modified:    src/main util_script.c
  Log:
  Remove original_uri.  This is the same as r->unparsed_uri
  Reviewed by:	Roy Fielding and Tony Finch
  
  Revision  Changes    Path
  1.45      +1 -29     apache-2.0/src/main/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_script.c,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- util_script.c	2000/10/16 06:04:53	1.44
  +++ util_script.c	2000/10/21 15:02:45	1.45
  @@ -306,34 +306,6 @@
       return lu;
   }
   
  -/* Obtain the Request-URI from the original request-line, returning
  - * a new string from the request pool containing the URI or "".
  - */
  -static char *original_uri(request_rec *r)
  -{
  -    char *first, *last;
  -
  -    if (r->the_request == NULL) {
  -	return (char *) apr_pcalloc(r->pool, 1);
  -    }
  -
  -    first = r->the_request;	/* use the request-line */
  -
  -    while (*first && !apr_isspace(*first)) {
  -	++first;		/* skip over the method */
  -    }
  -    while (apr_isspace(*first)) {
  -	++first;		/*   and the space(s)   */
  -    }
  -
  -    last = first;
  -    while (*last && !apr_isspace(*last)) {
  -	++last;			/* end at next whitespace */
  -    }
  -
  -    return apr_pstrndup(r->pool, first, last - first);
  -}
  -
   AP_DECLARE(void) ap_add_cgi_vars(request_rec *r)
   {
       apr_table_t *e = r->subprocess_env;
  @@ -342,7 +314,7 @@
       apr_table_setn(e, "SERVER_PROTOCOL", r->protocol);
       apr_table_setn(e, "REQUEST_METHOD", r->method);
       apr_table_setn(e, "QUERY_STRING", r->args ? r->args : "");
  -    apr_table_setn(e, "REQUEST_URI", original_uri(r));
  +    apr_table_setn(e, "REQUEST_URI", r->unparsed_uri);
   
       /* Note that the code below special-cases scripts run from includes,
        * because it "knows" that the sub_request has been hacked to have the
  
  
  

Mime
View raw message