httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Chuck Murcko <ch...@hyperreal.com>
Subject cvs commit: apache/src/modules/proxy Makefile mod_proxy.c mod_proxy.h proxy_cache.c proxy_connect.c proxy_ftp.c proxy_http.c proxy_util.c
Date Wed, 09 Oct 1996 14:53:05 GMT
chuck       96/10/09 07:53:04

  Modified:    src/modules/proxy  Makefile mod_proxy.c mod_proxy.h
                        proxy_cache.c proxy_connect.c  proxy_ftp.c
                        proxy_http.c proxy_util.c
  Log:
  Code cleanup for -Wall
  
  Revision  Changes    Path
  1.5       +7 -9      apache/src/modules/proxy/Makefile
  
  Index: Makefile
  ===================================================================
  RCS file: /export/home/cvs/apache/src/modules/proxy/Makefile,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -C3 -r1.4 -r1.5
  *** Makefile	1996/10/01 21:54:57	1.4
  --- Makefile	1996/10/09 14:52:54	1.5
  ***************
  *** 50,56 ****
    # 
    # Makefile for the Apache proxy library
    # 
  ! # $Id: Makefile,v 1.4 1996/10/01 21:54:57 chuck Exp $
    #
    
    SHELL = /bin/sh
  --- 50,56 ----
    # 
    # Makefile for the Apache proxy library
    # 
  ! # $Id: Makefile,v 1.5 1996/10/09 14:52:54 chuck Exp $
    #
    
    SHELL = /bin/sh
  ***************
  *** 78,90 ****
    	ar crv $@ $(OBJS)
    	$(RANLIB) $@
    
    # dependencies
  ! $(OBJS): mod_proxy.h $(INCDIR)/httpd.h $(INCDIR)/http_config.h
    proxy_cache.o proxy_util.o: $(INCDIR)/md5.h
  - 
  - # various forms of cleanup
  - tidy:
  - 	rm -f *.out
  - 
  - clean:	tidy
  - 	rm -f *.o libproxy.a
  --- 78,88 ----
    	ar crv $@ $(OBJS)
    	$(RANLIB) $@
    
  + clean:
  + 	rm -f *.o libproxy.a
  + 
    # dependencies
  ! $(OBJS): mod_proxy.h $(INCDIR)/httpd.h $(INCDIR)/http_config.h $(INCDIR)/http_protocol.h
  ! proxy_cache.o proxy_connect.o proxy_ftp.o proxy_http.o proxy_util.o: $(INCDIR)/http_main.h
  ! proxy_cache.o proxy_connect.o proxy_http.o: $(INCDIR)/http_log.h
    proxy_cache.o proxy_util.o: $(INCDIR)/md5.h
  
  
  
  1.4       +15 -1     apache/src/modules/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/modules/proxy/mod_proxy.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -C3 -r1.3 -r1.4
  *** mod_proxy.c	1996/10/01 07:11:42	1.3
  --- mod_proxy.c	1996/10/09 14:52:55	1.4
  ***************
  *** 50,58 ****
     *
     */
    
  ! /* $Id: mod_proxy.c,v 1.3 1996/10/01 07:11:42 chuck Exp $ */
    
    #include "mod_proxy.h"
    
    /*
     * A Web proxy module. Stages:
  --- 50,72 ----
     *
     */
    
  ! /* $Id: mod_proxy.c,v 1.4 1996/10/09 14:52:55 chuck Exp $ */
    
    #include "mod_proxy.h"
  + 
  + /* Some WWW schemes and their default ports; this is basically /etc/services */
  + /* This will become global when the protocol abstraction comes */
  + static struct proxy_services defports[]={
  +     { "ftp",      DEFAULT_FTP_PORT},
  +     { "gopher",   DEFAULT_GOPHER_PORT},
  +     { "http",     DEFAULT_PORT},
  +     { "nntp",     DEFAULT_NNTP_PORT},
  +     { "wais",     DEFAULT_WAIS_PORT}, 
  +     { "https",    DEFAULT_HTTPS_PORT},
  +     { "snews",    DEFAULT_SNEWS_PORT},
  +     { "prospero", DEFAULT_PROSPERO_PORT},
  +     { NULL, -1}  /* unknown port */
  + };
    
    /*
     * A Web proxy module. Stages:
  
  
  
  1.2       +3 -12     apache/src/modules/proxy/mod_proxy.h
  
  Index: mod_proxy.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/modules/proxy/mod_proxy.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -C3 -r1.1 -r1.2
  *** mod_proxy.h	1996/10/01 07:11:43	1.1
  --- mod_proxy.h	1996/10/09 14:52:56	1.2
  ***************
  *** 50,56 ****
     *
     */
    
  ! /* $Id: mod_proxy.h,v 1.1 1996/10/01 07:11:43 chuck Exp $ */
    
    /*
     * Main include file for the Apache proxy
  --- 50,56 ----
     *
     */
    
  ! /* $Id: mod_proxy.h,v 1.2 1996/10/09 14:52:56 chuck Exp $ */
    
    /*
     * Main include file for the Apache proxy
  ***************
  *** 112,117 ****
  --- 112,118 ----
    
    #include "httpd.h"
    #include "http_config.h"
  + #include "http_protocol.h"
      
    #include "explain.h"
    
  ***************
  *** 143,162 ****
    #define	DEFAULT_PROSPERO_PORT	1525	/* WARNING: conflict w/Oracle */
    
    /* Some WWW schemes and their default ports; this is basically /etc/services */
  ! static struct
    {
        const char *scheme;
        int port;
  - } defports[]={
  -     { "ftp",      DEFAULT_FTP_PORT},
  -     { "gopher",   DEFAULT_GOPHER_PORT},
  -     { "http",     DEFAULT_PORT},
  -     { "nntp",     DEFAULT_NNTP_PORT},
  -     { "wais",     DEFAULT_WAIS_PORT},
  -     { "https",    DEFAULT_HTTPS_PORT},
  -     { "snews",    DEFAULT_SNEWS_PORT},
  -     { "prospero", DEFAULT_PROSPERO_PORT},
  -     { NULL, -1}  /* unknown port */
    };
    
    /* static information about a remote proxy */
  --- 144,153 ----
    #define	DEFAULT_PROSPERO_PORT	1525	/* WARNING: conflict w/Oracle */
    
    /* Some WWW schemes and their default ports; this is basically /etc/services */
  ! struct proxy_services
    {
        const char *scheme;
        int port;
    };
    
    /* static information about a remote proxy */
  
  
  
  1.2       +3 -1      apache/src/modules/proxy/proxy_cache.c
  
  Index: proxy_cache.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/modules/proxy/proxy_cache.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -C3 -r1.1 -r1.2
  *** proxy_cache.c	1996/10/01 07:11:44	1.1
  --- proxy_cache.c	1996/10/09 14:52:56	1.2
  ***************
  *** 50,62 ****
     *
     */
    
  ! /* $Id: proxy_cache.c,v 1.1 1996/10/01 07:11:44 chuck Exp $ */
    
    /* Cache and garbage collection  routines for Apache proxy */
    
    #include "md5.h"
    
    #include "mod_proxy.h"
    #include <utime.h>
    
    struct gc_ent
  --- 50,64 ----
     *
     */
    
  ! /* $Id: proxy_cache.c,v 1.2 1996/10/09 14:52:56 chuck Exp $ */
    
    /* Cache and garbage collection  routines for Apache proxy */
    
    #include "md5.h"
    
    #include "mod_proxy.h"
  + #include "http_log.h"
  + #include "http_main.h"
    #include <utime.h>
    
    struct gc_ent
  
  
  
  1.2       +3 -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.1
  retrieving revision 1.2
  diff -C3 -r1.1 -r1.2
  *** proxy_connect.c	1996/10/01 07:11:44	1.1
  --- proxy_connect.c	1996/10/09 14:52:57	1.2
  ***************
  *** 50,60 ****
     *
     */
    
  ! /* $Id: proxy_connect.c,v 1.1 1996/10/01 07:11:44 chuck Exp $ */
    
    /* CONNECT method SSL handling for Apache proxy */
    
    #include "mod_proxy.h"
    
    /*  
     * This handles Netscape CONNECT method secure proxy requests.
  --- 50,62 ----
     *
     */
    
  ! /* $Id: proxy_connect.c,v 1.2 1996/10/09 14:52:57 chuck Exp $ */
    
    /* CONNECT method SSL handling for Apache proxy */
    
    #include "mod_proxy.h"
  + #include "http_log.h"
  + #include "http_main.h"
    
    /*  
     * This handles Netscape CONNECT method secure proxy requests.
  
  
  
  1.2       +5 -2      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.1
  retrieving revision 1.2
  diff -C3 -r1.1 -r1.2
  *** proxy_ftp.c	1996/10/01 07:11:45	1.1
  --- proxy_ftp.c	1996/10/09 14:52:58	1.2
  ***************
  *** 50,60 ****
     *
     */
    
  ! /* $Id: proxy_ftp.c,v 1.1 1996/10/01 07:11:45 chuck Exp $ */
    
    /* FTP routines for Apache proxy */
    
    #include "mod_proxy.h"
    
    /*
     * Decodes a '%' escaped string, and returns the number of characters
  --- 50,63 ----
     *
     */
    
  ! /* $Id: proxy_ftp.c,v 1.2 1996/10/09 14:52:58 chuck Exp $ */
    
    /* FTP routines for Apache proxy */
    
    #include "mod_proxy.h"
  + #include "http_main.h"
  + 
  + extern int find_ct(request_rec *r);
    
    /*
     * Decodes a '%' escaped string, and returns the number of characters
  ***************
  *** 266,272 ****
                {
                    char temp[200];
                    char newpath[200];
  !                 char *method, *host, *path, *file, *newfile;
       
                    strcpy(temp,url);
                    method=temp;
  --- 269,275 ----
                {
                    char temp[200];
                    char newpath[200];
  !                 char *method, *host, *path, *newfile;
       
                    strcpy(temp,url);
                    method=temp;
  
  
  
  1.3       +3 -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.2
  retrieving revision 1.3
  diff -C3 -r1.2 -r1.3
  *** proxy_http.c	1996/10/08 22:49:29	1.2
  --- proxy_http.c	1996/10/09 14:52:58	1.3
  ***************
  *** 50,60 ****
     *
     */
    
  ! /* $Id: proxy_http.c,v 1.2 1996/10/08 22:49:29 chuck Exp $ */
    
    /* HTTP routines for Apache proxy */
    
    #include "mod_proxy.h"
    
    /*
     * Canonicalise http-like URLs.
  --- 50,62 ----
     *
     */
    
  ! /* $Id: proxy_http.c,v 1.3 1996/10/09 14:52:58 chuck Exp $ */
    
    /* HTTP routines for Apache proxy */
    
    #include "mod_proxy.h"
  + #include "http_log.h"
  + #include "http_main.h"
    
    /*
     * Canonicalise http-like URLs.
  
  
  
  1.2       +2 -2      apache/src/modules/proxy/proxy_util.c
  
  Index: proxy_util.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/modules/proxy/proxy_util.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -C3 -r1.1 -r1.2
  *** proxy_util.c	1996/10/01 07:11:46	1.1
  --- proxy_util.c	1996/10/09 14:52:59	1.2
  ***************
  *** 50,61 ****
     *
     */
    
  ! /* $Id: proxy_util.c,v 1.1 1996/10/01 07:11:46 chuck Exp $ */
    
    /* Utility routines for Apache proxy */
    
    #include "mod_proxy.h"
  ! 
    #include "md5.h"
    
    /* already called in the knowledge that the characters are hex digits */
  --- 50,61 ----
     *
     */
    
  ! /* $Id: proxy_util.c,v 1.2 1996/10/09 14:52:59 chuck Exp $ */
    
    /* Utility routines for Apache proxy */
    
    #include "mod_proxy.h"
  ! #include "http_main.h"
    #include "md5.h"
    
    /* already called in the knowledge that the characters are hex digits */
  
  
  

Mime
View raw message