cvs commit: apachen/src/main httpd.h

1998-01-22 Thread jim
jim 98/01/22 15:23:45

  Modified:src/main httpd.h
  Log:
  Work around CPP
  
  Revision  ChangesPath
  1.176 +1 -1  apachen/src/main/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.175
  retrieving revision 1.176
  diff -u -r1.175 -r1.176
  --- httpd.h   1998/01/22 23:11:59 1.175
  +++ httpd.h   1998/01/22 23:23:41 1.176
  @@ -922,7 +922,7 @@
   /* The optimized timeout code only works if we're not MULTITHREAD and we're
* also not using a scoreboard file
*/
  -#if !defined (MULTITHREAD) &&
  +#if !defined (MULTITHREAD) && \
   (defined (USE_MMAP_SCOREBOARD) || defined (USE_SHMGET_SCOREBOARD))
   #define OPTIMIZE_TIMEOUTS
   #endif
  
  
  


cvs commit: apachen/src/main httpd.h

1997-12-28 Thread ben
ben 97/12/28 03:52:04

  Modified:src  ApacheCore.mak
   src/ap   ap_strings.c
   src/main httpd.h
  Log:
  Sort out ap_strings for Win32.
  
  Revision  ChangesPath
  1.24  +237 -1apachen/src/ApacheCore.mak
  
  Index: ApacheCore.mak
  ===
  RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ApacheCore.mak1997/12/27 15:07:17 1.23
  +++ ApacheCore.mak1997/12/28 11:52:00 1.24
  @@ -53,6 +53,7 @@
   CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\alloc.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj"
  + [EMAIL PROTECTED] "$(INTDIR)\ap_strings.obj"
[EMAIL PROTECTED] "$(INTDIR)\buff.obj"
[EMAIL PROTECTED] "$(INTDIR)\buildmark.obj"
[EMAIL PROTECTED] "$(INTDIR)\explain.obj"
  @@ -100,6 +101,7 @@
[EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.lib"
  + [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.pdb"
   
   "$(OUTDIR)" :
   if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  @@ -118,13 +120,14 @@
   LINK32_FLAGS=os\win32\ApacheOSR\ApacheOS.lib regex\release\regex.lib\
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\
shell32.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:no\
  - /pdb:"$(OUTDIR)\ApacheCore.pdb" /machine:I386 /def:".\ApacheCore.def"\
  + /pdb:"$(OUTDIR)\ApacheCore.pdb" /debug /machine:I386 
/def:".\ApacheCore.def"\
/out:"$(OUTDIR)\ApacheCore.dll" /implib:"$(OUTDIR)\ApacheCore.lib" 
   DEF_FILE= \
".\ApacheCore.def"
   LINK32_OBJS= \
"$(INTDIR)\alloc.obj" \
"$(INTDIR)\ap_snprintf.obj" \
  + "$(INTDIR)\ap_strings.obj" \
"$(INTDIR)\buff.obj" \
"$(INTDIR)\buildmark.obj" \
"$(INTDIR)\explain.obj" \
  @@ -196,6 +199,8 @@
[EMAIL PROTECTED] "$(INTDIR)\alloc.sbr"
[EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.sbr"
  + [EMAIL PROTECTED] "$(INTDIR)\ap_strings.obj"
  + [EMAIL PROTECTED] "$(INTDIR)\ap_strings.sbr"
[EMAIL PROTECTED] "$(INTDIR)\buff.obj"
[EMAIL PROTECTED] "$(INTDIR)\buff.sbr"
[EMAIL PROTECTED] "$(INTDIR)\buildmark.obj"
  @@ -303,6 +308,7 @@
   BSC32_SBRS= \
"$(INTDIR)\alloc.sbr" \
"$(INTDIR)\ap_snprintf.sbr" \
  + "$(INTDIR)\ap_strings.sbr" \
"$(INTDIR)\buff.sbr" \
"$(INTDIR)\buildmark.sbr" \
"$(INTDIR)\explain.sbr" \
  @@ -362,6 +368,7 @@
   LINK32_OBJS= \
"$(INTDIR)\alloc.obj" \
"$(INTDIR)\ap_snprintf.obj" \
  + "$(INTDIR)\ap_strings.obj" \
"$(INTDIR)\buff.obj" \
"$(INTDIR)\buildmark.obj" \
"$(INTDIR)\explain.obj" \
  @@ -515,6 +522,39 @@
   
   !ENDIF 
   
  +SOURCE=.\ap\ap_strings.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
  +DEP_CPP_AP_ST=\
  + ".\main\alloc.h"\
  + ".\main\buff.h"\
  + ".\main\conf.h"\
  + ".\main\httpd.h"\
  + ".\os\win32\os.h"\
  + ".\os\win32\readdir.h"\
  + ".\regex\regex.h"\
  + {$(INCLUDE)}"sys\stat.h"\
  + {$(INCLUDE)}"sys\types.h"\
  + 
  +NODEP_CPP_AP_ST=\
  + ".\main\os.h"\
  + ".\main\sfio.h"\
  + 
  +
  +"$(INTDIR)\ap_strings.obj" : $(SOURCE) $(DEP_CPP_AP_ST) "$(INTDIR)"
  + $(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  +
  +
  +"$(INTDIR)\ap_strings.obj"   "$(INTDIR)\ap_strings.sbr" : $(SOURCE) 
"$(INTDIR)"
  + $(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   SOURCE=.\main\buff.c
   
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
  @@ -602,6 +642,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
  + {$(INCLUDE)}"sys\stat.h"\
  + {$(INCLUDE)}"sys\types.h"\
  + 
  +NODEP_CPP_EXPLA=\
  + ".\main\os.h"\
  + ".\main\sfio.h"\

   
   "$(INTDIR)\explain.obj"  "$(INTDIR)\explain.sbr" : $(SOURCE) 
$(DEP_CPP_EXPLA)\
  @@ -679,6 +725,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
  + {$(INCLUDE)}"sys\stat.h"\
  + {$(INCLUDE)}"sys\types.h"\
  + 
  +NODEP_CPP_HTTP_=\
  + ".\main\os.h"\
  + ".\main\sfio.h"\

   
   "$(INTDIR)\http_bprintf.obj" "$(INTDIR)\http_bprintf.sbr" : $(SOURCE)\
  @@ -730,6 +782,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
  + {$(INCLUDE)}"sys\stat.h"\
  + {$(INCLUDE)}"sys\types.h"\
  + 
  +NODEP_CPP_HTTP_C=\
  + ".\main\os.h"\
  + ".\main\sfio.h"\

   
   "$(INTDIR)\http_config.obj"  "$(INTDIR)\http_config.sbr" : $(SOURCE)\
  @@ -793,6 +851,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
  + {$(INCLUDE)}"sys\stat.h"\
  

cvs commit: apachen/src/main httpd.h

1997-11-20 Thread jim
jim 97/11/19 16:42:39

  Modified:src  CHANGES
   src/main httpd.h
  Log:
  Bump up to 1.3b4-dev
  
  Revision  ChangesPath
  1.516 +2 -0  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.515
  retrieving revision 1.516
  diff -u -r1.515 -r1.516
  --- CHANGES   1997/11/16 15:43:12 1.515
  +++ CHANGES   1997/11/20 00:42:32 1.516
  @@ -1,3 +1,5 @@
  +Changes with Apache 1.3b4
  +
   Changes with Apache 1.3b3
   
 *) WIN32: Work around brain-damaged spawn calls that can't deal
  
  
  
  1.168 +2 -2  apachen/src/main/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.167
  retrieving revision 1.168
  diff -u -r1.167 -r1.168
  --- httpd.h   1997/11/20 00:37:25 1.167
  +++ httpd.h   1997/11/20 00:42:37 1.168
  @@ -348,7 +348,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
*/
   
  -#define SERVER_BASEVERSION "Apache/1.3b3"/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION "Apache/1.3b4-dev"/* SEE COMMENTS ABOVE */
   #ifdef SERVER_SUBVERSION
   #define SERVER_VERSION   SERVER_BASEVERSION " " SERVER_SUBVERSION
   #else
  @@ -359,7 +359,7 @@
   /* Numeric release version identifier: major minor bugfix betaseq
* Always increases along the same track as the source branch.
*/
  -#define APACHE_RELEASE 1030003
  +#define APACHE_RELEASE 1030004
   
   #define SERVER_PROTOCOL "HTTP/1.1"
   #ifndef SERVER_SUPPORT
  
  
  


cvs commit: apachen/src/main httpd.h

1997-11-20 Thread jim
jim 97/11/19 16:37:26

  Modified:src/main httpd.h
  Log:
  Tag the 1.3b3 Release
  
  Revision  ChangesPath
  1.167 +2 -2  apachen/src/main/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.166
  retrieving revision 1.167
  diff -u -r1.166 -r1.167
  --- httpd.h   1997/11/06 21:54:11 1.166
  +++ httpd.h   1997/11/20 00:37:25 1.167
  @@ -348,7 +348,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
*/
   
  -#define SERVER_BASEVERSION "Apache/1.3b3-dev"/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION "Apache/1.3b3"/* SEE COMMENTS ABOVE */
   #ifdef SERVER_SUBVERSION
   #define SERVER_VERSION   SERVER_BASEVERSION " " SERVER_SUBVERSION
   #else
  @@ -359,7 +359,7 @@
   /* Numeric release version identifier: major minor bugfix betaseq
* Always increases along the same track as the source branch.
*/
  -#define APACHE_RELEASE 1030002
  +#define APACHE_RELEASE 1030003
   
   #define SERVER_PROTOCOL "HTTP/1.1"
   #ifndef SERVER_SUPPORT
  
  
  


cvs commit: apachen/src/main httpd.h util.c

1997-10-26 Thread dgaudet
dgaudet 97/10/26 13:57:15

  Modified:src/main httpd.h util.c
  Log:
  eliminate some -Wshadow warnings
  
  Revision  ChangesPath
  1.165 +3 -3  apachen/src/main/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.164
  retrieving revision 1.165
  diff -u -r1.164 -r1.165
  --- httpd.h   1997/10/26 20:19:40 1.164
  +++ httpd.h   1997/10/26 21:57:13 1.165
  @@ -822,9 +822,9 @@
   /* Allocate a configfile_t handle with user defined functions and params */
   API_EXPORT(configfile_t *) pcfg_open_custom(pool *p, const char *descr,
   void *param,
  -int(*getc)(void*),
  -void *(*gets) (void *buf, size_t bufsiz, void *param),
  -int(*close)(void*));
  +int(*getc_func)(void*),
  +void *(*gets_func) (void *buf, size_t bufsiz, void *param),
  +int(*close_func)(void*));
   
   /* Read one line from open configfile_t, strip LF, increase line number */
   API_EXPORT(int) cfg_getline(char *buf, size_t bufsize, configfile_t *cfp);
  
  
  
  1.74  +2 -2  apachen/src/main/util.c
  
  Index: util.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/util.c,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- util.c1997/10/26 20:19:40 1.73
  +++ util.c1997/10/26 21:57:14 1.74
  @@ -691,7 +691,7 @@
   void *param,
   int(*getch)(void*),
   void *(*getstr) (void *buf, size_t bufsiz, void *param),
  -int(*close)(void*))
  +int(*close_func)(void*))
   {
   configfile_t *new_cfg = palloc(p, sizeof (*new_cfg));
   #ifdef DEBUG
  @@ -701,7 +701,7 @@
   new_cfg->name = descr;
   new_cfg->getch = getch;
   new_cfg->getstr = getstr;
  -new_cfg->close = close;
  +new_cfg->close = close_func;
   new_cfg->line_number = 0;
   return new_cfg;
   }
  
  
  


cvs commit: apachen/src/main httpd.h

1997-10-17 Thread jim
jim 97/10/17 06:37:29

  Modified:src  CHANGES
   src/main httpd.h
  Log:
  Tagging (APACHE_1_3b2) done; back to 1.3b3-dev
  
  Revision  ChangesPath
  1.467 +2 -0  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.466
  retrieving revision 1.467
  diff -u -r1.466 -r1.467
  --- CHANGES   1997/10/17 13:28:43 1.466
  +++ CHANGES   1997/10/17 13:37:27 1.467
  @@ -1,3 +1,5 @@
  +Changes with Apache 1.3b3
  +
   Changes with Apache 1.3b2 (there is no 1.3b1)
   
 *) TestCompile was not passing $LIBS [Dean Gaudet]
  
  
  
  1.160 +1 -1  apachen/src/main/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.159
  retrieving revision 1.160
  diff -u -r1.159 -r1.160
  --- httpd.h   1997/10/17 13:28:45 1.159
  +++ httpd.h   1997/10/17 13:37:28 1.160
  @@ -342,7 +342,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
