cvs commit: apache-1.3/src/include httpd.h

[lars]

lars00/01/30 11:46:12

  Modified:src/include httpd.h
  Log:
  The path to suexec is usually set by configure, but if
  not the default should be serverroot/bin/suexec.
  
  Revision  ChangesPath
  1.303 +1 -1  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.302
  retrieving revision 1.303
  diff -u -r1.302 -r1.303
  --- httpd.h   2000/01/20 02:55:00 1.302
  +++ httpd.h   2000/01/30 19:46:11 1.303
  @@ -252,7 +252,7 @@
   
   /* The path to the suExec wrapper, can be overridden in Configuration */
   #ifndef SUEXEC_BIN
  -#define SUEXEC_BIN  HTTPD_ROOT /sbin/suexec
  +#define SUEXEC_BIN  HTTPD_ROOT /bin/suexec
   #endif
   
   /* The default string lengths */
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[coar]

coar99/08/09 10:22:13

  Modified:src/os/win32 registry.c
   src/include httpd.h
  Log:
Rolling 1.3.8..
  
  Revision  ChangesPath
  1.23  +1 -1  apache-1.3/src/os/win32/registry.c
  
  Index: registry.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- registry.c1999/07/29 22:58:30 1.22
  +++ registry.c1999/08/09 17:22:02 1.23
  @@ -38,7 +38,7 @@
   
   #define VENDOR   Apache Group
   #define SOFTWARE Apache
  -#define VERSION  1.3.8 dev
  +#define VERSION  1.3.8
   
   #define REGKEY SOFTWARE\\ VENDOR \\ SOFTWARE \\ VERSION
   
  
  
  
  1.290 +2 -2  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.289
  retrieving revision 1.290
  diff -u -r1.289 -r1.290
  --- httpd.h   1999/08/08 11:45:16 1.289
  +++ httpd.h   1999/08/09 17:22:10 1.290
  @@ -419,7 +419,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha 
*/
   
  -#define SERVER_BASEVERSION Apache/1.3.8-dev/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION Apache/1.3.8/* SEE COMMENTS ABOVE */
   #define SERVER_VERSION  SERVER_BASEVERSION
   enum server_token_type {
   SrvTk_MIN,   /* eg: Apache/1.3.0 */
  @@ -435,7 +435,7 @@
* Always increases along the same track as the source branch.
* For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'.
*/
  -#define APACHE_RELEASE 10308000
  +#define APACHE_RELEASE 10308100
   
   #define SERVER_PROTOCOL HTTP/1.1
   #ifndef SERVER_SUPPORT
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[coar]

coar99/08/09 10:46:38

  Modified:.STATUS
   src  CHANGES Configure
   src/os/win32 registry.c
   src/include httpd.h
  Log:
Update to 1.3.9-dev.
  
  Revision  ChangesPath
  1.739 +3 -8  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.738
  retrieving revision 1.739
  diff -u -r1.738 -r1.739
  --- STATUS1999/08/09 08:11:03 1.738
  +++ STATUS1999/08/09 17:46:13 1.739
  @@ -1,16 +1,11 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/08/09 08:11:03 $]
  +  Last modified at [$Date: 1999/08/09 17:46:13 $]
   
   Release:
   
  -1.3.8-dev: current.  'Quiet mode' on 6 August 1999; should we roll
  -then, or wait for internal testing first?  The
  --testers lists get the tarball as soon as it's rolled.
  -Current plan: test internally.  If no problems, roll on
  -12 August and submit to -testers lists, then release on
  -Monday 16 August 1999.  Roy wants it to happen faster.
  -Ken is RM.
  +1.3.9-dev: current.
   
  +1.3.8: Rolled on August 9.
   1.3.7: Not released.
   1.3.6. Tagged and rolled on Mar. 22. Released and announced on 24th.
   1.3.5: Not released.
  
  
  
  1.1415+2 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1414
  retrieving revision 1.1415
  diff -u -r1.1414 -r1.1415
  --- CHANGES   1999/08/09 09:41:36 1.1414
  +++ CHANGES   1999/08/09 17:46:24 1.1415
  @@ -1,3 +1,5 @@
  +Changes with Apache 1.3.9
  +
   Changes with Apache 1.3.8
   
 *) Flush the output buffer immediately after sending an error or redirect
  
  
  
  1.368 +1 -1  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.367
  retrieving revision 1.368
  diff -u -r1.367 -r1.368
  --- Configure 1999/08/09 07:38:37 1.367
  +++ Configure 1999/08/09 17:46:25 1.368
  @@ -1737,7 +1737,7 @@
