httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm/spmt_os2 scoreboard.h
Date Thu, 19 Oct 2000 00:05:01 GMT
rbb         00/10/18 17:05:01

  Modified:    .        STATUS
               src      CHANGES
               src/ap   ap_buckets_mmap.c
               src/include ap_config.h http_log.h
               src/main http_core.c http_log.c http_main.c http_protocol.c
               src/modules/mpm/mpmt_pthread scoreboard.h
               src/modules/mpm/prefork scoreboard.h
               src/modules/mpm/spmt_os2 scoreboard.h
  Log:
  Namespace protect the rest of the macros defined by ap_config.h
  
  Revision  Changes    Path
  1.146     +1 -4      apache-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/apache-2.0/STATUS,v
  retrieving revision 1.145
  retrieving revision 1.146
  diff -u -r1.145 -r1.146
  --- STATUS	2000/10/18 23:11:48	1.145
  +++ STATUS	2000/10/19 00:04:53	1.146
  @@ -1,5 +1,5 @@
   Apache 2.0 STATUS:
  -Last modified at [$Date: 2000/10/18 23:11:48 $]
  +Last modified at [$Date: 2000/10/19 00:04:53 $]
   
   Release:
   
  @@ -146,9 +146,6 @@
         would allow mod_mmap_static to munge what the translation has
         decided to do.
           Status: Greg +1 (volunteers), Ryan +1
  -
  -    * Go through ap_config.h and namespace-protect the symbols (e.g. USE_*).
  -      Some symbols can/should move to mpm_common.h where possible.
   
       * Explore use of a post-config hook for the code in http_main.c which
         calls ap_fixup_virutal_hosts(), ap_fini_vhost_config(), and
  
  
  
  1.289     +4 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.288
  retrieving revision 1.289
  diff -u -r1.288 -r1.289
  --- CHANGES	2000/10/18 23:22:38	1.288
  +++ CHANGES	2000/10/19 00:04:54	1.289
  @@ -1,4 +1,8 @@
   Changes with Apache 2.0a8
  +
  +  *) Namespace protect some macros declared in ap_config.h
  +     [Ryan Bloom]
  +
     *) Support HTTP header line folding with input filtering.
        [Greg Ames]
   
  
  
  
  1.16      +1 -1      apache-2.0/src/ap/ap_buckets_mmap.c
  
  Index: ap_buckets_mmap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_buckets_mmap.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ap_buckets_mmap.c	2000/10/16 06:38:42	1.15
  +++ ap_buckets_mmap.c	2000/10/19 00:04:54	1.16
  @@ -64,7 +64,7 @@
       apr_status_t ok;
       void *addr;
       
  -#ifdef USE_MMAP_FILES
  +#ifdef AP_USE_MMAP_FILES
       ok = apr_mmap_offset(&addr, m->mmap, s->start);
       if (ok != APR_SUCCESS) {
   	return ok;
  
  
  
  1.47      +5 -5      apache-2.0/src/include/ap_config.h
  
  Index: ap_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- ap_config.h	2000/10/17 13:26:55	1.46
  +++ ap_config.h	2000/10/19 00:04:55	1.47
  @@ -180,21 +180,21 @@
   #undef VERSION
   
   #if APR_HAS_MMAP
  -#define USE_MMAP_FILES 1
  +#define AP_USE_MMAP_FILES 1
   #else
  -#undef USE_MMAP_FILES
  +#undef AP_USE_MMAP_FILES
   #endif
   
   #if APR_FILE_BASED_SHM
  -#define USE_FILE_BASED_SCOREBOARD
  +#define AP_USE_FILE_BASED_SCOREBOARD
   #else
  -#define USE_MEM_BASED_SCOREBOARD
  +#define AP_USE_MEM_BASED_SCOREBOARD
   #endif
   
   /* If APR has OTHER_CHILD logic, use reliable piped logs.
    */
   #if (APR_HAS_OTHER_CHILD)
  -#define HAVE_RELIABLE_PIPED_LOGS TRUE
  +#define AP_HAVE_RELIABLE_PIPED_LOGS TRUE
   #endif
   
   #if defined(CHARSET_EBCDIC) && !defined(APACHE_XLATE)
  
  
  
  1.21      +1 -1      apache-2.0/src/include/http_log.h
  
  Index: http_log.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_log.h,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- http_log.h	2000/10/16 06:04:34	1.20
  +++ http_log.h	2000/10/19 00:04:55	1.21
  @@ -229,7 +229,7 @@
       apr_file_t *fds[2];
       /* XXX - an #ifdef that needs to be eliminated from public view. Shouldn't
        * be hard */
  -#ifdef HAVE_RELIABLE_PIPED_LOGS
  +#ifdef AP_HAVE_RELIABLE_PIPED_LOGS
       /** The name of the program the logging process is running */
       char *program;
       /** The pid of the logging process */
  
  
  
  1.178     +5 -5      apache-2.0/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
  retrieving revision 1.177
  retrieving revision 1.178
  diff -u -r1.177 -r1.178
  --- http_core.c	2000/10/18 19:32:30	1.177
  +++ http_core.c	2000/10/19 00:04:55	1.178
  @@ -94,7 +94,7 @@
   #define MIN_SIZE_TO_WRITE  9000
   
   /* Allow Apache to use ap_mmap */
  -#ifdef USE_MMAP_FILES
  +#ifdef AP_USE_MMAP_FILES
   #include "apr_mmap.h"
   
   /* mmap support for static files based on ideas from John Heidemann's
  @@ -116,7 +116,7 @@
   #ifndef MMAP_LIMIT
   #define MMAP_LIMIT              (4*1024*1024)
   #endif
  -#endif /* USE_MMAP_FILES */
  +#endif /* AP_USE_MMAP_FILES */
   
   /* LimitXMLRequestBody handling */
   #define AP_LIMIT_UNSET                  ((long) -1)
  @@ -2926,7 +2926,7 @@
       int rangestatus, errstatus;
       apr_file_t *fd = NULL;
       apr_status_t status;
  -#ifdef USE_MMAP_FILES
  +#ifdef AP_USE_MMAP_FILES
       apr_mmap_t *mm = NULL;
   #endif
       /* XXX if/when somebody writes a content-md5 filter we either need to
  @@ -2985,7 +2985,7 @@
           return errstatus;
       }
   
  -#ifdef USE_MMAP_FILES
  +#ifdef AP_USE_MMAP_FILES
       if ((r->finfo.size >= MMAP_THRESHOLD)
   	&& (r->finfo.size < MMAP_LIMIT)
   	&& (!r->header_only || bld_content_md5)) {
  @@ -3038,7 +3038,7 @@
   	    }
   	}
   
  -#ifdef USE_MMAP_FILES
  +#ifdef AP_USE_MMAP_FILES
       }
       else {
   	unsigned char *addr;
  
  
  
  1.72      +1 -1      apache-2.0/src/main/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_log.c,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- http_log.c	2000/10/18 06:09:10	1.71
  +++ http_log.c	2000/10/19 00:04:55	1.72
  @@ -553,7 +553,7 @@
   
   /* piped log support */
   
  -#ifdef HAVE_RELIABLE_PIPED_LOGS
  +#ifdef AP_HAVE_RELIABLE_PIPED_LOGS
   /* forward declaration */
   static void piped_log_maintenance(int reason, void *data, apr_wait_t status);
   
  
  
  
  1.66      +9 -9      apache-2.0/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- http_main.c	2000/08/26 10:02:03	1.65
  +++ http_main.c	2000/10/19 00:04:55	1.66
  @@ -95,18 +95,18 @@
   #ifdef HAVE_SHMGET
       printf(" -D HAVE_SHMGET\n");
   #endif
  -#ifdef USE_FILE_BASED_SCOREBOARD
  -    printf(" -D USE_FILE_BASED_SCOREBOARD\n");
  +#ifdef AP_USE_FILE_BASED_SCOREBOARD
  +    printf(" -D AP_USE_FILE_BASED_SCOREBOARD\n");
   #endif
  -#ifdef USE_MEM_BASED_SCOREBOARD
  -    printf(" -D USE_MEM_BASED_SCOREBOARD\n");
  +#ifdef AP_USE_MEM_BASED_SCOREBOARD
  +    printf(" -D AP_USE_MEM_BASED_SCOREBOARD\n");
   #endif
  -#ifdef USE_MMAP_FILES
  -    printf(" -D USE_MMAP_FILES\n");
  +#ifdef AP_USE_MMAP_FILES
  +    printf(" -D AP_USE_MMAP_FILES\n");
   #ifdef MMAP_SEGMENT_SIZE
   	printf(" -D MMAP_SEGMENT_SIZE=%ld\n",(long)MMAP_SEGMENT_SIZE);
   #endif
  -#endif /*USE_MMAP_FILES*/
  +#endif /*AP_USE_MMAP_FILES*/
   #ifdef NO_WRITEV
       printf(" -D NO_WRITEV\n");
   #endif
  @@ -134,8 +134,8 @@
   #if APR_HAS_OTHER_CHILD
       printf(" -D APR_HAS_OTHER_CHILD\n");
   #endif
  -#ifdef HAVE_RELIABLE_PIPED_LOGS
  -    printf(" -D HAVE_RELIABLE_PIPED_LOGS\n");
  +#ifdef AP_HAVE_RELIABLE_PIPED_LOGS
  +    printf(" -D AP_HAVE_RELIABLE_PIPED_LOGS\n");
   #endif
   #ifdef BUFFERED_LOGS
       printf(" -D BUFFERED_LOGS\n");
  
  
  
  1.192     +2 -2      apache-2.0/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
  retrieving revision 1.191
  retrieving revision 1.192
  diff -u -r1.191 -r1.192
  --- http_protocol.c	2000/10/18 23:22:41	1.191
  +++ http_protocol.c	2000/10/19 00:04:55	1.192
  @@ -2667,7 +2667,7 @@
   } 
   #endif
   
  -#ifdef USE_MMAP_FILES
  +#ifdef AP_USE_MMAP_FILES
   
   /* The code writes MMAP_SEGMENT_SIZE bytes at a time.  This is due to Apache's
    * timeout model, which is a timeout per-write rather than a time for the
  @@ -2700,7 +2700,7 @@
   
       return mm->size; /* XXX - change API to report apr_status_t? */
   }
  -#endif /* USE_MMAP_FILES */
  +#endif /* AP_USE_MMAP_FILES */
   
   AP_DECLARE(int) ap_rputc(int c, request_rec *r)
   {
  
  
  
  1.24      +1 -1      apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- scoreboard.h	2000/10/16 06:04:59	1.23
  +++ scoreboard.h	2000/10/19 00:04:56	1.24
  @@ -73,7 +73,7 @@
   #include "mpm_default.h"	/* For HARD_.*_LIMIT */
   
   /*The optimized timeout code only works if we're not using a scoreboard file*/
  -#if defined(USE_MEM_BASED_SCOREBOARD)
  +#if defined(AP_USE_MEM_BASED_SCOREBOARD)
   #define OPTIMIZE_TIMEOUTS
   #endif
   
  
  
  
  1.15      +1 -1      apache-2.0/src/modules/mpm/prefork/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/scoreboard.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- scoreboard.h	2000/10/16 06:05:01	1.14
  +++ scoreboard.h	2000/10/19 00:04:57	1.15
  @@ -75,7 +75,7 @@
   
   /* The optimized timeout code only works if we're not using a scoreboard file
    */
  -#if defined(USE_MEM_BASED_SCOREBOARD)
  +#if defined(AP_USE_MEM_BASED_SCOREBOARD)
   #define OPTIMIZE_TIMEOUTS
   #endif
   
  
  
  
  1.14      +1 -1      apache-2.0/src/modules/mpm/spmt_os2/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/scoreboard.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- scoreboard.h	2000/10/16 06:05:01	1.13
  +++ scoreboard.h	2000/10/19 00:05:00	1.14
  @@ -69,7 +69,7 @@
   
   /* The optimized timeout code only works if we're not using a scoreboard file
    */
  -#if defined(USE_MEM_BASED_SCOREBOARD)
  +#if defined(AP_USE_MEM_BASED_SCOREBOARD)
   #define OPTIMIZE_TIMEOUTS
   #endif
   
  
  
  

Mime
View raw message