httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject cvs commit: httpd-2.0/modules/dav/main mod_dav.h util.c
Date Tue, 22 Jan 2002 19:00:22 GMT
gstein      02/01/22 11:00:22

  Modified:    modules/dav/main mod_dav.h util.c
  Log:
  dav_xml_get_cdata() is an exported function, so mark it as such with
  the DAV_DECLARE macro. [ Barry Pederson <barryp@yahoo.com> ]
  
  Apache's handling of ports is broken. Temporarily disable the port
  checking in the Destination: header. [ Greg Stein ]
  
  Revision  Changes    Path
  1.55      +1 -1      httpd-2.0/modules/dav/main/mod_dav.h
  
  Index: mod_dav.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/main/mod_dav.h,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- mod_dav.h	14 Jan 2002 13:43:24 -0000	1.54
  +++ mod_dav.h	22 Jan 2002 19:00:22 -0000	1.55
  @@ -526,7 +526,7 @@
   ap_xml_elem *dav_find_child(const ap_xml_elem *elem, const char *tagname);
   
   /* gather up all the CDATA into a single string */
  -const char *dav_xml_get_cdata(const ap_xml_elem *elem, apr_pool_t *pool,
  +DAV_DECLARE(const char *) dav_xml_get_cdata(const ap_xml_elem *elem, apr_pool_t *pool,
                                 int strip_white);
   
   /*
  
  
  
  1.36      +8 -3      httpd-2.0/modules/dav/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/main/util.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- util.c	18 Sep 2001 03:46:13 -0000	1.35
  +++ util.c	22 Jan 2002 19:00:22 -0000	1.36
  @@ -239,8 +239,11 @@
              request. the port must match our port.
           */
           apr_sockaddr_port_get(&port, r->connection->local_addr);
  -        if (strcasecmp(comp.scheme, scheme) != 0 ||
  -            comp.port != port) {
  +        if (strcasecmp(comp.scheme, scheme) != 0
  +#ifdef APACHE_PORT_HANDLING_IS_BUSTED
  +            || comp.port != port
  +#endif
  +            ) {
               result.err.status = HTTP_BAD_GATEWAY;
               result.err.desc = apr_psprintf(r->pool,
                                              "Destination URI refers to "
  @@ -277,12 +280,14 @@
       /* now, if a hostname was provided, then verify that it represents the
          same server as the current connection. note that we just use our
          port, since we've verified the URI matches ours */
  +#ifdef APACHE_PORT_HANDLING_IS_BUSTED
       if (comp.hostname != NULL &&
   	!ap_matches_request_vhost(r, comp.hostname, port)) {
   	result.err.status = HTTP_BAD_GATEWAY;
   	result.err.desc = "Destination URI refers to a different server.";
   	return result;
       }
  +#endif
   
       /* we have verified that the requested URI denotes the same server as
          the current request. Therefore, we can use ap_sub_req_lookup_uri() */
  @@ -325,7 +330,7 @@
   }
   
   /* gather up all the CDATA into a single string */
  -const char *dav_xml_get_cdata(const ap_xml_elem *elem, apr_pool_t *pool,
  +DAV_DECLARE(const char *) dav_xml_get_cdata(const ap_xml_elem *elem, apr_pool_t *pool,
                                 int strip_white)
   {
       apr_size_t len = 0;
  
  
  

Mime
View raw message