#select the special subtarget for shared core generation
SUBTARGET=target_shared
#determine additional suffixes for libhttpd.so
  - V=1 R=3 P=8
  + V=1 R=3 P=9
if [ x$SHLIB_SUFFIX_DEPTH = x0 ]; then
SHLIB_SUFFIX_LIST=
fi
  
  
  
  1.24  +1 -1  apache-1.3/src/os/win32/registry.c
  
  Index: registry.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- registry.c1999/08/09 17:22:02 1.23
  +++ registry.c1999/08/09 17:46:32 1.24
  @@ -38,7 +38,7 @@
   
   #define VENDOR   Apache Group
   #define SOFTWARE Apache
  -#define VERSION  1.3.8
  +#define VERSION  1.3.9 dev
   
   #define REGKEY SOFTWARE\\ VENDOR \\ SOFTWARE \\ VERSION
   
  
  
  
  1.291 +2 -2  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.290
  retrieving revision 1.291
  diff -u -r1.290 -r1.291
  --- httpd.h   1999/08/09 17:22:10 1.290
  +++ httpd.h   1999/08/09 17:46:38 1.291
  @@ -419,7 +419,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha 
*/
   
  -#define SERVER_BASEVERSION Apache/1.3.8/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION Apache/1.3.9-dev/* SEE COMMENTS ABOVE */
   #define SERVER_VERSION  SERVER_BASEVERSION
   enum server_token_type {
   SrvTk_MIN,   /* eg: Apache/1.3.0 */
  @@ -435,7 +435,7 @@
* Always increases along the same track as the source branch.
* For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'.
*/
  -#define APACHE_RELEASE 10308100
  +#define APACHE_RELEASE 10309000
   
   #define SERVER_PROTOCOL HTTP/1.1
   #ifndef SERVER_SUPPORT
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[stoddard]

stoddard99/06/30 01:12:49

  Modified:src/include httpd.h
  Log:
  Win32: Set HARD_SERVER_LIMIT to a more reasonable value. Mulling over the 
idea of moving it to ap_config. Maybe change the name to PROCESS_LIMIT and add 
a new one, THREAD_LIMIT?
  
  Revision  ChangesPath
  1.284 +1 -1  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.283
  retrieving revision 1.284
  diff -u -r1.283 -r1.284
  --- httpd.h   1999/06/22 15:22:14 1.283
  +++ httpd.h   1999/06/30 08:12:48 1.284
  @@ -307,7 +307,7 @@
*/
   #ifndef HARD_SERVER_LIMIT
   #ifdef WIN32
  -#define HARD_SERVER_LIMIT 1500
  +#define HARD_SERVER_LIMIT 1024
   #else
   #define HARD_SERVER_LIMIT 256
   #endif
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[rse]

rse 99/06/02 00:08:19

  Modified:src/include httpd.h
  Log:
  Fix recent commit of an ap_regerror() function.  Hmmm... we should force
  us all to compile with egcc -Wall before something is comitted...
  
  Revision  ChangesPath
  1.279 +2 -0  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.278
  retrieving revision 1.279
  diff -u -r1.278 -r1.279
  --- httpd.h   1999/05/21 17:10:40 1.278
  +++ httpd.h   1999/06/02 07:08:18 1.279
  @@ -974,6 +974,8 @@
   
   API_EXPORT(int)ap_regexec(const regex_t *preg, const char *string,
 size_t nmatch, regmatch_t pmatch[], int 
eflags);
  +API_EXPORT(size_t) ap_regerror(int errcode, const regex_t *preg, 
  +   char *errbuf, size_t errbuf_size);
   API_EXPORT(char *) ap_pregsub(pool *p, const char *input, const char *source,
 size_t nmatch, regmatch_t pmatch[]);
   
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[stoddard]

stoddard99/05/21 10:10:41

  Modified:src/include httpd.h
  Log:
  Bump HARD_SERVER_LIMIT to 1500 for WIN32 only
  PR: 3815
  
  Revision  ChangesPath
  1.278 +4 -0  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.277
  retrieving revision 1.278
  diff -u -r1.277 -r1.278
  --- httpd.h   1999/05/21 12:16:17 1.277
  +++ httpd.h   1999/05/21 17:10:40 1.278
  @@ -306,7 +306,11 @@
* the overhead.
*/
   #ifndef HARD_SERVER_LIMIT
  +#ifdef WIN32
  +#define HARD_SERVER_LIMIT 1500
  +#else
   #define HARD_SERVER_LIMIT 256
  +#endif
   #endif
   
   /*
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[pcs]

pcs 99/02/05 01:14:57

  Modified:src/include httpd.h
  Log:
  On most platforms, the default name of the error and access logs is the
  same as the values on the ErrorLog and CustomerLog lines in the
  distributed httpd.conf file. For example, on OS/2 the logs are defined as
  error.log and access.log. But on Windows, they are still error_log and
  access_log in the program.  This doesn't match the default as documented
  or as given in the distributed httpd.conf.
  
  Reviewed by:  Brian Behlendorf
  
  Revision  ChangesPath
  1.266 +2 -4  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.265
  retrieving revision 1.266
  diff -u -r1.265 -r1.266
  --- httpd.h   1999/01/27 12:16:00 1.265
  +++ httpd.h   1999/02/05 09:14:56 1.266
  @@ -151,8 +151,7 @@
   
   /* The name of the log files */
   #ifndef DEFAULT_XFERLOG
  -#ifdef OS2
  -/* Set default for OS/2 file system */
  +#if defined(OS2) || defined(WIN32)
   #define DEFAULT_XFERLOG logs/access.log
   #else
   #define DEFAULT_XFERLOG logs/access_log
  @@ -160,8 +159,7 @@
   #endif /* DEFAULT_XFERLOG */
   
   #ifndef DEFAULT_ERRORLOG
  -#ifdef OS2
  -/* Set default for OS/2 file system */
  +#if defined(OS2) || defined(WIN32)
   #define DEFAULT_ERRORLOG logs/error.log
   #else
   #define DEFAULT_ERRORLOG logs/error_log
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[fielding]

fielding99/01/03 05:35:33

  Modified:.STATUS
   src  CHANGES
   src/include httpd.h
  Log:
  Change the ap_assert macro to a variant that works on all platforms.
  
  PR: 2575
  Submitted by: Richard Prinz [EMAIL PROTECTED]
  Reviewed by:  Roy Fielding, Dirk-Willem van Gulik
  
  Revision  ChangesPath
  1.585 +1 -5  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.584
  retrieving revision 1.585
  diff -u -r1.584 -r1.585
  --- STATUS1999/01/02 13:30:20 1.584
  +++ STATUS1999/01/03 13:35:29 1.585
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/01/02 13:30:20 $]
  +  Last modified at [$Date: 1999/01/03 13:35:29 $]
   
   Release:
   
  @@ -123,10 +123,6 @@
   * Ronald Tschalär's ap_uuencode() bugfix
   Message-ID: PR#3411
   Status: Lars +1 (on concept)
  -
  -* PR#2575 problem with ap_assert macro
  -Message-ID: [EMAIL PROTECTED]
  -Status: 
   
   * Michael van Elst's patch [PR#3160] to improve mod_rewrite's
 in-core cache handling by using a hash table.
  
  
  
  1.1198+3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1197
  retrieving revision 1.1198
  diff -u -r1.1197 -r1.1198
  --- CHANGES   1999/01/03 13:09:46 1.1197
  +++ CHANGES   1999/01/03 13:35:30 1.1198
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.4
   
  +  *) Change the ap_assert macro to a variant that works on all platforms.
  + [Richard Prinz [EMAIL PROTECTED]] PR#2575
  +
 *) In order to prevent some errant library code from setting an alarm
