cvs commit: apache-1.3/src/helpers fp2rp

[Ralf S. Engelschall]

rse 98/03/19 23:23:42

  Modified:src/helpers fp2rp
  Log:
  Make this script a little bit faster and fix a bug which could
  cause problems in the future when perhaps deeper subdirs exist.
  
  Submitted by: Martin Kraemer
  
  Revision  ChangesPath
  1.3   +2 -2  apache-1.3/src/helpers/fp2rp
  
  Index: fp2rp
  ===
  RCS file: /export/home/cvs/apache-1.3/src/helpers/fp2rp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- fp2rp 1998/03/17 16:15:58 1.2
  +++ fp2rp 1998/03/20 07:23:42 1.3
  @@ -6,8 +6,8 @@
   rp="."
   else
   rp=""
  -for pe in `echo $1 | sed -e 's:/: :'`; do
  - rp="../$rp"
  +for pe in `IFS="$IFS/"; echo $1`; do
  +rp="../$rp"
   done
   fi
   echo $rp | sed -e 's:/$::'
  
  
  

cvs commit: apache-1.3/src CHANGES

[Ralf S. Engelschall]

rse 98/03/19 23:29:51

  Modified:.STATUS
   src  CHANGES
  Log:
  Munich/Germany: snow is falling again...
  
  Revision  ChangesPath
  1.198 +2 -0  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.197
  retrieving revision 1.198
  diff -u -r1.197 -r1.198
  --- STATUS1998/03/19 10:05:37 1.197
  +++ STATUS1998/03/20 07:29:48 1.198
  @@ -97,6 +97,8 @@
   * Ken's change HIDE default to "yes", always include hide.h
   * Ralf's major Configure cleanup
   * Ralf's additional manual pages for the support programs
  +* Ben Hyde's Configure check for unknown command switch
  +* Martin's fix for src/helpers/fp2rp
   
   Available Patches:
   
  
  
  
  1.724 +3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.723
  retrieving revision 1.724
  diff -u -r1.723 -r1.724
  --- CHANGES   1998/03/19 20:02:01 1.723
  +++ CHANGES   1998/03/20 07:29:49 1.724
  @@ -1,4 +1,7 @@
   Changes with Apache 1.3b6
  +
  +  *) Fix a bug in the src/helpers/fp2rp script and make it a little bit
  + faster [Martin Kraemer]
 
 *) Make Configure die when you give it an unknown command switch.
[Ben Hyde]
  
  
  

cvs commit: apache-1.3/src/modules/proxy mod_proxy.c proxy_ftp.c proxy_http.c

[Ralf S. Engelschall]

rse 98/03/19 23:56:57

  Modified:.STATUS
   htdocs/manual new_features_1_3.html
   htdocs/manual/mod mod_proxy.html
   src  CHANGES
   src/modules/proxy mod_proxy.c proxy_ftp.c proxy_http.c
  Log:
  Reanimation of an undocumented feature of mod_proxy:
  ProxyReceiveBufferSize
  
  Submitted by: Ralf S. Engelschall
  PR#: 1348
  
  Revision  ChangesPath
  1.199 +1 -0  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.198
  retrieving revision 1.199
  diff -u -r1.198 -r1.199
  --- STATUS1998/03/20 07:29:48 1.198
  +++ STATUS1998/03/20 07:56:47 1.199
  @@ -99,6 +99,7 @@
   * Ralf's additional manual pages for the support programs
   * Ben Hyde's Configure check for unknown command switch
   * Martin's fix for src/helpers/fp2rp
  +* Ralf's reanimation of an undocumented directive: ProxyReceiveBufferSize
   
   Available Patches:
   
  
  
  
  1.50  +2 -2  apache-1.3/htdocs/manual/new_features_1_3.html
  
  Index: new_features_1_3.html
  ===
  RCS file: /export/home/cvs/apache-1.3/htdocs/manual/new_features_1_3.html,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- new_features_1_3.html 1998/03/10 01:35:52 1.49
  +++ new_features_1_3.html 1998/03/20 07:56:48 1.50
  @@ -281,8 +281,8 @@
   The critical path for static requests has fewer system calls.  This
