httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dean Gaudet <dgau...@hyperreal.org>
Subject cvs commit: apache/src CHANGES Configure http_core.c http_core.h mod_access.c
Date Thu, 03 Jul 1997 05:59:49 GMT
dgaudet     97/07/02 22:59:48

  Modified:    src       Tag: APACHE_1_2_X  CHANGES Configure http_core.c
                        http_core.h mod_access.c
  Log:
  PR#695: fix problem compiling http_bprintf.c with gcc under SCO
  
  Submitted by:        Marc Slemko
  Reviewed by: Dean Gaudet, Randy Terbush
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.286.2.26 +3 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.286.2.25
  retrieving revision 1.286.2.26
  diff -C3 -r1.286.2.25 -r1.286.2.26
  *** CHANGES	1997/07/01 06:31:00	1.286.2.25
  --- CHANGES	1997/07/03 05:59:43	1.286.2.26
  ***************
  *** 95,100 ****
  --- 95,103 ----
    
      *) PORT: Workaround for AIX 3.x compiler bug in http_bprintf.c.  
         [Marc Slemko] PR#725
  +   
  +   *) PORT: fix problem compiling http_bprintf.c with gcc under SCO
  +      [Marc Slemko] PR#695
    
    Changes with Apache 1.2
    
  
  
  
  1.96.2.8  +3 -1      apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.96.2.7
  retrieving revision 1.96.2.8
  diff -C3 -r1.96.2.7 -r1.96.2.8
  *** Configure	1997/07/01 01:38:13	1.96.2.7
  --- Configure	1997/07/03 05:59:43	1.96.2.8
  ***************
  *** 375,381 ****
    	OS='SCO 5'
    	CFLAGS="$CFLAGS -DSCO5"
    	LIBS="$LIBS -lsocket -lmalloc -lprot"
  ! 	OSBPRINTF="-K noinline"
    	DEF_WANTHSREGEX=no
    	;;
        *-solaris2*)
  --- 375,383 ----
    	OS='SCO 5'
    	CFLAGS="$CFLAGS -DSCO5"
    	LIBS="$LIBS -lsocket -lmalloc -lprot"
  ! 	if [ "$CC" = "cc" ] || [ "$COMPILER" = "cc" ]; then
  ! 	    OSBPRINTF="-K noinline"
  ! 	fi
    	DEF_WANTHSREGEX=no
    	;;
        *-solaris2*)
  
  
  
  1.81.2.3  +4 -2      apache/src/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_core.c,v
  retrieving revision 1.81.2.2
  retrieving revision 1.81.2.3
  diff -C3 -r1.81.2.2 -r1.81.2.3
  *** http_core.c	1997/06/29 18:08:36	1.81.2.2
  --- http_core.c	1997/07/03 05:59:44	1.81.2.3
  ***************
  *** 338,344 ****
        if (dir_config) 
    	dir_conf = (core_dir_config *)get_module_config(dir_config, &core_module);
    
  !    if ((!dir_conf) || (type != REMOTE_NOLOOKUP && conn->remote_host == NULL
&& dir_conf->hostname_lookups))
        {
    #ifdef STATUS
    	int old_stat = update_child_status(conn->child_num,
  --- 338,346 ----
        if (dir_config) 
    	dir_conf = (core_dir_config *)get_module_config(dir_config, &core_module);
    
  !    if ((!dir_conf) || (type == REMOTE_FORCE_HOST && conn->remote_host == NULL)
  ! 	|| (type != REMOTE_NOLOOKUP
  ! 	    && conn->remote_host == NULL && dir_conf->hostname_lookups))
        {
    #ifdef STATUS
    	int old_stat = update_child_status(conn->child_num,
  ***************
  *** 383,389 ****
    	return conn->remote_host;
        else
        {
  ! 	if (type == REMOTE_HOST) return NULL;
    	else return conn->remote_ip;
        }
    }
  --- 385,391 ----
    	return conn->remote_host;
        else
        {
  ! 	if (type == REMOTE_HOST || type == REMOTE_FORCE_HOST) return NULL;
    	else return conn->remote_ip;
        }
    }
  
  
  
  1.20.2.1  +1 -0      apache/src/http_core.h
  
  Index: http_core.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_core.h,v
  retrieving revision 1.20
  retrieving revision 1.20.2.1
  diff -C3 -r1.20 -r1.20.2.1
  *** http_core.h	1997/02/17 10:46:07	1.20
  --- http_core.h	1997/07/03 05:59:45	1.20.2.1
  ***************
  *** 77,82 ****
  --- 77,83 ----
    #define REMOTE_HOST (0)
    #define REMOTE_NAME (1)
    #define REMOTE_NOLOOKUP (2)
  + #define REMOTE_FORCE_HOST (3)
    
    #define SATISFY_ALL 0
    #define SATISFY_ANY 1
  
  
  
  1.16.2.1  +1 -1      apache/src/mod_access.c
  
  Index: mod_access.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_access.c,v
  retrieving revision 1.16
  retrieving revision 1.16.2.1
  diff -C3 -r1.16 -r1.16.2.1
  *** mod_access.c	1997/03/07 14:15:36	1.16
  --- mod_access.c	1997/07/03 05:59:45	1.16.2.1
  ***************
  *** 206,212 ****
    
    	if (!gothost) {
    	    remotehost = get_remote_host(r->connection, r->per_dir_config,
  ! 	                                 REMOTE_HOST);
    
    	    if ((remotehost == NULL) || is_ip(remotehost))
    	        gothost = 1;
  --- 206,212 ----
    
    	if (!gothost) {
    	    remotehost = get_remote_host(r->connection, r->per_dir_config,
  ! 	                                 REMOTE_FORCE_HOST);
    
    	    if ((remotehost == NULL) || is_ip(remotehost))
    	        gothost = 1;
  
  
  

Mime
View raw message