cvs commit: apache-apr/pthreads/src/modules/standard mod_cgi.c mod_mime_magic.c

[manoj]

manoj   99/06/03 16:46:28

  Modified:pthreads/src CHANGES
   pthreads/src/include buff.h http_main.h
   pthreads/src/main buff.c http_main.c http_protocol.c
util_script.c
   pthreads/src/modules/proxy proxy_cache.c proxy_ftp.c
proxy_http.c proxy_util.c
   pthreads/src/modules/standard mod_cgi.c mod_mime_magic.c
  Log:
  Replace the existing timeout-setting mechanism. Now, instead of passing
  a timeout interval to every buff call, we set the timeout value for each
  buff once using bsetopt().
  
  Revision  ChangesPath
  1.7   +4 -7  apache-apr/pthreads/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/CHANGES,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- CHANGES   1999/04/12 15:06:23 1.6
  +++ CHANGES   1999/06/03 23:46:19 1.7
  @@ -1,4 +1,8 @@
   Changes with Apache apr
  +  *) New buff option added: BO_TIMEOUT. It describes the timeout for
  + buff operations (generally over a network). [Dean Gaudet, Ryan
  + Bloom, Manoj Kasichainula]
  +
 *) Created http_accept abstraction. Added 4 new functions (not exported):
init_accept(), begin_accepting_requests(), get_request(), 
stop_accepting_requests() [Bill Stoddard [EMAIL PROTECTED]
  @@ -8,13 +12,6 @@
   
 *) user and ap_auth_type fields were moved from connection_rec to 
request_rec. [Ryan Bloom [EMAIL PROTECTED] 
  -
  -  *) Argument added to ap_bgets, ap_bwrite, buff_read, buff_write, saferead,
  - read_with_errors, write_it_all, write_with_errors, bcwrite.  This 
argument
  - is the seconds argument, if zero the call blocks and trys to read or 
write
  - the data until an error occurs, or until it is successful.  If non-zero,
  - the call reads or writes for n seconds, or until it is successful. [Ryan
  - Bloom [EMAIL PROTECTED]
   
 *) Sendwithtimeout and recvwithtimeout calls added to non-Windows 
