cvs commit: apachen/src/modules/proxy mod_proxy.c proxy_util.c

[martin]

martin      97/11/27 05:46:31

  Modified:    src/modules/proxy mod_proxy.c proxy_util.c
  Log:
  Modified aplog_error() calls to use APLOG_NOERRNO when no errno was set;
  Reviewed bDean Gaudet
  
  Revision  Changes    Path
  1.29      +6 -4      apachen/src/modules/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /home/cvs/apachen/src/modules/proxy/mod_proxy.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -u -r1.28 -r1.29
  --- mod_proxy.c       1997/11/08 21:39:12     1.28
  +++ mod_proxy.c       1997/11/27 13:46:29     1.29
  @@ -225,7 +225,7 @@
       err = proxy_canon_netloc(r->pool, &url_copy, &user, &password, &host, 
&port);
   
       if (err != NULL) {
  -     aplog_error(APLOG_MARK, APLOG_ERR, r->server, err);
  +     aplog_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r->server, err);
        return DECLINED;
       }
   
  @@ -252,7 +252,7 @@
                       NULL);
   
        table_set(r->headers_out, "Location", nuri);
  -     aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +     aplog_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r->server,
             pstrcat(r->pool, "Domain missing: ", r->uri, " sent to ", nuri,
                     ref ? " from " : NULL, ref, NULL));
   
  @@ -311,14 +311,16 @@
   
        for (direct_connect = ii = 0; ii < conf->dirconn->nelts && 
!direct_connect; ii++) {
            direct_connect = list[ii].matcher(&list[ii], r);
  -         aplog_error(APLOG_MARK, APLOG_DEBUG, r->server,
  +#if DEBUGGING
  +         aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, r->server,
                        "URI and NoProxy: %s: %s", r->uri, list[ii].name);
  +#endif
        }
   #if DEBUGGING
        {
            char msg[256];
            sprintf(msg, (direct_connect) ? "NoProxy for %s" : "UseProxy for 
%s", r->uri);
  -         aplog_error(APLOG_MARK, APLOG_DEBUG, r->server, msg);
  +         aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, r->server, msg);
        }
   #endif
       }
  
  
  
  1.37      +1 -1      apachen/src/modules/proxy/proxy_util.c
  
  Index: proxy_util.c
  ===================================================================
  RCS file: /home/cvs/apachen/src/modules/proxy/proxy_util.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -u -r1.36 -r1.37
  --- proxy_util.c      1997/11/14 15:59:17     1.36
  +++ proxy_util.c      1997/11/27 13:46:30     1.37
  @@ -856,7 +856,7 @@
       err = proxy_canon_netloc(r->pool, &url, &user, &password, &host, &port);
   
       if (err != NULL)
  -     aplog_error(APLOG_MARK, APLOG_ERR, r->server, err);
  +     aplog_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r->server, err);
   
       r->hostname = host;