httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@hyperreal.org
Subject cvs commit: apachen/src/main http_main.c
Date Thu, 13 Nov 1997 20:20:51 GMT
ben         97/11/13 12:20:50

  Modified:    src/main http_main.c
  Log:
  Make it work on Win32.
  
  Revision  Changes    Path
  1.250     +71 -67    apachen/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
  retrieving revision 1.249
  retrieving revision 1.250
  diff -u -r1.249 -r1.250
  --- http_main.c	1997/11/12 23:22:07	1.249
  +++ http_main.c	1997/11/13 20:20:46	1.250
  @@ -2661,6 +2661,75 @@
       return;
   }
   
  +static void show_compile_settings(void)
  +{
  +#ifdef SERVER_SUBVERSION
  +    printf("Server base version: \"%s\"\n", SERVER_BASEVERSION);
  +    printf("Server sub-version:  \"%s\"\n", SERVER_SUBVERSION);
  +#else
  +    printf("Server version \"%s\"\n", SERVER_VERSION);
  +#endif
  +#ifndef WIN32
  +    printf("Server built:  %s\n", SERVER_BUILT);
  +#endif
  +    printf("Server compiled with....\n");
  +#ifdef BIG_SECURITY_HOLE
  +    printf(" -D BIG_SECURITY_HOLE\n");
  +#endif
  +#ifdef HTTPD_ROOT
  +    printf(" -D HTTPD_ROOT=\"" HTTPD_ROOT "\"\n");
  +#endif
  +#ifdef HAVE_MMAP
  +    printf(" -D HAVE_MMAP\n");
  +#endif
  +#ifdef HAVE_SHMGET
  +    printf(" -D HAVE_SHMGET\n");
  +#endif
  +#ifdef USE_MMAP_FILES
  +    printf(" -D USE_MMAP_FILES\n");
  +#ifdef MMAP_SEGMENT_SIZE
  +	printf(" -D MMAP_SEGMENT_SIZE=%ld\n",(long)MMAP_SEGMENT_SIZE);
  +#endif
  +#endif /*USE_MMAP_FILES*/
  +#ifdef NO_WRITEV
  +    printf(" -D NO_WRITEV\n");
  +#endif
  +#ifdef NO_LINGCLOSE
  +    printf(" -D NO_LINGCLOSE\n");
  +#endif
  +#ifdef USE_FCNTL_SERIALIZED_ACCEPT
  +    printf(" -D USE_FCNTL_SERIALIZED_ACCEPT\n");
  +#endif
  +#ifdef USE_FLOCK_SERIALIZED_ACCEPT
  +    printf(" -D USE_FLOCK_SERIALIZED_ACCEPT\n");
  +#endif
  +#ifdef USE_USLOCK_SERIALIZED_ACCEPT
  +    printf(" -D USE_USLOCK_SERIALIZED_ACCEPT\n");
  +#endif
  +#ifdef USE_SYSVSEM_SERIALIZED_ACCEPT
  +    printf(" -D USE_SYSVSEM_SERIALIZED_ACCEPT\n");
  +#endif
  +#ifdef USE_PTHREAD_SERIALIZED_ACCEPT
  +    printf(" -D USE_PTHREAD_SERIALIZED_ACCEPT\n");
  +#endif
  +#ifdef SAFE_UNSERIALIZED_ACCEPT
  +    printf(" -D SAFE_UNSERIALIZED_ACCEPT\n");
  +#endif
  +#ifdef NO_OTHER_CHILD
  +    printf(" -D NO_OTHER_CHILD\n");
  +#endif
  +#ifdef NO_RELIABLE_PIPED_LOGS
  +    printf(" -D NO_RELIABLE_PIPED_LOGS\n");
  +#endif
  +#ifdef BUFFERED_LOGS
  +    printf(" -D BUFFERED_LOGS\n");
  +#ifdef PIPE_BUF
  +	printf(" -D PIPE_BUF=%ld\n",(long)PIPE_BUF);
  +#endif
  +#endif
  +    printf("\n");
  +}
  +
   #ifndef MULTITHREAD
   /*****************************************************************
    * Child process main loop.
  @@ -3197,73 +3266,6 @@
   }
   
   
  -static void show_compile_settings(void)
  -{
  -#ifdef SERVER_SUBVERSION
  -    printf("Server base version: \"%s\"\n", SERVER_BASEVERSION);
  -    printf("Server sub-version:  \"%s\"\n", SERVER_SUBVERSION);
  -#else
  -    printf("Server version \"%s\"\n", SERVER_VERSION);
  -#endif
  -    printf("Server built:  %s\n", SERVER_BUILT);
  -    printf("Server compiled with....\n");
  -#ifdef BIG_SECURITY_HOLE
  -    printf(" -D BIG_SECURITY_HOLE\n");
  -#endif
  -#ifdef HTTPD_ROOT
  -    printf(" -D HTTPD_ROOT=\"" HTTPD_ROOT "\"\n");
  -#endif
  -#ifdef HAVE_MMAP
  -    printf(" -D HAVE_MMAP\n");
  -#endif
  -#ifdef HAVE_SHMGET
  -    printf(" -D HAVE_SHMGET\n");
  -#endif
  -#ifdef USE_MMAP_FILES
  -    printf(" -D USE_MMAP_FILES\n");
  -#ifdef MMAP_SEGMENT_SIZE
  -	printf(" -D MMAP_SEGMENT_SIZE=%ld\n",(long)MMAP_SEGMENT_SIZE);
  -#endif
  -#endif /*USE_MMAP_FILES*/
  -#ifdef NO_WRITEV
  -    printf(" -D NO_WRITEV\n");
  -#endif
  -#ifdef NO_LINGCLOSE
  -    printf(" -D NO_LINGCLOSE\n");
  -#endif
  -#ifdef USE_FCNTL_SERIALIZED_ACCEPT
  -    printf(" -D USE_FCNTL_SERIALIZED_ACCEPT\n");
  -#endif
  -#ifdef USE_FLOCK_SERIALIZED_ACCEPT
  -    printf(" -D USE_FLOCK_SERIALIZED_ACCEPT\n");
  -#endif
  -#ifdef USE_USLOCK_SERIALIZED_ACCEPT
  -    printf(" -D USE_USLOCK_SERIALIZED_ACCEPT\n");
  -#endif
  -#ifdef USE_SYSVSEM_SERIALIZED_ACCEPT
  -    printf(" -D USE_SYSVSEM_SERIALIZED_ACCEPT\n");
  -#endif
  -#ifdef USE_PTHREAD_SERIALIZED_ACCEPT
  -    printf(" -D USE_PTHREAD_SERIALIZED_ACCEPT\n");
  -#endif
  -#ifdef SAFE_UNSERIALIZED_ACCEPT
  -    printf(" -D SAFE_UNSERIALIZED_ACCEPT\n");
  -#endif
  -#ifdef NO_OTHER_CHILD
  -    printf(" -D NO_OTHER_CHILD\n");
  -#endif
  -#ifdef NO_RELIABLE_PIPED_LOGS
  -    printf(" -D NO_RELIABLE_PIPED_LOGS\n");
  -#endif
  -#ifdef BUFFERED_LOGS
  -    printf(" -D BUFFERED_LOGS\n");
  -#ifdef PIPE_BUF
  -	printf(" -D PIPE_BUF=%ld\n",(long)PIPE_BUF);
  -#endif
  -#endif
  -    printf("\n");
  -}
  -
   /*****************************************************************
    * Executive routines.
    */
  @@ -4345,7 +4347,9 @@
   	    break;
   	case 'v':
   	    printf("Server version %s.\n", SERVER_VERSION);
  +#ifndef WIN32
   	    printf("Server built:  %s\n", SERVER_BUILT);
  +#endif
   	    exit(0);
   	case 'V':
   	    show_compile_settings();
  
  
  

Mime
View raw message