on one request and having it affect some later connection, force the
alarm to be cleared before each connection even if Apache's own
  
  
  
  1.257 +1 -1  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.256
  retrieving revision 1.257
  diff -u -r1.256 -r1.257
  --- httpd.h   1999/01/01 19:04:41 1.256
  +++ httpd.h   1999/01/03 13:35:32 1.257
  @@ -1080,7 +1080,7 @@
*/
   API_EXPORT(void) ap_log_assert(const char *szExp, const char *szFile, int 
nLine)
__attribute__((noreturn));
  -#define ap_assert(exp) (void)( (exp) || (ap_log_assert(#exp, __FILE__, 
__LINE__), 0) )
  +#define ap_assert(exp) ((exp) ? (void)0 : 
ap_log_assert(#exp,__FILE__,__LINE__))
   
   /* The optimized timeout code only works if we're not MULTITHREAD and we're
* also not using a scoreboard file
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[rse]

rse 98/09/21 12:12:18

  Modified:src/include httpd.h
  Log:
  Jump to release version 1.3.2
  
  Revision  ChangesPath
  1.243 +2 -2  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.242
  retrieving revision 1.243
  diff -u -r1.242 -r1.243
  --- httpd.h   1998/09/17 20:39:24 1.242
  +++ httpd.h   1998/09/21 19:12:17 1.243
  @@ -410,7 +410,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha 
*/
   
  -#define SERVER_BASEVERSION Apache/1.3.2-dev/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION Apache/1.3.2/* SEE COMMENTS ABOVE */
   #define SERVER_VERSION  SERVER_BASEVERSION
   enum server_token_type {
   SrvTk_MIN,   /* eg: Apache/1.3.0 */
  @@ -427,7 +427,7 @@
* For a final release, 'betaseq' should be set to '99'.
* For example, Apache 1.4.2 should be '1040299'
*/
  -#define APACHE_RELEASE 1030201
  +#define APACHE_RELEASE 1030299
   
   #define SERVER_PROTOCOL HTTP/1.1
   #ifndef SERVER_SUPPORT
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[martin]

martin  98/09/17 13:39:27

  Modified:src/include httpd.h
  Log:
  Oops: I inadvertently dropped Dean's const hostname change of Rev. 1.239
  
  Revision  ChangesPath
  1.242 +1 -1  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.241
  retrieving revision 1.242
  diff -u -r1.241 -r1.242
  --- httpd.h   1998/09/17 20:23:42 1.241
  +++ httpd.h   1998/09/17 20:39:24 1.242
  @@ -989,7 +989,7 @@
   #endif /* _OSD_POSIX */
   
   char *ap_get_local_host(pool *);
  -unsigned long ap_get_virthost_addr(const char *hostname, unsigned short 
*port);
  +unsigned long ap_get_virthost_addr(char *hostname, unsigned short *port);
   
   extern API_VAR_EXPORT time_t ap_restart_time;
   
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[fielding]

fielding98/08/09 21:23:03

  Modified:src/include httpd.h
  Log:
  Use 8190 as the limit since it is more efficient, and explain
  why that is the case.
  
  Revision  ChangesPath
  1.234 +5 -2  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.233
  retrieving revision 1.234
  diff -u -r1.233 -r1.234
  --- httpd.h   1998/08/10 04:16:13 1.233
  +++ httpd.h   1998/08/10 04:23:02 1.234
  @@ -376,15 +376,18 @@
* might require large values, but most servers could get by with much
* smaller limits than we use below.  The request message body size can
* be limited by the per-dir config directive LimitRequestBody.
  + *
  + * Internal buffer sizes are two bytes more than the AP_LIMIT_REQUEST_LINE
  + * and AP_LIMIT_REQUEST_FIELDSIZE below, which explains the 8190.
*/
   #ifndef AP_LIMIT_REQUEST_LINE
  -#define AP_LIMIT_REQUEST_LINE 8192
  +#define AP_LIMIT_REQUEST_LINE 8190
   #endif /* default limit on bytes in Request-Line (Method+URI+HTTP-version) */
   #ifndef AP_LIMIT_REQUEST_FIELDS
   #define AP_LIMIT_REQUEST_FIELDS 100
   #endif /* default limit on number of request header fields */
   #ifndef AP_LIMIT_REQUEST_FIELDSIZE
  -#define AP_LIMIT_REQUEST_FIELDSIZE 8192
  +#define AP_LIMIT_REQUEST_FIELDSIZE 8190
   #endif /* default limit on bytes in any one header field  */
   
   /*
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[jim]

jim 98/06/06 18:22:37

  Modified:src/include httpd.h
  Log:
  Formalise in the comments the use of betaseq
  
  Revision  ChangesPath
  1.222 +2 -0  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.221
  retrieving revision 1.222
  diff -u -r1.221 -r1.222
  --- httpd.h   1998/06/02 11:24:38 1.221
  +++ httpd.h   1998/06/07 01:22:36 1.222
  @@ -396,6 +396,8 @@
   
   /* Numeric release version identifier: major minor bugfix betaseq
* Always increases along the same track as the source branch.
  + * For a final release, 'betaseq' should be set to '99'.
  + * For example, Apache 1.4.2 should be '1040299'
*/
   #define APACHE_RELEASE 1030101
   
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[martin]

martin  98/05/04 10:19:57

  Modified:src/include httpd.h
  Log:
  Prototypes for the BS2000 security patch (Forgot to commit this)
  
  Revision  ChangesPath
  1.209 +5 -0  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.208
  retrieving revision 1.209
  diff -u -u -r1.208 -r1.209
  --- httpd.h   1998/05/03 17:31:09 1.208
  +++ httpd.h   1998/05/04 17:19:54 1.209
  @@ -947,6 +947,11 @@
   API_EXPORT(char *) ap_os_canonical_filename(pool *p, const char *file);
   #endif
   
  +#ifdef _OSD_POSIX
  +extern const char *os_set_authfile(pool *p, const char *filename);
  +extern int os_init_job_environment(server_rec *s, const char *user_name);
  +#endif /* _OSD_POSIX */
  +
   char *ap_get_local_host(pool *);
   unsigned long ap_get_virthost_addr(const char *hostname, unsigned short 
*port);
   
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[jim]

jim 98/04/15 17:15:35

  Modified:src/include httpd.h
  Log:
  ready to tag
  
  Revision  ChangesPath
  1.204 +1 -1  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.203
  retrieving revision 1.204
  diff -u -r1.203 -r1.204
  --- httpd.h   1998/04/13 18:05:09 1.203
  +++ httpd.h   1998/04/16 00:15:34 1.204
  @@ -362,7 +362,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha 
*/
   
  -#define SERVER_BASEVERSION Apache/1.3b6-dev/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION Apache/1.3b6/* SEE COMMENTS ABOVE */
   #ifdef SERVER_SUBVERSION
   #define SERVER_VERSION   SERVER_BASEVERSION   SERVER_SUBVERSION
   #else
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[dgaudet]

dgaudet 98/03/16 00:53:30

  Modified:src/main http_protocol.c
   src/include httpd.h
  Log:
  draft-ietf-http-v11-spec-rev-03.txt, section 3.6:
  
  A server which receives an entity-body with a transfer-coding it does
  not understand SHOULD return 501 (Unimplemented), and close the
  connection.
  
  Revision  ChangesPath
  1.198 +1 -1  apache-1.3/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
  retrieving revision 1.197
  retrieving revision 1.198
  diff -u -r1.197 -r1.198
  --- http_protocol.c   1998/03/14 00:03:38 1.197
  +++ http_protocol.c   1998/03/16 08:53:26 1.198
  @@ -1323,7 +1323,7 @@
   if (strcasecmp(tenc, chunked)) {
   aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r-server,
   Unknown Transfer-Encoding %s, tenc);
  -return HTTP_BAD_REQUEST;
  +return HTTP_NOT_IMPLEMENTED;
   }
   if (r-read_body == REQUEST_CHUNKED_ERROR) {
   aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r-server,
  
  
  
  1.198 +2 -1  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.197
  retrieving revision 1.198
  diff -u -r1.197 -r1.198
  --- httpd.h   1998/03/12 10:28:55 1.197
  +++ httpd.h   1998/03/16 08:53:29 1.198
  @@ -460,7 +460,8 @@
   ((x) == HTTP_REQUEST_ENTITY_TOO_LARGE) 
|| \
   ((x) == HTTP_REQUEST_URI_TOO_LARGE) || \
   ((x) == HTTP_INTERNAL_SERVER_ERROR) || \
  -((x) == HTTP_SERVICE_UNAVAILABLE))
  +((x) == HTTP_SERVICE_UNAVAILABLE) || \
  + ((x) == HTTP_NOT_IMPLEMENTED))
   
   
   #define METHODS 8
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[marc]

