httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ben Laurie <...@hyperreal.com>
Subject cvs commit: apache/src/helpers PrintPath
Date Sun, 19 Jan 1997 17:43:32 GMT
ben         97/01/19 09:43:31

  Modified:    src       Configure alloc.c http_main.c
               src/helpers  PrintPath
  Log:
  Make use of -x or -r in [] per-platform.
  
  Revision  Changes    Path
  1.71      +5 -0      apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -C3 -r1.70 -r1.71
  *** Configure	1997/01/10 13:23:30	1.70
  --- Configure	1997/01/19 17:43:27	1.71
  ***************
  *** 17,22 ****
  --- 17,23 ----
    file=Configuration
    tmpfile=htconf.$$
    makefile_tmpl=Makefile.tmpl
  + CONF_TEST_EXECUTABLE=-x
    
    while [ "x$1" != "x" ]; do
      if [ "x$1" = "x-file" ] ; then
  ***************
  *** 358,363 ****
  --- 359,365 ----
    	OS='ULTRIX'
    	CFLAGS="-DULTRIX"
    	DEF_WANTHSREGEX=yes
  + 	CONF_TEST_EXECUTABLE=-r
    	;;
        *powerpc-tenon-machten*)
        	OS='MachTen'
  ***************
  *** 394,399 ****
  --- 396,403 ----
    	;;
    esac
    
  + export CONF_TEST_EXECUTABLE
  + 
    #
    # See if we need to override WANTHSREGEX
    #
  ***************
  *** 426,431 ****
  --- 430,436 ----
    # then we look for some popular compilers in our $PATH
    # and set a "safe" optimization level
    #
  + 
    for compilers in "gcc" "cc" "acc" "c89"
    do
        lookedfor="$lookedfor $compilers"
  
  
  
  1.22      +0 -1      apache/src/alloc.c
  
  Index: alloc.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/alloc.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -C3 -r1.21 -r1.22
  *** alloc.c	1997/01/01 18:10:13	1.21
  --- alloc.c	1997/01/19 17:43:27	1.22
  ***************
  *** 189,195 ****
    
      while (blok != NULL) {
        if (min_size <= blok->h.endp - blok->h.first_avail) {
  -       
          *lastptr = blok->h.next;
          blok->h.next = NULL;
          return blok;
  --- 189,194 ----
  
  
  
  1.107     +3 -3      apache/src/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -C3 -r1.106 -r1.107
  *** http_main.c	1997/01/12 20:38:12	1.106
  --- http_main.c	1997/01/19 17:43:28	1.107
  ***************
  *** 1417,1423 ****
    		    s->server_hostname = pstrdup (pconf, (char *)h->h_name);
    		else
    		    {
  ! 		    fprintf(stderr,"Failed to resolve server name (check DNS)\n");
    		    exit(0);
    		    }
    	    }
  --- 1417,1423 ----
    		    s->server_hostname = pstrdup (pconf, (char *)h->h_name);
    		else
    		    {
  ! 		    fprintf(stderr,"Failed to resolve server name for %s (check DNS)\n",inet_ntoa(s->addrs->host_addr));
    		    exit(0);
    		    }
    	    }
  ***************
  *** 1635,1641 ****
    				       (struct sockaddr_in *)&sa_client,
    				       (struct sockaddr_in *)&sa_server,
    				       child_num);
  ! 	
    	r = read_request (current_conn);
    	(void)update_child_status (child_num, SERVER_BUSY_WRITE, r);
    	if (r) process_request (r); /* else premature EOF --- ignore */
  --- 1635,1641 ----
    				       (struct sockaddr_in *)&sa_client,
    				       (struct sockaddr_in *)&sa_server,
    				       child_num);
  ! 
    	r = read_request (current_conn);
    	(void)update_child_status (child_num, SERVER_BUSY_WRITE, r);
    	if (r) process_request (r); /* else premature EOF --- ignore */
  ***************
  *** 2018,2024 ****
        init_alloc();
        pconf = permanent_pool;
        ptrans = make_sub_pool(pconf);
  !     
        server_argv0 = argv[0];
        strcpy (server_root, HTTPD_ROOT);
        strcpy (server_confname, SERVER_CONFIG_FILE);
  --- 2018,2024 ----
        init_alloc();
        pconf = permanent_pool;
        ptrans = make_sub_pool(pconf);
  ! 
        server_argv0 = argv[0];
        strcpy (server_root, HTTPD_ROOT);
        strcpy (server_confname, SERVER_CONFIG_FILE);
  
  
  
  1.6       +2 -1      apache/src/helpers/PrintPath
  
  Index: PrintPath
  ===================================================================
  RCS file: /export/home/cvs/apache/src/helpers/PrintPath,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -C3 -r1.5 -r1.6
  *** PrintPath	1997/01/06 18:10:23	1.5
  --- PrintPath	1997/01/19 17:43:31	1.6
  ***************
  *** 3,8 ****
  --- 3,9 ----
    #  will print out the full pathname unless
    #  called with the '-s' option
    #
  + 
    if [ "x$1" = "x-s" ]; then
        shift
    else
  ***************
  *** 15,21 ****
          s/:$/:./
          s/:/ /g' `
    do
  !     if [ -r $path/$1 ] && [ ! -d $path/$1 ]; then
            if [ "$echo" = "yes" ]; then
    	    echo $path/$1
    	fi
  --- 16,22 ----
          s/:$/:./
          s/:/ /g' `
    do
  !     if [ $CONF_TEST_EXECUTABLE $path/$1 ] && [ ! -d $path/$1 ]; then
            if [ "$echo" = "yes" ]; then
    	    echo $path/$1
    	fi
  
  
  

Mime
View raw message