*/
   
  -#define SERVER_BASEVERSION "Apache/1.3b2"/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION "Apache/1.3b3-dev"/* SEE COMMENTS ABOVE */
   #ifdef SERVER_SUBVERSION
   #define SERVER_VERSION   SERVER_BASEVERSION " " SERVER_SUBVERSION
   #else
  
  
  


cvs commit: apachen/src/main httpd.h

1997-10-17 Thread jim
jim 97/10/17 06:28:46

  Modified:src  CHANGES
   src/main httpd.h
  Log:
  Move back down to 1.3b2 for tagging
  
  Revision  ChangesPath
  1.466 +0 -2  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.465
  retrieving revision 1.466
  diff -u -r1.465 -r1.466
  --- CHANGES   1997/10/16 22:38:35 1.465
  +++ CHANGES   1997/10/17 13:28:43 1.466
  @@ -1,5 +1,3 @@
  -Changes with Apache 1.3b3
  -
   Changes with Apache 1.3b2 (there is no 1.3b1)
   
 *) TestCompile was not passing $LIBS [Dean Gaudet]
  
  
  
  1.159 +1 -1  apachen/src/main/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.158
  retrieving revision 1.159
  diff -u -r1.158 -r1.159
  --- httpd.h   1997/10/16 22:38:37 1.158
  +++ httpd.h   1997/10/17 13:28:45 1.159
  @@ -342,7 +342,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