marc98/03/11 11:11:10

  Modified:src/include httpd.h
  Log:
  Use HTTPD_ROOT instead of /usr/local/apache; the intent is obviously to
  default to having them all below HTTPD_ROOT, so we may as well just do that.
  
  PR: 1894
  Submitted by:   Jason Riedy [EMAIL PROTECTED], Marc Slemko
  
  Revision  ChangesPath
  1.196 +7 -5  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.195
  retrieving revision 1.196
  diff -u -r1.195 -r1.196
  --- httpd.h   1998/03/09 22:42:56 1.195
  +++ httpd.h   1998/03/11 19:11:09 1.196
  @@ -67,7 +67,7 @@
   
   /* - config dir -- */
   
  -/* Define this to be the default server home dir. Anything later in this
  +/* Define this to be the default server home dir. Most things later in this
* file with a relative pathname will have this added.
*/
   #ifndef HTTPD_ROOT
  @@ -82,13 +82,15 @@
   #endif
   #endif /* HTTPD_ROOT */
   
  -/* Root of server */
  +/* Default location of documents.  Can be overridden by the DocumentRoot
  + * directive.
  + */
   #ifndef DOCUMENT_LOCATION
   #ifdef __EMX__
   /* Set default for OS/2 file system */
  -#define DOCUMENT_LOCATION /os2httpd/docs
  +#define DOCUMENT_LOCATION  HTTPD_ROOT /docs
   #else
  -#define DOCUMENT_LOCATION /usr/local/apache/htdocs
  +#define DOCUMENT_LOCATION  HTTPD_ROOT /htdocs
   #endif
   #endif /* DOCUMENT_LOCATION */
   
  @@ -233,7 +235,7 @@
   
   /* The path to the suExec wrapper, can be overridden in Configuration */
   #ifndef SUEXEC_BIN
  -#define SUEXEC_BIN /usr/local/apache/sbin/suexec
  +#define SUEXEC_BIN  HTTPD_ROOT /sbin/suexec
   #endif
   
   /* The default string lengths */
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[dgaudet]

