httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alexei Kosut <ako...@hyperreal.org>
Subject cvs commit: apache/src http_config.c http_main.c
Date Tue, 22 Jul 1997 23:52:03 GMT
akosut      97/07/22 16:52:01

  Modified:    src       http_config.c http_main.c
  Log:
  Work around compilers (like MSVC++) that don't do what we want with
  __FILE__.
  
  Revision  Changes    Path
  1.63      +8 -0      apache/src/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_config.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -c -u -r1.62 -r1.63
  /usr/bin/diff: conflicting specifications of output style
  --- http_config.c	1997/07/21 05:53:41	1.62
  +++ http_config.c	1997/07/22 23:51:58	1.63
  @@ -467,6 +467,14 @@
       if (m->module_index == -1) {
   	m->module_index = total_modules++;
       }
  +    
  +    /* Some C compilers put a complete path into __FILE__, but we want
  +     * only the filename (e.g. mod_includes.c). So check for path
  +     * components (Unix and DOS), and remove them.
  +     */
  +
  +    if (strrchr(m->name, '/')) m->name = strrchr(m->name, '/');
  +    if (strrchr(m->name, '\\')) m->name = strrchr(m->name, '\\');
   
       /** XXX: this will be slow if there's lots of add_modules */
       build_method_shortcuts ();
  
  
  
  1.185     +4 -3      apache/src/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.184
  retrieving revision 1.185
  diff -c -u -r1.184 -r1.185
  /usr/bin/diff: conflicting specifications of output style
  --- http_main.c	1997/07/21 05:53:45	1.184
  +++ http_main.c	1997/07/22 23:51:58	1.185
  @@ -2695,6 +2695,8 @@
       strncpy (server_confname, SERVER_CONFIG_FILE, sizeof(server_root)-1);
       server_confname[sizeof(server_confname)-1] = '\0';
   
  +    setup_prelinked_modules();
  +
       while((c = getopt(argc,argv,"Xd:f:vhl")) != -1) {
           switch(c) {
             case 'd':
  @@ -2727,8 +2729,6 @@
       printf("OS/2 port by Garey Smiley <garey@slink.com> \n");
   #endif
   
  -    setup_prelinked_modules();
  -
       suexec_enabled = init_suexec();
       server_conf = read_config (pconf, ptrans, server_confname);
       init_modules (pconf, server_conf);
  @@ -3526,6 +3526,8 @@
       strncpy (server_confname, SERVER_CONFIG_FILE, sizeof(server_root)-1);
       server_confname[sizeof(server_confname)-1] = '\0';
   
  +    setup_prelinked_modules();
  +
       while((c = getopt(argc,argv,"Xd:f:vhlc:ius")) != -1) {
           switch(c) {
   #ifdef WIN32
  @@ -3587,7 +3589,6 @@
       {
           service_cd();
       }
  -    setup_prelinked_modules();
   
       server_conf = read_config (pconf, ptrans, server_confname);
       init_modules (pconf, server_conf);
  
  
  

Mime
View raw message