*/
   
  -#define SERVER_BASEVERSION "Apache/1.3b3-dev"/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION "Apache/1.3b2"/* SEE COMMENTS ABOVE */
   #ifdef SERVER_SUBVERSION
   #define SERVER_VERSION   SERVER_BASEVERSION " " SERVER_SUBVERSION
   #else
  
  
  


cvs commit: apachen/src/main httpd.h

1997-10-16 Thread jim
jim 97/10/16 15:38:38

  Modified:src  CHANGES
   src/main httpd.h
  Log:
  And bump up to 1.3b3-dev
  
  Revision  ChangesPath
  1.465 +2 -0  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.464
  retrieving revision 1.465
  diff -u -r1.464 -r1.465
  --- CHANGES   1997/10/15 20:40:28 1.464
  +++ CHANGES   1997/10/16 22:38:35 1.465
  @@ -1,3 +1,5 @@
  +Changes with Apache 1.3b3
  +
   Changes with Apache 1.3b2 (there is no 1.3b1)
   
 *) TestCompile was not passing $LIBS [Dean Gaudet]
  
  
  
  1.158 +1 -1  apachen/src/main/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.157
  retrieving revision 1.158
  diff -u -r1.157 -r1.158
  --- httpd.h   1997/10/16 22:36:10 1.157
  +++ httpd.h   1997/10/16 22:38:37 1.158
  @@ -342,7 +342,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
*/
   
  -#define SERVER_BASEVERSION "Apache/1.3b2"/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION "Apache/1.3b3-dev"/* SEE COMMENTS ABOVE */
   #ifdef SERVER_SUBVERSION
   #define SERVER_VERSION   SERVER_BASEVERSION " " SERVER_SUBVERSION
   #else
  
  
  