dgaudet 98/03/07 13:39:30

  Modified:src/main util_uri.c
   src/include httpd.h
  Log:
  Don't use strtoul.  And defend against similar slipups in the future... I
  know that define in httpd.h may annoy module authors...
  
  Revision  ChangesPath
  1.8   +4 -2  apache-1.3/src/main/util_uri.c
  
  Index: util_uri.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/util_uri.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- util_uri.c1998/03/03 08:17:21 1.7
  +++ util_uri.c1998/03/07 21:39:28 1.8
  @@ -520,9 +520,11 @@
uptr-port_str = pstrndup (p, uptr-hostinfo+match[7].rm_so, 
match[7].rm_eo - match[7].rm_so);
if (uptr-port_str[0] != '\0') {
char *endstr;
  + int port;
   
  - uptr-port = strtoul(uptr-port_str, endstr, 10);
  - if (*endstr != '\0') {
  + port = strtol(uptr-port_str, endstr, 10);
  + uptr-port = port;
  + if (*endstr != '\0' || uptr-port != port) {
/* Invalid characters after ':' found */
return HTTP_BAD_REQUEST;
}
  
  
  
  1.194 +6 -0  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.193
  retrieving revision 1.194
  diff -u -r1.193 -r1.194
  --- httpd.h   1998/03/06 07:50:58 1.193
  +++ httpd.h   1998/03/07 21:39:30 1.194
  @@ -979,4 +979,10 @@
   
   API_EXPORT(extern const char *) psignature(const char *prefix, request_rec 
*r);
   
  +/* strtoul does not exist on sunos4. */
  +#ifdef strtoul
  +#undef strtoul
  +#endif
  +#define strtoul strtoul_is_not_a_portable_function_use_strtol_instead
  +
   #endif   /* !APACHE_HTTPD_H */
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[dgaudet]

dgaudet 98/02/18 00:39:22

  Modified:src/include httpd.h
  Log:
  another comment that was sitting in my mailbox
  
  Revision  ChangesPath
  1.187 +21 -0 apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.186
  retrieving revision 1.187
  diff -u -r1.186 -r1.187
  --- httpd.h   1998/02/14 01:02:09 1.186
  +++ httpd.h   1998/02/18 08:39:21 1.187
  @@ -578,6 +578,27 @@
   
   char *method;/* GET, HEAD, POST, etc. */
   int method_number;   /* M_GET, M_POST, etc. */
  +
  +/*
  + allowed is a bitvector of the allowed methods.
  +
  + A handler must ensure that the request method is one that
  + it is capable of handling.  Generally modules should DECLINE
  + any request methods they do not handle.  Prior to aborting the
  + handler like this the handler should set r-allowed to the list
  + of methods that it is willing to handle.  This bitvector is used
  + to construct the Allow: header required for OPTIONS requests,
  + and METHOD_NOT_ALLOWED and NOT_IMPLEMENTED status codes.
  +
  + Since the default_handler deals with OPTIONS, all modules can
  + usually decline to deal with OPTIONS.  TRACE is always allowed,
  + modules don't need to set it explicitly.
  +
  + Since the default_handler will always handle a GET, a
  + module which does *not* implement GET should probably return
  + METHOD_NOT_ALLOWED.  Unfortunately this means that a Script GET
  + handler can't be installed by mod_actions.
  +*/
   int allowed; /* Allowed methods - for 405, OPTIONS, etc */
   
   int sent_bodyct; /* byte count in stream is for body */
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[jim]

jim 98/02/13 17:02:10

  Modified:src  CHANGES
   src/include httpd.h
  Log:
  And bump up to 1.3b6-dev
  
  Revision  ChangesPath
  1.627 +2 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.626
  retrieving revision 1.627
  diff -u -r1.626 -r1.627
  --- CHANGES   1998/02/12 01:09:41 1.626
  +++ CHANGES   1998/02/14 01:02:05 1.627
  @@ -1,3 +1,5 @@
  +Changes with Apache 1.3b6
  +
   Changes with Apache 1.3b5
   
 *) Preserve the content encoding given by the AddEncoding directive
  
  
  
  1.186 +2 -2  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.185
  retrieving revision 1.186
  diff -u -r1.185 -r1.186
  --- httpd.h   1998/02/14 00:58:57 1.185
  +++ httpd.h   1998/02/14 01:02:09 1.186
  @@ -356,7 +356,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha 
*/
   
  -#define SERVER_BASEVERSION Apache/1.3b5/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION Apache/1.3b6-dev/* SEE COMMENTS ABOVE */
   #ifdef SERVER_SUBVERSION
   #define SERVER_VERSION   SERVER_BASEVERSION   SERVER_SUBVERSION
   #else
  @@ -367,7 +367,7 @@
   /* Numeric release version identifier: major minor bugfix betaseq
* Always increases along the same track as the source branch.
*/
  -#define APACHE_RELEASE 1030005
  +#define APACHE_RELEASE 1030006
   
   #define SERVER_PROTOCOL HTTP/1.1
   #ifndef SERVER_SUPPORT
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[jim]

jim 98/02/09 05:25:43

  Modified:.STATUS
   src  CHANGES
   src/include httpd.h
  Log:
  Get up to date... Note that 1.3b4 was never released;
  that we are now in 1.3b5 and that a code freeze is in effect
  
  Revision  ChangesPath
  1.147 +3 -2  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.146
  retrieving revision 1.147
  diff -u -r1.146 -r1.147
  --- STATUS1998/02/07 15:48:08 1.146
  +++ STATUS1998/02/09 13:25:38 1.147
  @@ -4,13 +4,14 @@
   
   2.0  : In pre-alpha development
see: http://www.arctic.org/~dgaudet/apache/2.0/process-model
  -1.3b4: In development, maybe a release early Feb 98? Jim is RM
  +1.3b5: In development, a release is planned for the week of 2/9/98
  +1.3b4: Internal version... not tagged or released.
   1.3b3: Released and announced
   1.3b1: There is no 1.3b1
   
   Current Modes:
   
  -* CODE FREEZE in effect for 1.3b4.  NO COMMITS!
  +* CODE FREEZE in effect for 1.3b5.  NO COMMITS!
   o Commit-Then-Review (see http://dev.apache.org/guidelines.html#ctr
   
   Plan:
  
  
  
  1.625 +3 -1  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.624
  retrieving revision 1.625
  diff -u -r1.624 -r1.625
  --- CHANGES   1998/02/09 01:09:37 1.624
  +++ CHANGES   1998/02/09 13:25:40 1.625
  @@ -1,4 +1,4 @@
  -Changes with Apache 1.3b4
  +Changes with Apache 1.3b5
   
 *) WIN32: Append a '.' to extensionless executables in spawn[lv]e*
replacements, which makes them work.
  @@ -6,6 +6,8 @@
   
 *) Sort out problems with canonical filename handling happening too late.
