httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/proxy mod_proxy.c
Date Wed, 11 Aug 2004 22:10:23 GMT
wrowe       2004/08/11 15:10:23

  Modified:    modules/proxy mod_proxy.c
  Log:
  Remove unusable code. The constructor and destructor will
  be in proxy_util.  Add a trace.
  
  Submitted by:  mturk, jfclere
  
  Revision  Changes    Path
  1.115     +4 -13     httpd-2.0/modules/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.c,v
  retrieving revision 1.114
  retrieving revision 1.115
  diff -u -r1.114 -r1.115
  --- mod_proxy.c	11 Aug 2004 22:01:55 -0000	1.114
  +++ mod_proxy.c	11 Aug 2004 22:10:23 -0000	1.115
  @@ -457,12 +457,6 @@
       return HTTP_MOVED_PERMANENTLY;
   }
   
  -static apr_status_t worker_cleanup(void *theworker)
  -{
  -    
  -    return APR_SUCCESS;
  -}
  -
   /* -------------------------------------------------------------- */
   /* Invoke handler */
   
  @@ -527,8 +521,11 @@
   
       url = r->filename + 6;
       p = strchr(url, ':');
  -    if (p == NULL)
  +    if (p == NULL) {
  +        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
  +                      "proxy_handler no URL in %s", r->filename);
           return HTTP_BAD_REQUEST;
  +    }
   
       /* If the host doesn't have a domain name, add one and redirect. */
       if (conf->domain != NULL) {
  @@ -578,12 +575,6 @@
               ap_set_module_config(r->connection->conn_config,
                                    &proxy_module, mconf);
           }
  -#if 0
  -        /* register the connection->pool cleanup */
  -        apr_pool_cleanup_register(r->connection->pool,
  -                                  (void *)mconf, worker_cleanup,
  -                                   apr_pool_cleanup_null);      
  -#endif
       }
       /* use the current balancer and worker. 
        * the proxy_conn will be set in particular scheme handler
  
  
  

Mime
View raw message