cvs commit: apachen/src/main httpd.h

1997-10-16 Thread jim
jim 97/10/16 15:36:11

  Modified:src/main httpd.h
  Log:
  Roll the tarball
  
  Revision  ChangesPath
  1.157 +2 -2  apachen/src/main/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.156
  retrieving revision 1.157
  diff -u -r1.156 -r1.157
  --- httpd.h   1997/10/13 00:06:49 1.156
  +++ httpd.h   1997/10/16 22:36:10 1.157
  @@ -342,7 +342,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
*/
   
  -#define SERVER_BASEVERSION "Apache/1.3b2-dev"/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION "Apache/1.3b2"/* SEE COMMENTS ABOVE */
   #ifdef SERVER_SUBVERSION
   #define SERVER_VERSION   SERVER_BASEVERSION " " SERVER_SUBVERSION
   #else
  @@ -353,7 +353,7 @@
   /* Numeric release version identifier: major minor bugfix betaseq
* Always increases along the same track as the source branch.
*/
  -#define APACHE_RELEASE 1030001
  +#define APACHE_RELEASE 1030002
   
   #define SERVER_PROTOCOL "HTTP/1.1"
   #ifndef SERVER_SUPPORT
  
  
  


cvs commit: apachen/src/main httpd.h

1997-10-13 Thread dgaudet
dgaudet 97/10/12 17:06:51

  Modified:src/main httpd.h
  Log:
  yeah yeah yeah, btw the "how to release" docs are broken due to recent changes
  
  Revision  ChangesPath
  1.156 +1 -1  apachen/src/main/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.155
  retrieving revision 1.156
  diff -u -r1.155 -r1.156
  --- httpd.h   1997/10/08 08:46:01 1.155
  +++ httpd.h   1997/10/13 00:06:49 1.156
  @@ -342,7 +342,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
*/
   
  -#define SERVER_BASEVERSION "Apache/1.3b1"/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION "Apache/1.3b2-dev"/* SEE COMMENTS ABOVE */
   #ifdef SERVER_SUBVERSION
   #define SERVER_VERSION   SERVER_BASEVERSION " " SERVER_SUBVERSION
   #else
  
  
  


cvs commit: apachen/src/main httpd.h

1997-10-08 Thread Dean Gaudet
dgaudet 97/10/08 01:46:03

  Modified:src/main httpd.h
  Log:
  oh foo whatever I think this is right
  
  Revision  ChangesPath
  1.155 +1 -1  apachen/src/main/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.154
  retrieving revision 1.155
  diff -u -r1.154 -r1.155
  --- httpd.h   1997/10/08 08:42:55 1.154
  +++ httpd.h   1997/10/08 08:46:01 1.155
  @@ -353,7 +353,7 @@
   /* Numeric release version identifier: major minor bugfix betaseq
* Always increases along the same track as the source branch.
*/
  -#define APACHE_RELEASE 103
  +#define APACHE_RELEASE 1030001
   
   #define SERVER_PROTOCOL "HTTP/1.1"
   #ifndef SERVER_SUPPORT
  
  
  


cvs commit: apachen/src/main httpd.h

1997-10-08 Thread Dean Gaudet
dgaudet 97/10/08 01:42:57

  Modified:src/main httpd.h
  Log:
  Rolling 1.3b1.
  
  Revision  ChangesPath
  1.154 +1 -1  apachen/src/main/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.153
  retrieving revision 1.154
  diff -u -r1.153 -r1.154
  --- httpd.h   1997/10/07 20:05:02 1.153
  +++ httpd.h   1997/10/08 08:42:55 1.154
  @@ -342,7 +342,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
*/
   
  -#define SERVER_BASEVERSION "Apache/1.3b1-dev"/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION "Apache/1.3b1"/* SEE COMMENTS ABOVE */
   #ifdef SERVER_SUBVERSION
   #define SERVER_VERSION   SERVER_BASEVERSION " " SERVER_SUBVERSION
   #else
  
  
  