[Dean Gaudet, Ben Laurie]
  +
  +Changes with Apache 1.3b4
   
 *) The module structure was modified to include a *dynamic_load_handle
in the STANDARD_MODULE_STUFF portion, and the MODULE_MAGIC_NUMBER
  
  
  
  1.184 +2 -2  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.183
  retrieving revision 1.184
  diff -u -r1.183 -r1.184
  --- httpd.h   1998/02/08 20:46:18 1.183
  +++ httpd.h   1998/02/09 13:25:42 1.184
  @@ -356,7 +356,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha 
*/
   
  -#define SERVER_BASEVERSION Apache/1.3b4-dev/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION Apache/1.3b5-dev/* SEE COMMENTS ABOVE */
   #ifdef SERVER_SUBVERSION
   #define SERVER_VERSION   SERVER_BASEVERSION   SERVER_SUBVERSION
   #else
  @@ -367,7 +367,7 @@
   /* Numeric release version identifier: major minor bugfix betaseq
* Always increases along the same track as the source branch.
*/
  -#define APACHE_RELEASE 1030004
  +#define APACHE_RELEASE 1030005
   
   #define SERVER_PROTOCOL HTTP/1.1
   #ifndef SERVER_SUPPORT
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[jim]

jim 98/02/08 07:06:56

  Modified:src  CHANGES
   src/include httpd.h
  Log:
  And bump up to 1.3b5-dev
  
  Revision  ChangesPath
  1.620 +2 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.619
  retrieving revision 1.620
  diff -u -r1.619 -r1.620
  --- CHANGES   1998/02/07 21:23:28 1.619
  +++ CHANGES   1998/02/08 15:06:53 1.620
  @@ -1,3 +1,5 @@
  +Changes with Apache 1.3b5
  +
   Changes with Apache 1.3b4
   
 *) The module structure was modified to include a *dynamic_load_handle
  
  
  
  1.182 +2 -2  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.181
  retrieving revision 1.182
  diff -u -r1.181 -r1.182
  --- httpd.h   1998/02/08 15:03:34 1.181
  +++ httpd.h   1998/02/08 15:06:55 1.182
  @@ -356,7 +356,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha 