platforms.
This brings the code path closer together for all platforms. [Ryan Bloom
  
  
  
  1.5   +3 -2  apache-apr/pthreads/src/include/buff.h
  
  Index: buff.h
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/include/buff.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -u -r1.4 -r1.5
  --- buff.h1999/04/09 04:10:35 1.4
  +++ buff.h1999/06/03 23:46:21 1.5
  @@ -120,6 +120,7 @@
   #ifdef WIN32
   HANDLE hFH;  /* Windows filehandle */
   #endif
  +time_t timeout;  /* timeout for B_SOCKET operations */
   
   /* transport handle, for RPC binding handle or some such */
   void *t_handle;
  @@ -165,10 +166,10 @@
   
   /* I/O */
   API_EXPORT(int) ap_bread(BUFF *fb, void *buf, int nbyte);
  -API_EXPORT(int) ap_bgets(char *s, int n, BUFF *fb, time_t sec);
  +API_EXPORT(int) ap_bgets(char *s, int n, BUFF *fb);
   API_EXPORT(int) ap_blookc(char *buff, BUFF *fb);
   API_EXPORT(int) ap_bskiplf(BUFF *fb);
  -API_EXPORT(int) ap_bwrite(BUFF *fb, const void *buf, int nbyte, time_t sec);
  +API_EXPORT(int) ap_bwrite(BUFF *fb, const void *buf, int nbyte);
   API_EXPORT(int) ap_bflush(BUFF *fb);
   API_EXPORT(int) ap_bputs(const char *x, BUFF *fb);
   API_EXPORT(int) ap_bvputs(BUFF *fb,...);
  
  
  
  1.7   +0 -1  apache-apr/pthreads/src/include/http_main.h
  
  Index: http_main.h
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/include/http_main.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- http_main.h   1999/05/24 02:10:25 1.6
  +++ http_main.h   1999/06/03 23:46:21 1.7
  @@ -120,7 +120,6 @@
   void ap_start_shutdown(void);
   void ap_start_restart(int);
   void ap_keepalive_timeout(char *, request_rec *);
  -int ap_get_timeout(request_rec *r);
   
   API_EXPORT(void) ap_child_terminate(request_rec *r);
   int ap_update_child_status(int child_num, int thread_num, int status, 
request_rec *r);
  
  
  
  1.11  +48 -39apache-apr/pthreads/src/main/buff.c
  
  Index: buff.c
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/main/buff.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -u -r1.10 -r1.11
  --- buff.c1999/06/03 23:37:44 1.10
  +++ buff.c1999/06/03 23:46:22 1.11
  @@ -236,10 +236,11 @@
   fb->outcnt = 0;
   fb->outchunk = -1;
   fb->error = NULL;
  -fb->bytes_sent = 0L;
  +fb->bytes_sent = 0;
   
   fb->fd = -1;
   fb->fd_in = -1;
  +fb->timeout = -1;
   
   #ifdef B_SFIO
   fb->sf_in = NULL;
  @@ -264,29 +265,37 @@
   
   API_EXPORT(int) ap_bsetopt(BUFF *fb, int optname, const void *optval)
   {
  -if (optna

cvs commit: apache-apr/pthreads/src/main buff.c

[manoj]

manoj   99/06/03 16:37:45

  Modified:pthreads/src/main buff.c
  Log:
  Now, {send,recv}withtimeout can handle both non-blocking I/O (timeout =
  0), and fully blocking I/O (timeout = -1). This makes these routines
  look more like the APR functions.
  
  Revision  ChangesPath
  1.10  +6 -6  apache-apr/pthreads/src/main/buff.c
  
  Index: buff.c
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/main/buff.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -u -r1.9 -r1.10
  --- buff.c1999/06/01 21:36:03 1.9
  +++ buff.c1999/06/03 23:37:44 1.10
  @@ -126,18 +126,18 @@
   int err = EAGAIN;
   int rv;
   
  -tv.tv_sec = sec;
  -if (tv.tv_sec == 0) {
  +if (sec == -1) {
   return (write(sock, buf, len));
   }
   ap_bnonblock(sock);
   rv = write(sock, buf, len);
   
  -if (rv == -1) {
  +if (rv == -1 && sec != 0) {
   err = errno;
if (err == EAGAIN || errno == EINTR) {
FD_ZERO(&fdset);
FD_SET(sock, &fdset);
  +tv.tv_sec = sec;
tv.tv_usec = 0;
   do {
rv = select(FD_SETSIZE, NULL, &fdset, NULL, &tv);
  @@ -161,17 +161,17 @@
   int err = EAGAIN;
   int rv;
   
  -tv.tv_sec = sec;
  -if (tv.tv_sec == 0) {
  +if (sec == -1) {
return (read(sock, buf, len));
   }
   ap_bnonblock(sock);
   rv = read(sock, buf, len);
  -if (rv == -1) {
  +if (rv == -1 && sec != 0) {
err = errno;
if (err == EAGAIN || errno == EINTR) {
FD_ZERO(&fdset);
FD_SET(sock, &fdset);
  +tv.tv_sec = sec;
tv.tv_usec = 0;
do {
   rv = select(FD_SETSIZE, &fdset, NULL, NULL, &tv);
  
  
  

cvs commit: apache-1.3 STATUS

[coar]

coar99/06/03 15:25:16

  Modified:.STATUS
  Log:
Add another patch to the list of those available.
  
  Revision  ChangesPath
  1.694 +7 -1  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.693
  retrieving revision 1.694
  diff -u -r1.693 -r1.694
  --- STATUS1999/06/03 19:31:19 1.693
  +++ STATUS1999/06/03 22:25:08 1.694
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/06/03 19:31:19 $]
  +  Last modified at [$Date: 1999/06/03 22:25:08 $]
   
   Release:
   
  @@ -92,6 +92,12 @@
   
   
   Available Patches:
  +
  +* Ken's patch to work around exact matches of content-types (PR#4524)
  +  (Long-term fix should involve breaking this [and other fields with
  +  parameters] into pieces.)
  + Message-ID: <[EMAIL PROTECTED]>
  + Status: Ken +1
   
   * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth.
 (PR#2598)
  
  
  

cvs commit: apache-apr/include apr_errno.h apr_file_io.h apr_general.h

[rbb]

rbb 99/06/03 12:44:04

  Modified:apr/include apr_win.h
   apr/lib  lib.def
   apr/test testfile.c
   include  apr_errno.h apr_file_io.h apr_general.h
  Added:   apr/file_io/win32 dir.c file_io.def file_io.dsp fileacc.c
filedup.c fileio.h filestat.c open.c pipe.c
readdir.c readdir.h readwrite.c seek.c
   apr/test testfile.dsp
  Log:
  First pass at Windows File_io stuff.  This should be enought to build and run 
the testfile
  program.  I'll check this though, and commit anything else that is needed.
  
  Revision  ChangesPath
  1.1  apache-apr/apr/file_io/win32/dir.c
  
  Index: dir.c
  ===
  /* 
   * Copyright (c) 1999 The Apache Group.  All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *notice, this list of conditions and the following disclaimer. 
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *notice, this list of conditions and the following disclaimer in
   *the documentation and/or other materials provided with the
   *distribution.
   *
   * 3. All advertising materials mentioning features or use of this
   *software must display the following acknowledgment:
   *"This product includes software developed by the Apache Group
   *for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * 4. The names "Apache Server" and "Apache Group" must not be used to
   *endorse or promote products derived from this software without
   *prior written permission. For written permission, please contact
   *[EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called "Apache"
   *nor may "Apache" appear in their names without prior written
   *permission of the Apache Group.
   *
   * 6. Redistributions of any form whatsoever must retain the following
   *acknowledgment:
   *"This product includes software developed by the Apache Group
   *for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
   * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
   * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
   * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
   * OF THE POSSIBILITY OF SUCH DAMAGE.
   * 
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Group.
   * For more information on the Apache Group and the Apache HTTP server
   * project, please see .
   *
   */
  #ifdef HAVE_ERRNO_H
  #include 
  #endif
  #ifdef HAVE_STRING_H
  #include 
  #endif
  #ifdef HAVE_DIRENT_H
  #include 
  #endif
  #ifdef HAVE_SYS_STAT_H
  #include 
  #endif
  #ifdef WIN32
  #include "apr_win.h"
  #include 
  #endif
  #include "fileio.h"
  #include "apr_file_io.h"
  #include "apr_lib.h"
  
  ap_status_t dir_cleanup(void *thedir)
  {
  struct dir_t *dir = thedir;
  if (CloseHandle(dir->dirhand) == 0) {
  return APR_SUCCESS;
  }
  else {
  return errno;
  }
  } 
  
  ap_status_t ap_opendir(ap_context_t *cont, const char *dirname, struct dir_t 
**new)
  {
char * temp;
(*new) = ap_palloc(cont, sizeof(struct dir_t));
  (*new)->cntxt = cont;
(*new)->entry = NULL;
  temp = canonical_filename((*new)->cntxt, dirname);
  if (temp[strlen(temp)] == '/') {
(*new)->dirname = ap_pstrcat(cont, dirname, "*", NULL);
}
else {
  (*new)->dirname = ap_pstrcat(cont, dirname, "/*", NULL);
}
(*new)->dirhand = INVALID_HANDLE_VALUE;
ap_register_cleanup((*new)->cntxt, (void *)(*new), dir_cleanup, NULL);
  return APR_SUCCESS;
  }
  
  ap_status_t ap_closedir(struct dir_t *thedir)
  {
if (FindClose(thedir->dirhand)) {
ap_kill_cleanup(thedir->cntxt, thedir, dir_cleanup);
return APR_SUCCESS;
}
return APR_EEXIST;
  }
  
  ap

cvs commit: apache-1.3 STATUS

[manoj]

manoj   99/06/03 12:31:20

  Modified:.STATUS
  Log:
  
  
  Revision  ChangesPath
  1.693 +7 -1  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.692
  retrieving revision 1.693
  diff -u -u -r1.692 -r1.693
  --- STATUS1999/05/25 10:23:14 1.692
  +++ STATUS1999/06/03 19:31:19 1.693
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/05/25 10:23:14 $]
  +  Last modified at [$Date: 1999/06/03 19:31:19 $]
   
   Release:
   
  @@ -63,6 +63,12 @@
   
   
   RELEASE SHOWSTOPPERS:
  +
  +- general/4431: mod_rewrite and mod_auth_dbm won't compile on Red
  +  Hat 6.0, and possibly other systems using glibc 2.1. The dbm
  +  libraries are detected, but the ndbm include file was moved to
  +  /usr/include/db1
  +  Status: Ralf is looking at it
   
   
   RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
  
  
  

cvs commit: apache-apr/apr/file_io/win32 - New directory

[rbb]

rbb 99/06/03 12:16:33

  apache-apr/apr/file_io/win32 - New directory

cvs commit: apache-1.3/src/support log_server_status

[coar]

coar99/06/03 10:38:25

  Modified:src/support log_server_status
  Log:
Change to use four digits for the year.
  
  PR:   4523
  Submitted by: Simon Burr <[EMAIL PROTECTED]>
  Reviewed by:  Ken Coar
  
  Revision  ChangesPath
  1.11  +2 -2  apache-1.3/src/support/log_server_status
  
  Index: log_server_status
  ===
  RCS file: /home/cvs/apache-1.3/src/support/log_server_status,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- log_server_status 1999/01/01 19:05:34 1.10
  +++ log_server_status 1999/06/03 17:38:24 1.11
  @@ -67,7 +67,7 @@
   #
   require 'sys/socket.ph';
   
  -$wherelog = "/var/log/graph/";  # Logs will be like "/var/log/graph/960312"
  +$wherelog = "/var/log/graph/";  # Logs will be like "/var/log/graph/19960312"
   $server = "localhost";  # Name of server, could be "www.foo.com"
   $port = "80";   # Port on server
   $request = "/status/?auto"; # Request to send
  @@ -93,7 +93,7 @@
   ### Main
   
   {
  - $date=`date +%y%m%d:%H%M%S`;
  + $date=`date +%Y%m%d:%H%M%S`;
chop($date);
($day,$time)=split(/:/,$date);
$res=&tcp_connect($server,$port);
  
  
  

cvs commit: apache-1.3/src/support htpasswd.1 htpasswd.c

[coar]

coar99/06/03 08:42:39

  Modified:src  CHANGES
   src/support htpasswd.1 htpasswd.c
  Log:
Document the length restrictions on the username and password for
src/support/htpasswd.  Also gritch about illegal characters in
the username (':' is the field separator).
  
  Revision  ChangesPath
  1.1367+5 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1366
  retrieving revision 1.1367
  diff -u -r1.1366 -r1.1367
  --- CHANGES   1999/06/02 20:11:16 1.1366
  +++ CHANGES   1999/06/03 15:42:33 1.1367
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3.7
   
  +  *) When the username or password fed to htpasswd is too long, include the
  + size limit in the error message.  Also report illegal characters
  + (currently only ':') in the username.  Add the size restrictions
  + to the man page.  [Ken Coar]
  +
 *) Fixed the configure --without-support option so it doesn't result in
an infinite loop.  [Marc Slemko]
   
  
  
  
  1.11  +7 -4  apache-1.3/src/support/htpasswd.1
  
  Index: htpasswd.1
  ===
  RCS file: /home/cvs/apache-1.3/src/support/htpasswd.1,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- htpasswd.11999/04/10 15:08:45 1.10
  +++ htpasswd.11999/06/03 15:42:38 1.11
  @@ -141,8 +141,9 @@
   returns 1 if it encounters some problem accessing files, 2 if there
   was a syntax problem with the command line, 3 if the password was
   entered interactively and the verification entry didn't match, 4 if
  -its operation was interrupted, and 5 if a value is too long (username,
  -filename, password, or final computed record).
  +its operation was interrupted, 5 if a value is too long (username,
  +filename, password, or final computed record), and 6 if the username
  +contains illegal characters (see the \fBRESTRICTIONS\fP section).
   .SH EXAMPLES
   \fBhtpasswd /usr/local/etc/apache/.htpasswd-users jsmith\fP
   .IP
  @@ -180,12 +181,14 @@
   .SH RESTRICTIONS
   On the Windows and MPE platforms, passwords encrypted with
   .B htpasswd
  -are limited to no more than 80 characters in length.  Longer
  -passwords will be truncated to 80 characters.
  +are limited to no more than 255 characters in length.  Longer
  +passwords will be truncated to 255 characters.
   .PP
   The MD5 algorithm used by
   .B htpasswd
   is specific to the Apache software; passwords encrypted using it will not be
   usable with other Web servers.
  +.PP
  +Usernames are limited to 255 bytes and may not include the character ':'.
   .SH SEE ALSO
   .BR httpd(8)
  
  
  
  1.31  +15 -62apache-1.3/src/support/htpasswd.c
  
  Index: htpasswd.c
  ===
  RCS file: /home/cvs/apache-1.3/src/support/htpasswd.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- htpasswd.c1999/05/31 19:44:30 1.30
  +++ htpasswd.c1999/06/03 15:42:38 1.31
  @@ -75,6 +75,7 @@
*  4: Failure; operation interrupted (such as with CTRL/C)
*  5: Failure; buffer would overflow (username, filename, or computed
* record too long)
  + *  6: Failure; username contains illegal or reserved characters
*/
   
   #include "ap_config.h"
  @@ -107,6 +108,7 @@
   #define ERR_PWMISMATCH 3
   #define ERR_INTERRUPTED 4
   #define ERR_OVERFLOW 5
  +#define ERR_BADUSER 6
   
   /*
* This needs to be declared statically so the signal handler can
  @@ -160,64 +162,7 @@
   }
   }
   
  -#ifdef MPE
   /*
  - * MPE lacks getpass() and a way to suppress stdin echo.  So for now, just
  - * issue the prompt and read the results with echo.  (Ugh).
  - */
  -
  -static char *getpass(const char *prompt)
  -{
  -static char password[81];
  -
  -fputs(prompt, stderr);
  -gets((char *) &password);
  -
  -if (strlen((char *) &password) > 80) {
  - password[80] = '\0';
  -}
  -
  -return (char *) &password;
  -}
  -
  -#endif
  -
  -#ifdef WIN32
  -/*
  - * Windows lacks getpass().  So we'll re-implement it here.
  - */
  -
  -static char *getpass(const char *prompt)
  -{
  -static char password[81];
  -int n = 0;
  -
  -fputs(prompt, stderr);
  -
  -while ((password[n] = _getch()) != '\r') {
  -if (password[n] >= ' ' && password[n] <= '~') {
  -n++;
  -printf("*");
  -}
  - else {
  -printf("\n");
  -fputs(prompt, stderr);
  -n = 0;
  -}
  -}
  - 
  -password[n] = '\0';
  -printf("\n");
  -
  -if (n > 80) {
  -password[80] = '\0';
  -}
  -
  -return (char *) &password;
  -}
  -#endif
  -
  -/*
* Make a password record from the g

cvs commit: apache-1.3/src/lib/expat-lite xmltok.h

[gstein]

gstein  99/06/03 03:35:27

  Modified:src/lib/expat-lite xmltok.h
  Log:
  put the (void) in the existing prototype, rather than add a new one.
  (pointed out by James Clark)
  
  Revision  ChangesPath
  1.4   +1 -2  apache-1.3/src/lib/expat-lite/xmltok.h
  
  Index: xmltok.h
  ===
  RCS file: /home/cvs/apache-1.3/src/lib/expat-lite/xmltok.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- xmltok.h  1999/06/02 13:06:28 1.3
  +++ xmltok.h  1999/06/03 10:35:27 1.4
  @@ -275,9 +275,8 @@
   const ENCODING XMLTOKAPI *XmlGetUtf16InternalEncoding(void);
   int XMLTOKAPI XmlUtf8Encode(int charNumber, char *buf);
   int XMLTOKAPI XmlUtf16Encode(int charNumber, unsigned short *buf);
  -int XmlSizeOfUnknownEncoding(void);
   
  -int XMLTOKAPI XmlSizeOfUnknownEncoding();
  +int XMLTOKAPI XmlSizeOfUnknownEncoding(void);
   ENCODING XMLTOKAPI *
   XmlInitUnknownEncoding(void *mem,
   int *table,