httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Sat, 27 Dec 2003 06:23:48 GMT
jerenkrantz    2003/12/26 22:23:48

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES
               server   Tag: APACHE_2_0_BRANCH core.c
  Log:
  Fix UseCanonicalCase off case where it'd improperly examine port number.
  
  parsed_uri.port is only valid iff parsed_uri.port_str != NULL.
  Old code simply checked if it was non-zero, not if it
  was *valid*
  
  Backport of server/core.c r1.248 from httpd-2.1
  Submitted by:	Jim Jagielski
  Reviewed by:	Brad Nicholes, Jim Jagielski, Justin Erenkrantz
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.202 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.201
  retrieving revision 1.988.2.202
  diff -u -u -r1.988.2.201 -r1.988.2.202
  --- CHANGES	27 Dec 2003 06:15:47 -0000	1.988.2.201
  +++ CHANGES	27 Dec 2003 06:23:47 -0000	1.988.2.202
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.49
   
  +  *) Correct UseCanonicalName Off to properly check incoming port number.
  +     [Jim Jagielski]
  +
     *) Fix slow graceful restarts with prefork MPM.  [Joe Orton]
   
     *) Fix a problem with namespace mappings being dropped in mod_dav_fs;
  
  
  
  No                   revision
  No                   revision
  1.225.2.10 +1 -1      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.225.2.9
  retrieving revision 1.225.2.10
  diff -u -u -r1.225.2.9 -r1.225.2.10
  --- core.c	22 Aug 2003 20:57:48 -0000	1.225.2.9
  +++ core.c	27 Dec 2003 06:23:48 -0000	1.225.2.10
  @@ -935,7 +935,7 @@
            * URLs using the hostname and port supplied by the client if
            * any are supplied (otherwise it will use the canonical name).
            */
  -        port = r->parsed_uri.port ? r->parsed_uri.port :
  +        port = r->parsed_uri.port_str ? r->parsed_uri.port :
                  r->server->port ? r->server->port :
                  ap_default_port(r);
       }
  
  
  

Mime
View raw message