*/
   
  -#define SERVER_BASEVERSION Apache/1.3b4/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION Apache/1.3b5-dev/* SEE COMMENTS ABOVE */
   #ifdef SERVER_SUBVERSION
   #define SERVER_VERSION   SERVER_BASEVERSION   SERVER_SUBVERSION
   #else
  @@ -367,7 +367,7 @@
   /* Numeric release version identifier: major minor bugfix betaseq
* Always increases along the same track as the source branch.
*/
  -#define APACHE_RELEASE 1030004
  +#define APACHE_RELEASE 1030005
   
   #define SERVER_PROTOCOL HTTP/1.1
   #ifndef SERVER_SUPPORT
  
  
  

cvs commit: apache-1.3/src/include httpd.h

[jim]

jim 98/02/08 12:46:20

  Modified:src/include httpd.h
  Log:
  Bring back down to 1.3b4-dev
  
  Revision  ChangesPath
  1.183 +2 -2  apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.182
  retrieving revision 1.183
  diff -u -r1.182 -r1.183
  --- httpd.h   1998/02/08 15:06:55 1.182
  +++ httpd.h   1998/02/08 20:46:18 1.183
  @@ -356,7 +356,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha 
*/
   
  -#define SERVER_BASEVERSION Apache/1.3b5-dev/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION Apache/1.3b4-dev/* SEE COMMENTS ABOVE */
   #ifdef SERVER_SUBVERSION
   #define SERVER_VERSION   SERVER_BASEVERSION   SERVER_SUBVERSION
   #else
  @@ -367,7 +367,7 @@
   /* Numeric release version identifier: major minor bugfix betaseq
* Always increases along the same track as the source branch.
*/
  -#define APACHE_RELEASE 1030005
  +#define APACHE_RELEASE 1030004
   
   #define SERVER_PROTOCOL HTTP/1.1
   #ifndef SERVER_SUPPORT