generally helps all requests.  (45 syscalls for a static request
in 1.2 versus 22 in 1.3 in a well tuned configuration).
  -ReceiveBufferSize
  +ProxyReceiveBufferSize
directive gives mod_proxy's outgoing connections
larger network buffers, for increased throughput.
   The low level I/O routines use writev (where available)
  
  
  
  1.37  +46 -0 apache-1.3/htdocs/manual/mod/mod_proxy.html
  
  Index: mod_proxy.html
  ===
  RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_proxy.html,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- mod_proxy.html1998/03/04 08:53:52 1.36
  +++ mod_proxy.html1998/03/20 07:56:49 1.37
  @@ -45,6 +45,7 @@
   ProxyPass
   ProxyPassReverse
   ProxyBlock
  +ProxyReceiveBufferSize
   NoProxy
   ProxyDomain
   CacheRoot
  @@ -318,6 +319,51 @@
   
   
   blocks connections to all sites.
  +
  +
  +
  +ProxyReceiveBufferSize
  +Syntax: ProxyReceiveBufferSize 

  +Default: None
  +Context: server config, virtual host
  +Override: Not applicable
  +Status: Base
  +Module: mod_proxy
  +Compatibility: ProxyReceiveBufferSize is only 
available in
  +Apache 1.3 and later.
  +
  +The ProxyReceiveBufferSize directive specifies an explicit network buffer 
size
  +for outgoing HTTP and FTP connections, for increased throughput.  It has to 
be
  +greater then 512 or set to 0 to indicate that the systems default buffer size
  +should be used. 
  +
  +
  +Example:
  +
  +
  +  ProxyReceiveBufferSize 2048
  +
   
   
   
  
  
  
  1.725 +6 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.724
  retrieving revision 1.725
  diff -u -r1.724 -r1.725
  --- CHANGES   1998/03/20 07:29:49 1.724
  +++ CHANGES   1998/03/20 07:56:51 1.725
  @@ -1,5 +1,11 @@
   Changes with Apache 1.3b6
   
  +  *) Reanimated the (still undocumented) proxy receive buffer size directive:
  + Renamed from ReceiveBufferSize to ProxyReceiveBufferSize because the old
  + name was really too generic, added documentation for this directive to
  + the mod_proxy.html and corrected the hyperlink to it in the
  + new_features_1.3.html document.  [Ralf S. Engelschall, PR#1348]
  +
 *) Fix a bug in the src/helpers/fp2rp script and make it a little bit
faster [Martin Kraemer]
 
  
  
  
  1.47  +5 -5  apache-1.3/src/modules/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/mod_proxy.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- mod_proxy.c   1998/03/13 19:20:23 1.46
  +++ mod_proxy.c   1998/03/20 07:56:54 1.47
  @@ -728,7 +728,7 @@
   get_module_config(parms->server->module_config, &proxy_module);
   int s = atoi(arg);
   if (s < 512 && s != 0) {
  - return "ReceiveBufferSize must be >= 512 bytes, or 0 for system 
default.";
  + return "ProxyReceiveBufferSize must be >= 512 bytes, or 0 for system 
default.";
   }
   
   psf->recv_buffer_size =

cvs commit: apache-1.3/src/modules/proxy proxy_ftp.c

[Ralf S. Engelschall]