cvs commit: apachen/src/main httpd.h

1997-10-06 Thread Dean Gaudet
dgaudet 97/10/06 23:24:57

  Modified:src/main httpd.h
  Log:
  yet more __attribute__ goodness, let gcc lint us better
  
  Revision  ChangesPath
  1.151 +2 -1  apachen/src/main/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.150
  retrieving revision 1.151
  diff -u -r1.150 -r1.151
  --- httpd.h   1997/09/26 03:52:10 1.150
  +++ httpd.h   1997/10/07 06:24:55 1.151
  @@ -883,7 +883,8 @@
   /*
* Redefine assert() to something more useful for an Apache...
*/
  -API_EXPORT(void) log_assert(const char *szExp, const char *szFile, int 
nLine);
  +API_EXPORT(void) log_assert(const char *szExp, const char *szFile, int nLine)
  + __attribute__((noreturn));
   #define ap_assert(exp) (void)( (exp) || (log_assert(#exp, __FILE__, 
__LINE__), 0) )
   
   /* The optimized timeout code only works if we're not MULTITHREAD and we're
  
  
  


cvs commit: apachen/src/main httpd.h

1997-09-12 Thread Dean Gaudet
dgaudet 97/09/12 15:39:02

  Modified:src/main httpd.h
  Log:
  yet another #ifndef wrapper
  
  Revision  ChangesPath
  1.148 +2 -0  apachen/src/main/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.147
  retrieving revision 1.148
  diff -u -r1.147 -r1.148
  --- httpd.h   1997/09/07 15:39:48 1.147
  +++ httpd.h   1997/09/12 22:38:59 1.148
  @@ -88,7 +88,9 @@
   #endif /* DOCUMENT_LOCATION */
   
   /* Max. number of dynamically loaded modules */
  +#ifndef DYNAMIC_MODULE_LIMIT
   #define DYNAMIC_MODULE_LIMIT 64
  +#endif
   
   /* Default administrator's address */
   #define DEFAULT_ADMIN "[no address given]"
  
  
  


cvs commit: apachen/src/main httpd.h

1997-09-07 Thread Jim Jagielski
jim 97/09/07 08:39:49

  Modified:src/main httpd.h
  Log:
  Reflect the fact that we are working on 1.3b1
  
  Revision  ChangesPath
  1.147 +1 -1  apachen/src/main/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.146
  retrieving revision 1.147
  diff -u -r1.146 -r1.147
  --- httpd.h   1997/08/27 05:45:37 1.146
  +++ httpd.h   1997/09/07 15:39:48 1.147
  @@ -353,7 +353,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
*/
   
  -#define SERVER_BASEVERSION "Apache/1.3a2-dev" /* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION "Apache/1.3b1-dev" /* SEE COMMENTS ABOVE */
   #ifdef SERVER_SUBVERSION
   #define SERVER_VERSION   SERVER_BASEVERSION " " SERVER_SUBVERSION
   #else
  
  
  


cvs commit: apachen/src/main httpd.h

1997-08-25 Thread Rodent of Unusual Size
coar97/08/25 10:10:20

  Modified:src/main httpd.h
  Log:
Yerg.  Forgot to include httpd.h in my r->mtime commit.  D'oh!
  
  Pointed out by: Randy Terbush <[EMAIL PROTECTED]>
  
  Revision  ChangesPath
  1.145 +1 -0  apachen/src/main/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.144
  retrieving revision 1.145
  diff -u -r1.144 -r1.145
  --- httpd.h   1997/08/24 02:51:36 1.144
  +++ httpd.h   1997/08/25 17:10:18 1.145
  @@ -564,6 +564,7 @@
   
 int sent_bodyct;   /* byte count in stream is for body */
 long bytes_sent;   /* body byte count, for easy access */
  +  time_t mtime; /* Time the resource was last modified */
   
 /* HTTP/1.1 connection-level features */