cvs commit: apache/src/modules/proxy proxy_connect.c proxy_ftp.c proxy_http.c

[Chuck Murcko]

chuck       97/01/07 13:52:01

  Modified:    src/modules/proxy  proxy_connect.c proxy_ftp.c proxy_http.c
  Log:
  Submitted by: Martin Kraemer <[EMAIL PROTECTED]>
  Replace instances of inet_ntoa() with inet_addr(). It's more portable.
  
  Revision  Changes    Path
  1.6       +1 -1      apache/src/modules/proxy/proxy_connect.c
  
  Index: proxy_connect.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/modules/proxy/proxy_connect.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -C3 -r1.5 -r1.6
  *** proxy_connect.c   1997/01/05 09:06:06     1.5
  --- proxy_connect.c   1997/01/07 21:51:57     1.6
  ***************
  *** 116,122 ****
        }
     
    /* check if ProxyBlock directive on this host */
  !     inet_aton(host, &destaddr);
        for (i=0; i < conf->noproxies->nelts; i++)
        {
            if ((npent[i].name != NULL && strstr(host, npent[i].name) != NULL)
  --- 116,122 ----
        }
     
    /* check if ProxyBlock directive on this host */
  !     destaddr.s_addr = inet_addr(host);
        for (i=0; i < conf->noproxies->nelts; i++)
        {
            if ((npent[i].name != NULL && strstr(host, npent[i].name) != NULL)
  
  
  
  1.7       +1 -1      apache/src/modules/proxy/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/modules/proxy/proxy_ftp.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -C3 -r1.6 -r1.7
  *** proxy_ftp.c       1997/01/05 09:06:06     1.6
  --- proxy_ftp.c       1997/01/07 21:51:57     1.7
  ***************
  *** 412,418 ****
        }
    
    /* check if ProxyBlock directive on this host */
  !     inet_aton(host, &destaddr);
        for (i=0; i < conf->noproxies->nelts; i++)
        {
            if ((npent[i].name != NULL && strstr(host, npent[i].name) != NULL)
  --- 412,418 ----
        }
    
    /* check if ProxyBlock directive on this host */
  !     destaddr.s_addr = inet_addr(host);
        for (i=0; i < conf->noproxies->nelts; i++)
        {
            if ((npent[i].name != NULL && strstr(host, npent[i].name) != NULL)
  
  
  
  1.12      +1 -1      apache/src/modules/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/modules/proxy/proxy_http.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -C3 -r1.11 -r1.12
  *** proxy_http.c      1997/01/05 09:06:07     1.11
  --- proxy_http.c      1997/01/07 21:51:58     1.12
  ***************
  *** 196,202 ****
        }
    
    /* check if ProxyBlock directive on this host */
  !     inet_aton(desthost, &destaddr);
        for (i=0; i < conf->noproxies->nelts; i++)
        {
            if ((npent[i].name != NULL && strstr(desthost, npent[i].name) != 
NULL)
  --- 196,202 ----
        }
    
    /* check if ProxyBlock directive on this host */
  !     destaddr.s_addr = inet_addr(desthost);
        for (i=0; i < conf->noproxies->nelts; i++)
        {
            if ((npent[i].name != NULL && strstr(desthost, npent[i].name) != 
NULL)