rse 98/03/20 01:11:15

  Modified:.STATUS
   src  CHANGES
   src/modules/proxy proxy_ftp.c
  Log:
  The proxy module now uses the already determined response of
  the FTP SITE command to provide a Content-Length header for FTP requests.
  
  Submitted by: Ralf S. Engelschall
  PR#: 1183
  
  Revision  ChangesPath
  1.200 +2 -1  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.199
  retrieving revision 1.200
  diff -u -r1.199 -r1.200
  --- STATUS1998/03/20 07:56:47 1.199
  +++ STATUS1998/03/20 09:11:06 1.200
  @@ -99,7 +99,8 @@
   * Ralf's additional manual pages for the support programs
   * Ben Hyde's Configure check for unknown command switch
   * Martin's fix for src/helpers/fp2rp
  -* Ralf's reanimation of an undocumented directive: ProxyReceiveBufferSize
  +* Ralf's reanim. of (undocumented) directive: ProxyReceiveBufferSize, 
PR#1348
  +* Ralf's mod_proxy fix to use FTP SIZE response for Content-Length, 
PR#1183
   
   Available Patches:
   
  
  
  
  1.726 +4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.725
  retrieving revision 1.726
  diff -u -r1.725 -r1.726
  --- CHANGES   1998/03/20 07:56:51 1.725
  +++ CHANGES   1998/03/20 09:11:12 1.726
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3b6
   
  +  *) Now mod_proxy uses the reponse string (in addition to the response 
status
  + code) from the already used FTP SIZE command to setup the Content-Length
  + header if available. [Ralf S. Engelschall, PR#1183]
  +
 *) Reanimated the (still undocumented) proxy receive buffer size directive:
Renamed from ReceiveBufferSize to ProxyReceiveBufferSize because the old
name was really too generic, added documentation for this directive to
  
  
  
  1.52  +59 -2 apache-1.3/src/modules/proxy/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_ftp.c,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- proxy_ftp.c   1998/03/20 07:56:55 1.51
  +++ proxy_ftp.c   1998/03/20 09:11:14 1.52
  @@ -213,6 +213,47 @@
   return status;
   }
   
  +/*
  + * Like ftp_getrc but returns both the ftp status code and 
  + * remembers the response message in the supplied buffer
  + */
  +static int ftp_getrc_msg(BUFF *f, char *msgbuf, int msglen)
  +{
  +int len, status;
  +char linebuff[100], buff[5];
  +char *mb = msgbuf;
  +int ml = msglen;
  +
  +len = bgets(linebuff, 100, f);
  +if (len == -1)
  + return -1;
  +if (len < 5 || !isdigit(linebuff[0]) || !isdigit(linebuff[1]) ||
  + !isdigit(linebuff[2]) || (linebuff[3] != ' ' && linebuff[3] != '-'))
  + status = 0;
  +else
  + status = 100 * linebuff[0] + 10 * linebuff[1] + linebuff[2] - 111 * '0';
  +
  +mb = ap_cpystrn(mb, linebuff+4, len-4 < ml ? len-4 : ml);
  +
  +if (linebuff[len - 1] != '\n')
  + (void)bskiplf(f);
  +
  +if (linebuff[3] == '-') {
  + memcpy(buff, linebuff, 3);
  + buff[3] = ' ';
  + do {
  + len = bgets(linebuff, 100, f);
  + if (len == -1)
  + return -1;
  + if (linebuff[len - 1] != '\n') {
  + (void)bskiplf(f);
  + }
  +mb = ap_cpystrn(mb, linebuff+4, len-4 < ml ? len-4 : ml);
  + } while (memcmp(linebuff, buff, 4) != 0);
  +}
  +return status;
  +}
  +
   static long int send_dir(BUFF *f, request_rec *r, BUFF *f2, struct cache_req 
*c, char *url)
   {
   char buf[IOBUFSIZE];
  @@ -441,11 +482,20 @@
   char pasv[64];
   char *pstr;
   
  +/* stuff for responses */
  +char *resp;
  +int resplen;
  +char *size = NULL;
  +
   /* we only support GET and HEAD */
   
   if (r->method_number != M_GET)
return NOT_IMPLEMENTED;
   
  +/* allocate a buffer for the response message */
  + resplen = MAX_STRING_LEN;
  + resp = (char *)palloc(r->pool, resplen);
  +
   /* We break the URL into host, port, path-search */
   
   host = pstrdup(p, url + 6);
  @@ -833,8 +883,8 @@
bputs(CRLF, f);
bflush(f);
Explain1("FTP: SIZE %s", path);
  - i = ftp_getrc(f);
  - Explain1("FTP: returned status %d", i);
  + i = ftp_getrc_msg(f, resp, resplen);
  + Explain2("FTP: returned status %d with response %s", i, resp);
if (i != 500) { /* Size command not recognized */
if (i == 550) { /* Not a regular file */
Explain0("FTP: SIZE shows this is a directory");
  @@ -861,6 +911,9 @@
path = "";
  

cvs commit: apache-1.3/src CHANGES

[Ralf S. Engelschall]

rse 98/03/20 01:27:41

  Modified:src  CHANGES
  Log:
  typo
  
  Revision  ChangesPath
  1.727 +1 -1  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.726
  retrieving revision 1.727
  diff -u -r1.726 -r1.727
  --- CHANGES   1998/03/20 09:11:12 1.726
  +++ CHANGES   1998/03/20 09:27:39 1.727
  @@ -1,6 +1,6 @@
   Changes with Apache 1.3b6
   
  -  *) Now mod_proxy uses the reponse string (in addition to the response 
status
  +  *) Now mod_proxy uses the response string (in addition to the response 
status
code) from the already used FTP SIZE command to setup the Content-Length
header if available. [Ralf S. Engelschall, PR#1183]
   
  
  
  

cvs commit: apache-1.3/src/modules/standard mod_auth_db.c

[Ralf S. Engelschall]

rse 98/03/20 01:42:46

  Modified:htdocs/manual/mod mod_auth_db.html
   src/modules/standard mod_auth_db.c
  Log:
  Added hints to the source and documentation what version is needed
  and where to find that version on the net.
  
  PR#: 1423
  
  Revision  ChangesPath
  1.14  +10 -0 apache-1.3/htdocs/manual/mod/mod_auth_db.html
  
  Index: mod_auth_db.html
  ===
  RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_auth_db.html,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_auth_db.html  1998/02/05 22:33:55 1.13
  +++ mod_auth_db.html  1998/03/20 09:42:44 1.14
  @@ -21,6 +21,16 @@
   files for those systems which support DB and not DBM. It is only
   available in Apache 1.1 and later.
   
  +
  +On some BSD systems (e.g. FreeBSD and NetBSD) dbm is automatically mapped to
  +Berkeley DB. You can use either mod_auth_dbm
  +or mod_auth_db. The latter makes it more obvious that it's Berkeley DB.  On
  +other platforms where you want to use the DB library you usually have to
  +install it first. See http://www.sleepycat.com/";>http://www.sleepycat.com/ for the
  +distribution. The interface this module uses is the one from DB version 1.85
  +and 1.86, but DB version 2.x can also be used when compatibility mode is
  +enabled.
   
   
   AuthDBGroupFile
  
  
  
  1.28  +5 -0  apache-1.3/src/modules/standard/mod_auth_db.c
  
  Index: mod_auth_db.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth_db.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_auth_db.c 1998/03/13 19:20:30 1.27
  +++ mod_auth_db.c 1998/03/20 09:42:46 1.28
  @@ -73,6 +73,11 @@
* On some BSD systems (e.g. FreeBSD and NetBSD) dbm is automatically
* mapped to Berkeley DB. You can use either mod_auth_dbm or
* mod_auth_db. The latter makes it more obvious that it's Berkeley.
  + * On other platforms where you want to use the DB library you
  + * usually have to install it first. See http://www.sleepycat.com/
  + * for the distribution. The interface this module uses is the
  + * one from DB version 1.85 and 1.86, but DB version 2.x
  + * can also be used when compatibility mode is enabled.
*
* dirkx - Added Authoritative control to allow passing on to lower  
* modules if and only if the user-id is not known to this
  
  
  

cvs commit: apache-1.3/htdocs/manual/mod directives.html

[Ralf S. Engelschall]

rse 98/03/20 02:35:27

  Modified:htdocs/manual/mod directives.html
  Log:
  Add missing hyperlinks.
  
  PR#: 1963
  
  Revision  ChangesPath
  1.40  +4 -0  apache-1.3/htdocs/manual/mod/directives.html
  
  Index: directives.html
  ===
  RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/directives.html,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- directives.html   1998/02/04 21:40:04 1.39
  +++ directives.html   1998/03/20 10:35:27 1.40
  @@ -128,6 +128,7 @@
   
   LockFile
   LogFormat
  +LogLevel
   MaxClients
   MaxKeepAliveRequests
   MaxRequestsPerChild
  @@ -145,6 +146,8 @@
   Port
   ProxyBlock
   ProxyPass
  +ProxyPassReverse
  +ProxyReceiveBufferSize
   ProxyRemote
   ProxyRequests
   ReadmeName
  @@ -159,6 +162,7 @@
   RewriteBase
   RewriteCond
   RewriteEngine
  +RewriteLock
   RewriteLog
   RewriteLogLevel
   RewriteMap
  
  
  

cvs commit: apache-1.3/htdocs/manual/mod directives.html

[Ralf S. Engelschall]

rse 98/03/20 03:08:27

  Modified:htdocs/manual/mod directives.html
  Log:
  One more missing hyperlink.
  
  Revision  ChangesPath
  1.41  +1 -0  apache-1.3/htdocs/manual/mod/directives.html
  
  Index: directives.html
  ===
  RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/directives.html,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- directives.html   1998/03/20 10:35:27 1.40
  +++ directives.html   1998/03/20 11:08:26 1.41
  @@ -134,6 +134,7 @@
   MaxRequestsPerChild
   MaxSpareServers
   MetaDir
  +MetaFiles
   MetaSuffix
   MimeMagicFile
   MinSpareServers
  
  
  

cvs commit: apache-1.3/htdocs/manual/mod mod_rewrite.html mod_proxy.html

[martin]

martin  98/03/20 03:11:05

  Modified:htdocs/manual/mod mod_rewrite.html mod_proxy.html
  Log:
  Typo
  
  Revision  ChangesPath
  1.28  +3 -3  apache-1.3/htdocs/manual/mod/mod_rewrite.html
  
  Index: mod_rewrite.html
  ===
  RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_rewrite.html,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -u -r1.27 -r1.28
  --- mod_rewrite.html  1998/03/10 13:37:27 1.27
  +++ mod_rewrite.html  1998/03/20 11:11:03 1.28
  @@ -1017,12 +1017,12 @@
   'CondPattern' (is lexicographically greater)
   Treats the CondPattern as a plain string and compares it
   lexicographically to TestString and results in a true expression if
  -TestString is lexicographically greater then CondPattern.
  +TestString is lexicographically greater than CondPattern.
   
   '=CondPattern' (is lexicographically equal)
   Treats the CondPattern as a plain string and compares it
  @@ -1042,7 +1042,7 @@
   
   '-s' (is regular file with size)
   Treats the TestString as a pathname and
  -tests if it exists and is a regular file with size greater then zero.
  +tests if it exists and is a regular file with size greater than zero.
   
   '-l' (is symbolic link)
   Treats the TestString as a pathname and
  
  
  
  1.38  +1 -1  apache-1.3/htdocs/manual/mod/mod_proxy.html
  
  Index: mod_proxy.html
  ===
  RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_proxy.html,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -u -r1.37 -r1.38
  --- mod_proxy.html1998/03/20 07:56:49 1.37
  +++ mod_proxy.html1998/03/20 11:11:04 1.38
  @@ -355,7 +355,7 @@
   
   The ProxyReceiveBufferSize directive specifies an explicit network buffer 
size
   for outgoing HTTP and FTP connections, for increased throughput.  It has to 
be
  -greater then 512 or set to 0 to indicate that the systems default buffer size
  +greater than 512 or set to 0 to indicate that the system's default buffer 
size
   should be used. 
   
   
  
  
  

cvs commit: apache-1.3/src/modules/proxy proxy_ftp.c

[Ralf S. Engelschall]

rse 98/03/20 03:17:14

  Modified:src/modules/proxy proxy_ftp.c
  Log:
  As per request from Martin we should not create the Content-Length in the
  situation where one uses the ";type=a" feature (forced ASCII mode) because of
  newline translations.
  
  Revision  ChangesPath
  1.53  +1 -1  apache-1.3/src/modules/proxy/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_ftp.c,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- proxy_ftp.c   1998/03/20 09:11:14 1.52
  +++ proxy_ftp.c   1998/03/20 11:17:14 1.53
  @@ -989,7 +989,7 @@
else {
proxy_add_header(resp_hdrs, "Content-Type", "text/plain", HDR_REP);
}
  - if (size != NULL) {
  + if (parms[0] != 'a' && size != NULL) {
proxy_add_header(resp_hdrs, "Content-Length", size, HDR_REP);
Explain1("FTP: Content-Length set to %s", size);
}
  
  
  

cvs commit: apache-1.3/src/main http_config.c

[martin]

martin  98/03/20 03:24:40

  Modified:src/main http_config.c
  Log:
  When configuration errors are detected (i.e., srm_command_loop returns
  an error string), the errno variable is useless. Don't print invalid
  errno messages at this level.
  
  Revision  ChangesPath
  1.110 +1 -1  apache-1.3/src/main/http_config.c
  
  Index: http_config.c
  ===
  RCS file: /home/cvs/apache-1.3/src/main/http_config.c,v
  retrieving revision 1.109
  retrieving revision 1.110
  diff -u -u -r1.109 -r1.110
  --- http_config.c 1998/03/17 08:20:56 1.109
  +++ http_config.c 1998/03/20 11:24:39 1.110
  @@ -1163,7 +1163,7 @@
cfg_closefile(f);
   
if (errmsg) {
  -aplog_error(APLOG_MARK, APLOG_ALERT, r->server, "%s: %s",
  + aplog_error(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, r->server, "%s: 
%s",
   filename, errmsg);
   return HTTP_INTERNAL_SERVER_ERROR;
}
  
  
  

cvs commit: apache-1.3/src/support suexec.c

[martin]

martin  98/03/20 03:33:02

  Modified:src/support suexec.c
  Log:
  Add the same conditions for initgroups() existance as we use in apache's 
conf.h;
  Add case insensitivity for BS2000's user name comparison (yes, that's how it 
is);
  Add an error message if the executable isn't executable.
  
  Revision  ChangesPath
  1.36  +18 -1 apache-1.3/src/support/suexec.c
  
  Index: suexec.c
  ===
  RCS file: /home/cvs/apache-1.3/src/support/suexec.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -u -r1.35 -r1.36
  --- suexec.c  1998/03/19 09:56:43 1.35
  +++ suexec.c  1998/03/20 11:33:00 1.36
  @@ -94,7 +94,7 @@
***
*/
   
  -#if defined(QNX)
  +#if defined(QNX) || defined(_OSD_POSIX) || defined(MPE) || defined(SCO) || 
defined(BEOS)
   int initgroups(const char *name, gid_t basegid)
   {
   /* QNX and MPE do not appear to support supplementary groups. */
  @@ -284,10 +284,18 @@
* is the user allowed to do so as defined in
* suexec.h.  If not the allowed user, error out.
*/
  +#ifdef _OSD_POSIX
  +/* User name comparisons are case insensitive on BS2000/OSD */
  +if (strcasecmp(HTTPD_USER, pw->pw_name)) {
  + log_err("user mismatch (%s)\n", pw->pw_name);
  + exit(103);
  +}
  +#else  /*_OSD_POSIX*/
   if (strcmp(HTTPD_USER, pw->pw_name)) {
log_err("user mismatch (%s)\n", pw->pw_name);
exit(103);
   }
  +#endif /*_OSD_POSIX*/
   
   /*
* Check for a leading '/' (absolute path) in the command to be executed,
  @@ -477,6 +485,15 @@
dir_info.st_uid, dir_info.st_gid,
prg_info.st_uid, prg_info.st_gid);
exit(120);
  +}
  +/*
  + * Error out if the program is not executable for the user.
  + * Otherwise, she won't find any error in the logs except for
  + * "[error] Premature end of script headers: ..."
  + */
  +if (!(prg_info.st_mode & S_IXUSR)) {
  + log_err("file has no execute permission: (%s/%s)\n", cwd, cmd);
  + exit(121);
   }
   
   clean_env();
  
  
  

cvs commit: apache-1.3/conf srm.conf-dist-win

[marc]

marc98/03/20 07:48:31

  Modified:conf srm.conf-dist-win
  Log:
  Don't do "UserDir public_html" so don't confuse people by using
  that as the default.
  
  Revision  ChangesPath
  1.9   +6 -2  apache-1.3/conf/srm.conf-dist-win
  
  Index: srm.conf-dist-win
  ===
  RCS file: /export/home/cvs/apache-1.3/conf/srm.conf-dist-win,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- srm.conf-dist-win 1998/03/14 19:02:20 1.8
  +++ srm.conf-dist-win 1998/03/20 15:48:31 1.9
  @@ -20,8 +20,12 @@
   
   # UserDir: The name of the directory which is appended onto a user's home
   # directory if a ~user request is recieved.
  -
  -UserDir public_html
  +#
  +# Under Win32, we do not currently try to determine the home directory of
  +# a Windows login, so one of the forms such as the below needs to be
  +# used.  See the manual for details.
  +#
  +#UserDir "/@@ServerRoot@@/users/"
   
   # DirectoryIndex: Name of the file or files to use as a pre-written HTML
   # directory index.  Separate multiple entries with spaces.
  
  
  

cvs commit: apache-1.2/src Configure

[marc]

marc98/03/20 10:25:31

  Modified:src  Configure
  Log:
  OpenBSD doesn't use -ldbm.
  
  Submitted by: Bob Beck <[EMAIL PROTECTED]>
  
  Revision  ChangesPath
  1.99  +1 -0  apache-1.2/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache-1.2/src/Configure,v
  retrieving revision 1.98
  retrieving revision 1.99
  diff -u -r1.98 -r1.99
  --- Configure 1998/02/14 13:41:59 1.98
  +++ Configure 1998/03/20 18:25:28 1.99
  @@ -334,6 +334,7 @@
;;
   *-openbsd*)
OS='OpenBSD'
  + DBM_LIB=""
;;
   *-next-nextstep*)
OS='NeXT'
  
  
  

cvs commit: apache-1.3/src Configure

[marc]

marc98/03/20 10:29:49

  Modified:src  Configure
  Log:
  OpenBSD doesn't need -ldbm.
  
  Submitted by: Bob Beck <[EMAIL PROTECTED]>
  
  Revision  ChangesPath
  1.216 +1 -0  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.215
  retrieving revision 1.216
  diff -u -r1.215 -r1.216
  --- Configure 1998/03/19 20:02:03 1.215
  +++ Configure 1998/03/20 18:29:48 1.216
  @@ -425,6 +425,7 @@
;;
   *-openbsd*)
OS='OpenBSD'
  + DBM_LIB=""
;;
   *-next-nextstep*)
OS='NeXT'