cvs commit: apache-2.0/src/lib/apr/file_io/win32 dir.c

2000-01-11 Thread stoddard
stoddard00/01/11 15:23:51

  Modified:src/lib/apr/file_io/win32 dir.c
  Log:
  What kinda coding style is this?
  
  Revision  ChangesPath
  1.9   +68 -68apache-2.0/src/lib/apr/file_io/win32/dir.c
  
  Index: dir.c
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/dir.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- dir.c 1999/12/09 21:00:05 1.8
  +++ dir.c 2000/01/11 23:23:49 1.9
  @@ -86,122 +86,122 @@
   
   ap_status_t ap_opendir(struct dir_t **new, const char *dirname, ap_context_t 
*cont)
   {
  - char * temp;
  - (*new) = ap_palloc(cont, sizeof(struct dir_t));
  +char * temp;
  +(*new) = ap_palloc(cont, sizeof(struct dir_t));
   (*new)->cntxt = cont;
  - (*new)->entry = NULL;
  +(*new)->entry = NULL;
   temp = canonical_filename((*new)->cntxt, dirname);
   if (temp[strlen(temp)] == '/') {
(*new)->dirname = ap_pstrcat(cont, dirname, "*", NULL);
  - }
  - else {
  +}
  +else {
   (*new)->dirname = ap_pstrcat(cont, dirname, "/*", NULL);
  - }
  - (*new)->dirhand = INVALID_HANDLE_VALUE;
  - ap_register_cleanup((*new)->cntxt, (void *)(*new), dir_cleanup,
  - ap_null_cleanup);
  +}
  +(*new)->dirhand = INVALID_HANDLE_VALUE;
  +ap_register_cleanup((*new)->cntxt, (void *)(*new), dir_cleanup,
  +ap_null_cleanup);
   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;
  +if (FindClose(thedir->dirhand)) {
  +ap_kill_cleanup(thedir->cntxt, thedir, dir_cleanup);
  +return APR_SUCCESS;
  +}
  +return APR_EEXIST;
   }
   
   ap_status_t ap_readdir(struct dir_t *thedir)
   {
  - if (thedir->dirhand == INVALID_HANDLE_VALUE) {
  - thedir->entry = ap_palloc(thedir->cntxt, 
sizeof(WIN32_FIND_DATA));
  - thedir->dirhand = FindFirstFile(thedir->dirname, thedir->entry);
  - if (thedir->dirhand == INVALID_HANDLE_VALUE) {
  - return APR_EEXIST;
  - }
  - return APR_SUCCESS;
  - }
  - if (FindNextFile(thedir->dirhand, thedir->entry)) {
  - return APR_SUCCESS;
  - }
  - return APR_EEXIST;
  +if (thedir->dirhand == INVALID_HANDLE_VALUE) {
  +thedir->entry = ap_palloc(thedir->cntxt, sizeof(WIN32_FIND_DATA));
  +thedir->dirhand = FindFirstFile(thedir->dirname, thedir->entry);
  +if (thedir->dirhand == INVALID_HANDLE_VALUE) {
  +return APR_EEXIST;
  +}
  +return APR_SUCCESS;
  +}
  +if (FindNextFile(thedir->dirhand, thedir->entry)) {
  +return APR_SUCCESS;
  +}
  +return APR_EEXIST;
   }
   
   ap_status_t ap_rewinddir(struct dir_t *thedir)
   {
  - ap_status_t stat;
  - ap_context_t *cont = thedir->cntxt;
  +ap_status_t stat;
  +ap_context_t *cont = thedir->cntxt;
   char *temp = ap_pstrdup(cont, thedir->dirname);
  - temp[strlen(temp) - 2] = '\0';   /*remove the \* at the end */
  - if (thedir->dirhand == INVALID_HANDLE_VALUE) {
  - return APR_SUCCESS;
  - }
  +temp[strlen(temp) - 2] = '\0';   /*remove the \* at the end */
  +if (thedir->dirhand == INVALID_HANDLE_VALUE) {
  +return APR_SUCCESS;
  +}
   if ((stat = ap_closedir(thedir)) == APR_SUCCESS) {
  - if ((stat = ap_opendir(&thedir, temp, cont)) == APR_SUCCESS) {
  - ap_readdir(thedir);
  - return APR_SUCCESS;
  - }
  - }
  - return stat;
  +if ((stat = ap_opendir(&thedir, temp, cont)) == APR_SUCCESS) {
  +ap_readdir(thedir);
  +return APR_SUCCESS;
  +}
  +}
  +return stat; 
   }
   
   ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm, ap_context_t 
*cont)
   {
   if (CreateDirectory(path, NULL)) {
  - return APR_SUCCESS;
  - }
  +return APR_SUCCESS;
  +}
   return APR_EEXIST;
   }
   
   ap_status_t ap_remove_dir(const char *path, ap_context_t *cont)
   {
  -DWORD huh;
  +DWORD huh;
   char *temp = canonical_filename(cont, path);
  - if (RemoveDirectory(temp)) {
  - return APR_SUCCESS;
  - }
  - huh = GetLastError();
  - return APR_EEXIST;
  +if (RemoveDirectory(temp)) {
  +return APR_SUCCESS;
  +}
  +huh = GetLastError();
  +return APR_EEXIST;
   }
   
   ap_status_t ap_dir_entry_size(ap_ssize_t *size, struct dir_t *thedir)
   {
   if (thedir == NULL || thedir->entry == NULL) {
  - return APR_ENODIR;
  - }
  - (*size) = (thedir->entr

cvs commit: apache-2.0/src/lib/apr/file_io/win32 fileio.h

2000-01-11 Thread stoddard
stoddard00/01/11 15:21:34

  Modified:src/lib/apr/file_io/win32 fileio.h
  Log:
  Replace missing end-of-comment delimiter.
  
  Revision  ChangesPath
  1.5   +2 -1  apache-2.0/src/lib/apr/file_io/win32/fileio.h
  
  Index: fileio.h
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/fileio.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- fileio.h  2000/01/05 13:07:59 1.4
  +++ fileio.h  2000/01/11 23:21:29 1.5
  @@ -94,7 +94,8 @@
* append -- Windows doesn't support the append concept when opening files.
*   APR needs to keep track of this, and always make sure we append
*   correctly when writing to a file with this flag set TRUE.
  - *  
  + */
  +
   struct file_t {
   ap_context_t *cntxt;
   HANDLE filehand;
  
  
  


cvs commit: apache-1.3/src/os/netware Apache.def ApacheCore.imp ApacheCoreNW.def ApacheModuleAuthAnon.def ApacheModuleCERNMeta.def ApacheModuleDigest.def ApacheModuleExpires.def ApacheModuleHeaders.def ApacheModuleInfo.def ApacheModuleProxy.def ApacheModuleRewrite.def ApacheModuleSpeling.def ApacheModuleStatus.def ApacheModuleUserTrack.def getopt.c getopt.h main_nlm.c mod_nlm.c modules.c multithread.c precomp.h test_char.h uri_delims.h os.c os.h

2000-01-11 Thread stoddard
stoddard00/01/11 13:52:34

  Modified:src/os/netware os.c os.h
  Added:   src/os/netware Apache.def ApacheCore.imp ApacheCoreNW.def
ApacheModuleAuthAnon.def ApacheModuleCERNMeta.def
ApacheModuleDigest.def ApacheModuleExpires.def
ApacheModuleHeaders.def ApacheModuleInfo.def
ApacheModuleProxy.def ApacheModuleRewrite.def
ApacheModuleSpeling.def ApacheModuleStatus.def
ApacheModuleUserTrack.def getopt.c getopt.h
main_nlm.c mod_nlm.c modules.c multithread.c
precomp.h test_char.h uri_delims.h
  Log:
  NetWare port of Apache 1.3, part 2 of 2.
  
  Obtained from: Mike Gardiner
  
  Revision  ChangesPath
  1.2   +8 -18 apache-1.3/src/os/netware/os.c
  
  Index: os.c
  ===
  RCS file: /home/cvs/apache-1.3/src/os/netware/os.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- os.c  1999/10/28 17:57:43 1.1
  +++ os.c  2000/01/11 21:52:06 1.2
  @@ -57,78 +57,68 @@
   
   #include "ap_config.h"
   
  -
   void ap_os_dso_init(void)
   {
  -
   }
   
  -
   void *ap_os_dso_load(const char *path)
   {
   unsigned int nlmHandle;
   char *moduleName = NULL;
  -
  +
   moduleName = strrchr(path, '/');
   
  -if(moduleName)
  +if (moduleName)
   moduleName++;
   
   nlmHandle = FindNLMHandle((char*)moduleName);
   
  -if(nlmHandle == NULL) {
  -spawnlp(P_NOWAIT | P_SPAWN_IN_CURRENT_DOMAIN, path, NULL);
  +if (nlmHandle == NULL) {
  +spawnlp(P_NOWAIT | P_SPAWN_IN_CURRENT_DOMAIN, path, NULL);
   nlmHandle = FindNLMHandle((char *)moduleName);
   }
   
   return (void *)nlmHandle;
   }
   
  -
   void ap_os_dso_unload(void *handle)
   {
KillMe(handle);
   }
   
  -
   void *ap_os_dso_sym(void *handle, const char *symname)
   {
   return ImportSymbol((int)GetNLMHandle(), (char *)symname);
   }
   
  -
   const char *ap_os_dso_error(void)
   {
   return NULL;
   }
   
  -
   char *remove_filename(char* str)
   {
   int i, len = strlen(str);
 
  -for(i=len; i; i--) {
  -if(str[i] == '\\' || str[i] == '/') {
  +for (i=len; i; i--) {
  +if (str[i] == '\\' || str[i] == '/') {
   str[i] = NULL;
   break;
   }
   }
  -
   return str;
   }
   
  -
   char *bslash2slash(char* str)
   {
   int i, len = strlen(str);
 
  -for(i=0; i
  #include 
  #include 
  #include 
  
  #define OPTERRCOLON (1)
  #define OPTERRNF (2)
  #define OPTERRARG (3)
  
  char *optarg;
  int optind = 1;
  int opterr = 1;
  int optopt;
  
  static int
  optiserr(int argc, char * const *argv, int oint, const char *optstr,
   int optchr, int err)
  {
  if (opterr) {
  fprintf(stderr, "Error in argument %d, char %d: ", oint, optchr + 1);
  
  switch (err) {
  case OPTERRCOLON:
  fprintf(stderr, ": in flags\n");
  break;
  case OPTERRNF:
  fprintf(stderr, "option not found %c\n", argv[oint][optchr]);
  break;
  case OPTERRARG:
  fprintf(stderr, "no argument for option %c\n", 
argv[oint][optchr]);
  break;
  default:
  fprintf(stderr, "unknown\n");
  break;
  }
  }
  optopt = argv[oint][optchr];
  return('?');
  }
  
  int
  getopt(int argc, char* const *argv, const char *optstr)
  {
  static int optchr = 0;
  static int dash = 0; /* have already seen the - */
  
  char *cp;
  
  if (optind >= argc)
  return(EOF);
  
  if (!dash && (argv[optind][0] !=  '-'))
  return(EOF);
  
  if (!dash && (argv[optind][0] ==  '-') && !argv[optind][1]) {
  /*
   * use to specify stdin. Need to let pgm process this and
   * the following args
   */
  return(EOF);
  }
  
  if ((argv[optind][0] == '-') && (argv[optind][1] == '-')) {
  /* -- indicates end of args */
  optind++;
  return(EOF);
  }
  
  if (!dash) {
  assert((argv[optind][0] == '-') && argv[optind][1]);
  dash = 1;
  optchr = 1;
  }
  
  /* Check if the guy tries to do a -: kind of flag */
  assert(dash);
  if (argv[optind][optchr] == ':') {
  dash = 0;
  optind++;
  return(optiserr(argc, argv, optind-1, optstr, optchr, OPTERRCOLON));
  }
  
  if (!(cp = strchr(optstr, argv[optind][optchr]))) {
  int errind = optind;
  int errchr = optchr;
  
  if (!argv[optind][optchr+1]) {
  dash = 0;
  optind++;
  }
  else
  optchr++;
  return(optiserr(argc, argv, errind, optstr, err

cvs commit: apache-1.3/src/support htdigest.mcp.gz htpasswd.mcp.gz

2000-01-11 Thread stoddard
stoddard00/01/11 13:07:40

  Added:   src  ApacheNW.mcp.gz
   src/support htdigest.mcp.gz htpasswd.mcp.gz
  Log:
  NetWare port. Part 1 of two commits.
  
  ApacheNW.ZIP (95K) contains the following project files:
  
  \apache-1.3\src\ApacheNW.mcp  Main project containing everything needed to 
build Apache for NetWare.
  \apache-1.3\src\support\htpasswd.mcp   HTPASSWD project file.
  \apache-1.3\src\support\htdigest.mcp  HTDIGEST project file.
  
  Obtained from: Mike Gardiner
  
  Revision  ChangesPath
  1.1  apache-1.3/src/ApacheNW.mcp.gz
  
<>
  
  
  1.1  apache-1.3/src/support/htdigest.mcp.gz
  
<>
  
  
  1.1  apache-1.3/src/support/htpasswd.mcp.gz
  
<>
  
  


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

2000-01-11 Thread coar
coar00/01/11 11:48:05

  Modified:.STATUS Makefile.tmpl configure
   src  CHANGES
   src/support suexec.c
  Log:
Allow the builder to specify a default umask for scripts
wrapped by suexec.
  
  PR:   4178
  Reviewed by:  Ryan Bloom, Martin Kraemer, Jim Jagielski, Greg Stein
  
  Revision  ChangesPath
  1.787 +1 -6  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.786
  retrieving revision 1.787
  diff -u -r1.786 -r1.787
  --- STATUS2000/01/11 19:25:24 1.786
  +++ STATUS2000/01/11 19:47:35 1.787
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 2000/01/11 19:25:24 $]
  +  Last modified at [$Date: 2000/01/11 19:47:35 $]
   
   Release:
   
  @@ -75,11 +75,6 @@
   
   
   Available Patches:
  -
  -* Ken's patch to allow for umask settings for suExec. Suggested
  -  by PR#4178.
  -Message-ID: <[EMAIL PROTECTED]>
  - Status: Ken +1, Ryan +1, Jim +1, Martin +1
   
   * Andrew Ford's patch (1999/12/05) to add absolute times to mod_expires
Message-ID: <[EMAIL PROTECTED]>
  
  
  
  1.95  +3 -1  apache-1.3/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- Makefile.tmpl 1999/12/09 17:19:35 1.94
  +++ Makefile.tmpl 2000/01/11 19:47:41 1.95
  @@ -135,6 +135,7 @@
   suexec_uidmin   = @suexec_uidmin@
   suexec_gidmin   = @suexec_gidmin@
   suexec_safepath = @suexec_safepath@
  +suexec_umask= @suexec_umask@
   
   #   some substituted configuration parameters
   conf_user= @conf_user@
  @@ -200,7 +201,8 @@
-DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
-DLOG_EXEC=\"$(suexec_logexec)\" \
-DDOC_ROOT=\"$(suexec_docroot)\" \
  - -DSAFE_PATH=\"$(suexec_safepath)\" ' \
  + -DSAFE_PATH=\"$(suexec_safepath)\" \
  + $(suexec_umask)' \
suexec; \
fi
@echo "<=== $(SRC)/support"
  
  
  
  1.115 +15 -1 apache-1.3/configure
  
  Index: configure
  ===
  RCS file: /home/cvs/apache-1.3/configure,v
  retrieving revision 1.114
  retrieving revision 1.115
  diff -u -r1.114 -r1.115
  --- configure 1999/12/10 11:03:00 1.114
  +++ configure 2000/01/11 19:47:42 1.115
  @@ -240,6 +240,8 @@
   suexec_uidmin=100
   suexec_gidmin=100
   suexec_safepath="/usr/local/bin:/usr/bin:/bin"
  +# if the umask is undefined, we don't change it
  +#suexec_umask=0755
   
   #   the installation flags
   iflags_program="-m 755 -s"
  @@ -449,6 +451,7 @@
   echo " --suexec-uidmin=UIDset the suEXEC minimal allowed UID 
[$suexec_uidmin]"
   echo " --suexec-gidmin=GIDset the suEXEC minimal allowed GID 
[$suexec_gidmin]"
   echo " --suexec-safepath=PATH set the suEXEC safe PATH 
[$suexec_safepath]"
  +echo " --suexec-umask=UMASK   set the umask for the suEXEC'd 
script [server's umask]"
   echo ""
   echo "Deprecated options:"
   echo " --layout   backward compat only: use 
--show-layout"
  @@ -976,6 +979,11 @@
   suexec_safepath="$apc_optarg"
   suexec_ok=1
   ;;
  +--suexec-umask=*)
  +suexec_umask_val="$apc_optarg"
  +suexec_umask="-DSUEXEC_UMASK=$apc_optarg"
  +suexec_ok=1
  +;;
   --server-uid=*)
   conf_user="$apc_optarg"
# protect the '#' against interpretation as comment
  @@ -1085,7 +1093,7 @@
   for var in prefix exec_prefix bindir sbindir libexecdir mandir \
  sysconfdir datadir iconsdir htdocsdir cgidir includedir \
  localstatedir runtimedir logfiledir proxycachedir \
  -   suexec_docroot suexec_logexec; do
  +   suexec_docroot suexec_logexec ; do
   eval "val=\"\$$var\"";
   val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
   eval "$var=\"$val\""
  @@ -1240,6 +1248,11 @@
   echo "caller ID: $suexec_caller"
   echo "  minimum user ID: $suexec_uidmin"
   echo " minimum group ID: $suexec_gidmin"
  +if [ "x$suexec_umask" != "x" ]; then
  +echo "umask: $suexec_umask_val"
  + else
  +echo "umask: running server's"
  +fi
   echo ""
   fi
   exit 0
  @@ -1290,6 +1303,7 @@
   -e "[EMAIL PROTECTED]@%$suexec_uidmin%g" \
   -e "[EMAIL PROTECTED]@%$suexec_gidmin%g" \
   -e "[EMAIL PROTECTED]@%$suexec_safepath%g" \
  +-e "[EMAIL PROTECTED]@%$

cvs commit: apache-1.3 STATUS

2000-01-11 Thread jim
jim 00/01/11 11:25:29

  Modified:.STATUS
  Log:
  Some votes and a slight change in schedule
  due to the number of patches being presented
  
  Revision  ChangesPath
  1.786 +13 -8 apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.785
  retrieving revision 1.786
  diff -u -r1.785 -r1.786
  --- STATUS2000/01/11 16:21:24 1.785
  +++ STATUS2000/01/11 19:25:24 1.786
  @@ -1,15 +1,15 @@
 1.3 STATUS:
  -  Last modified at [$Date: 2000/01/11 16:21:24 $]
  +  Last modified at [$Date: 2000/01/11 19:25:24 $]
   
   Release:
   
   1.3.10-dev: Current. We will try to release on 1/14/2000. As such,
  only bug-fixes and doc changes will be allowed.
  Timeline:
  -1/11/2000: Code freeze. No changes at all.
  -1/12/2000: tag and roll tarball
  -1/14/2000: Release and announce
  -1/16/2000: Re-open CVS (delay "just in case")
  +1/12/2000: Code freeze. No changes at all.
  +1/13/2000: tag and roll tarball
  +1/17/2000: Release and announce
  +1/19/2000: Re-open CVS (delay "just in case")
   1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th.
   1.3.8: Not released.
   1.3.7: Not released.
  @@ -34,15 +34,20 @@
fix PR4974 has broken this again. Please see:
  <[EMAIL PROTECTED]>
UPDATE: Ryan suggested that SHLIB_SUFFIX_NAME=sl be backed
  -  out. Jim has done this. With this fix, we no longer
  -  consider this a show-stopper, but we are leaving this here
  -  so people look at this and double check.
  +  out. Jim has done this. However, there is still debate
  +  on the correct fix. ALL patches regarding this MUST
  +  be verified on a HPUX machine.
   
   * HPUX build failure without -Ae provided to HPUX compiler as a CFLAG.
 The error message states this flag is required for "long long" types
 to be recognized by HPUX's compiler
   Ryan submitted a patch for this problem
   STATUS:  Ryan +1, Jim, +1
  +
  +* There is a Netware patch which should be applied. We've let
  +  Netware hang too long. Patch by Mike Gardiner <[EMAIL PROTECTED]>
  +Message-ID: <[EMAIL PROTECTED]>
  + STATUS: Bill +1, Ryan +1
   
   RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
   
  
  
  


cvs commit: apache-2.0/src/os config.m4

2000-01-11 Thread sascha
sascha  00/01/11 09:28:29

  Modified:src/os   config.m4
  Log:
  Make OS selection work for non-UNIX cases
  
  Revision  ChangesPath
  1.3   +12 -5 apache-2.0/src/os/config.m4
  
  Index: config.m4
  ===
  RCS file: /home/cvs/apache-2.0/src/os/config.m4,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- config.m4 2000/01/11 13:11:12 1.2
  +++ config.m4 2000/01/11 17:28:28 1.3
  @@ -1,8 +1,15 @@
  -AC_MSG_CHECKING(which OS this is)
  +AC_MSG_CHECKING(for target platform)
   
  -dnl ## XXX - I'm not sure, but this might not handle the non-Unix case yet
  -OS=unix
  +PLATFORM=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`
  +
  +case "$PLATFORM" in
  +*beos*)
  +  OS="beos";;
  +*)
  +  OS="unix";;
  +esac
  +
   OS_DIR=os/$OS
   
  -AC_MSG_RESULT([$OS])
  -APACHE_FAST_OUTPUT(os/$OS/Makefile)
  +AC_MSG_RESULT($OS)
  +APACHE_FAST_OUTPUT($OS_DIR/Makefile)
  
  
  


cvs commit: apache-1.3 STATUS

2000-01-11 Thread martin
martin  00/01/11 08:21:26

  Modified:.STATUS
  Log:
  
  
  Revision  ChangesPath
  1.785 +2 -2  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.784
  retrieving revision 1.785
  diff -u -r1.784 -r1.785
  --- STATUS2000/01/11 15:22:12 1.784
  +++ STATUS2000/01/11 16:21:24 1.785
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 2000/01/11 15:22:12 $]
  +  Last modified at [$Date: 2000/01/11 16:21:24 $]
   
   Release:
   
  @@ -74,7 +74,7 @@
   * Ken's patch to allow for umask settings for suExec. Suggested
 by PR#4178.
   Message-ID: <[EMAIL PROTECTED]>
  -Status: Ken +1, Ryan +1, Jim +1
  + Status: Ken +1, Ryan +1, Jim +1, Martin +1
   
   * Andrew Ford's patch (1999/12/05) to add absolute times to mod_expires
Message-ID: <[EMAIL PROTECTED]>
  
  
  


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

2000-01-11 Thread martin
martin  00/01/11 07:51:33

  Modified:src  CHANGES
   src/main buff.c
  Log:
  Thanks a lot to Dean for his chunked-code regression test! Sorry I found
  this so late, apparently browsers swallowed it.
  The trailing CRLF in the last chunk was not converted.
  
  Revision  ChangesPath
  1.1493+3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1492
  retrieving revision 1.1493
  diff -u -r1.1492 -r1.1493
  --- CHANGES   2000/01/11 14:22:59 1.1492
  +++ CHANGES   2000/01/11 15:51:29 1.1493
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.10
   
  +  *) The end_chunk() code forgot to convert the trailing CRLF pair
  + from EBCDIC to ASCII. Fixed. [Martin Kraemer]
  +
 *) An Action set for a Location that didn't correspond to a file didn't
work. Fixed.
[Manoj Kasichainula, Ben Laurie]
  
  
  
  1.94  +6 -4  apache-1.3/src/main/buff.c
  
  Index: buff.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/buff.c,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- buff.c1999/12/09 12:05:03 1.93
  +++ buff.c2000/01/11 15:51:32 1.94
  @@ -542,14 +542,16 @@
   }
   *strp++ = CR;
   *strp = LF;
  -#ifdef CHARSET_EBCDIC
  -/* Chunks are an HTTP/1.1 Protocol feature. They must ALWAYS be in ASCII 
*/
  -ebcdic2ascii(&fb->outbase[fb->outchunk], &fb->outbase[fb->outchunk], 
CHUNK_HEADER_SIZE);
  -#endif /*CHARSET_EBCDIC*/
   
   /* tack on the trailing CRLF, we've reserved room for this */
   fb->outbase[fb->outcnt++] = CR;
   fb->outbase[fb->outcnt++] = LF;
  +
  +#ifdef CHARSET_EBCDIC
  +/* Chunks are an HTTP/1.1 Protocol feature. They must ALWAYS be in ASCII 
*/
  +ebcdic2ascii(&fb->outbase[fb->outchunk], &fb->outbase[fb->outchunk], 
CHUNK_HEADER_SIZE);
  +ebcdic2ascii(&fb->outbase[fb->outcnt-2], &fb->outbase[fb->outcnt-2], 2);
  +#endif /*CHARSET_EBCDIC*/
   
   fb->outchunk = -1;
   }
  
  
  


cvs commit: apache-1.3 STATUS

2000-01-11 Thread jim
jim 00/01/11 07:22:14

  Modified:.STATUS
  Log:
  Votes
  
  Revision  ChangesPath
  1.784 +3 -3  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.783
  retrieving revision 1.784
  diff -u -r1.783 -r1.784
  --- STATUS2000/01/11 14:41:56 1.783
  +++ STATUS2000/01/11 15:22:12 1.784
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 2000/01/11 14:41:56 $]
  +  Last modified at [$Date: 2000/01/11 15:22:12 $]
   
   Release:
   
  @@ -42,7 +42,7 @@
 The error message states this flag is required for "long long" types
 to be recognized by HPUX's compiler
   Ryan submitted a patch for this problem
  -STATUS:  Ryan +1
  +STATUS:  Ryan +1, Jim, +1
   
   RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
   
  @@ -74,7 +74,7 @@
   * Ken's patch to allow for umask settings for suExec. Suggested
 by PR#4178.
   Message-ID: <[EMAIL PROTECTED]>
  -Status: Ken +1, Ryan +1
  +Status: Ken +1, Ryan +1, Jim +1
   
   * Andrew Ford's patch (1999/12/05) to add absolute times to mod_expires
Message-ID: <[EMAIL PROTECTED]>
  
  
  


cvs commit: apache-1.3 STATUS

2000-01-11 Thread rbb
rbb 00/01/11 06:41:57

  Modified:.STATUS
  Log:
  I just submitted a message about this problem with a patch, but I think it's
  a showstopper.  Sorry  :-)
  
  Revision  ChangesPath
  1.783 +7 -1  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.782
  retrieving revision 1.783
  diff -u -r1.782 -r1.783
  --- STATUS2000/01/11 12:47:10 1.782
  +++ STATUS2000/01/11 14:41:56 1.783
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 2000/01/11 12:47:10 $]
  +  Last modified at [$Date: 2000/01/11 14:41:56 $]
   
   Release:
   
  @@ -37,6 +37,12 @@
 out. Jim has done this. With this fix, we no longer
 consider this a show-stopper, but we are leaving this here
 so people look at this and double check.
  +
  +* HPUX build failure without -Ae provided to HPUX compiler as a CFLAG.
  +  The error message states this flag is required for "long long" types
  +  to be recognized by HPUX's compiler
  +Ryan submitted a patch for this problem
  +STATUS:  Ryan +1
   
   RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
   
  
  
  


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

2000-01-11 Thread ben
ben 00/01/11 06:23:04

  Modified:src  CHANGES
   src/modules/standard mod_actions.c
  Log:
  Make Action work when Location doesn't exist.
  Submitted by: Manoj
  Reviewed by:  Ben
  
  Revision  ChangesPath
  1.1492+4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1491
  retrieving revision 1.1492
  diff -u -r1.1491 -r1.1492
  --- CHANGES   2000/01/11 14:13:37 1.1491
  +++ CHANGES   2000/01/11 14:22:59 1.1492
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.10
   
  +  *) An Action set for a Location that didn't correspond to a file didn't
  + work. Fixed.
  + [Manoj Kasichainula, Ben Laurie]
  +
 *) ProxyPass erroneously converted authentication requests to proxy
authentication requests. Fixed.
[Ben Laurie]
  
  
  
  1.33  +0 -5  apache-1.3/src/modules/standard/mod_actions.c
  
  Index: mod_actions.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_actions.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- mod_actions.c 1999/12/08 19:01:48 1.32
  +++ mod_actions.c 2000/01/11 14:23:03 1.33
  @@ -245,11 +245,6 @@
   if ((t = ap_table_get(conf->action_types,
  action ? action : ap_default_type(r {
script = t;
  - if (r->finfo.st_mode == 0) {
  - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
  -   "File does not exist: %s", r->filename);
  - return NOT_FOUND;
  - }
   }
   
   if (script == NULL) {
  
  
  


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

2000-01-11 Thread ben
ben 00/01/11 06:13:50

  Modified:src  CHANGES
   src/include httpd.h
   src/main http_core.c http_protocol.c http_request.c
   src/modules/proxy mod_proxy.c mod_proxy.h proxy_ftp.c
proxy_http.c proxy_util.c
   src/modules/standard mod_mime.c
  Log:
  Don't convert auth to proxy auth when it shouldn't be.
  
  Revision  ChangesPath
  1.1491+4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1490
  retrieving revision 1.1491
  diff -u -r1.1490 -r1.1491
  --- CHANGES   2000/01/10 21:33:06 1.1490
  +++ CHANGES   2000/01/11 14:13:37 1.1491
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.10
   
  +  *) ProxyPass erroneously converted authentication requests to proxy
  + authentication requests. Fixed.
  + [Ben Laurie]
  +
 *) Reverse a patch which broke HPUX shared builds. Basically
we comment out the SHLIB_SUFFIX_NAME=sl line in Configure.
[Ryan Bloom]
  
  
  
  1.298 +7 -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.297
  retrieving revision 1.298
  diff -u -r1.297 -r1.298
  --- httpd.h   1999/12/09 12:05:02 1.297
  +++ httpd.h   2000/01/11 14:13:39 1.298
  @@ -658,6 +658,12 @@
   
   #include "util_uri.h"
   
  +enum proxyreqtype {
  +NOT_PROXY=0,
  +STD_PROXY,
  +PROXY_PASS
  +};
  +
   struct request_rec {
   
   ap_pool *pool;
  @@ -681,7 +687,7 @@
   
   char *the_request;   /* First line of request, so we can log 
it */
   int assbackwards;/* HTTP/0.9, "simple" request */
  -int proxyreq;/* A proxy request (calculated during
  +enum proxyreqtype proxyreq;/* A proxy request (calculated during
 * post_read_request or translate_name) */
   int header_only; /* HEAD request, as opposed to GET */
   char *protocol;  /* Protocol, as given to us, or HTTP/0.9 */
  
  
  
  1.277 +1 -1  apache-1.3/src/main/http_core.c
  
  Index: http_core.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
  retrieving revision 1.276
  retrieving revision 1.277
  diff -u -r1.276 -r1.277
  --- http_core.c   1999/12/21 07:52:55 1.276
  +++ http_core.c   2000/01/11 14:13:40 1.277
  @@ -2956,7 +2956,7 @@
   void *sconf = r->server->module_config;
   core_server_config *conf = ap_get_module_config(sconf, &core_module);
 
  -if (r->proxyreq) {
  +if (r->proxyreq != NOT_PROXY) {
   return HTTP_FORBIDDEN;
   }
   if ((r->uri[0] != '/') && strcmp(r->uri, "*")) {
  
  
  
  1.286 +8 -5  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.285
  retrieving revision 1.286
  diff -u -r1.285 -r1.286
  --- http_protocol.c   2000/01/04 10:20:39 1.285
  +++ http_protocol.c   2000/01/11 14:13:41 1.286
  @@ -1162,7 +1162,8 @@
   ap_note_auth_failure(r);
   else
   ap_table_setn(r->err_headers_out,
  -  r->proxyreq ? "Proxy-Authenticate" : "WWW-Authenticate",
  +  r->proxyreq == STD_PROXY ? "Proxy-Authenticate"
  +   : "WWW-Authenticate",
 ap_pstrcat(r->pool, "Basic realm=\"", ap_auth_name(r), 
"\"",
 NULL));
   }
  @@ -1170,7 +1171,8 @@
   API_EXPORT(void) ap_note_digest_auth_failure(request_rec *r)
   {
   ap_table_setn(r->err_headers_out,
  - r->proxyreq ? "Proxy-Authenticate" : "WWW-Authenticate",
  + r->proxyreq == STD_PROXY ? "Proxy-Authenticate"
  +   : "WWW-Authenticate",
ap_psprintf(r->pool, "Digest realm=\"%s\", nonce=\"%lu\"",
ap_auth_name(r), r->request_time));
   }
  @@ -1178,8 +1180,9 @@
   API_EXPORT(int) ap_get_basic_auth_pw(request_rec *r, const char **pw)
   {
   const char *auth_line = ap_table_get(r->headers_in,
  -  r->proxyreq ? "Proxy-Authorization"
  -  : "Authorization");
  +  r->proxyreq == STD_PROXY
  +  ? "Proxy-Authorization"
  +  : "Authorization");
   const char *t;
   
   if (!(t = ap_auth_type(r)) || strcasecmp(t, "Basic"))
  @@ -1352,7 +1355,7 @@
   /* mod_proxy is only HTTP/1.0, so avoid sending HTTP/1.1 error response;
* kluge 

cvs commit: apache-2.0/src/regex Makefile.in config.m4 Makefile.am

2000-01-11 Thread sascha
sascha  00/01/11 05:11:14

  Modified:src  acinclude.m4 buildconf configure.in
   src/modules/mpm config.m4
   src/modules/mpm/dexter config.m4
   src/modules/mpm/mpmt_pthread config.m4
   src/modules/mpm/prefork config.m4 prefork.c
   src/modules/standard config.m4
   src/os   config.m4
   src/regex config.m4
  Added:   src  Makefile.in
   src/ap   Makefile.in
   src/build build.mk build2.mk buildcheck.sh fastgen.sh
library.mk ltlib.mk mkdep.perl program.mk rules.mk
special.mk
   src/helpers cvsclean snapshot
   src/lib  Makefile.in
   src/lib/expat-lite Makefile.in
   src/main Makefile.in
   src/modules Makefile.in
   src/modules/mpm Makefile.in
   src/modules/mpm/dexter Makefile.in
   src/modules/mpm/mpmt_pthread Makefile.in
   src/modules/mpm/prefork Makefile.in
   src/modules/standard Makefile.in
   src/os   Makefile.in
   src/os/unix Makefile.in
   src/regex Makefile.in
  Removed: src  Makefile.am
   src/ap   Makefile.am
   src/lib  Makefile.am
   src/main Makefile.am
   src/modules Makefile.am
   src/modules/mpm Makefile.am
   src/modules/mpm/dexter Makefile.am
   src/modules/mpm/mpmt_pthread Makefile.am
   src/modules/mpm/prefork Makefile.am
   src/modules/standard Makefile.am
   src/os   Makefile.am
   src/os/unix Makefile.am
   src/regex Makefile.am
  Log:
  These changes are committed together, because they depend on each other.
  
  -   shared modules can be built in the tree
  -   added support for --with-layout, uses APACI's config.layout
  -   working 'make install'
  -   working 'make depend'
  -   working Pthreads checks
  -   buildconf replaced
  
  Revision  ChangesPath
  1.14  +298 -49   apache-2.0/src/acinclude.m4
  
  Index: acinclude.m4
  ===
  RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -u -r1.13 -r1.14
  --- acinclude.m4  1999/12/29 23:41:56 1.13
  +++ acinclude.m4  2000/01/11 13:10:56 1.14
  @@ -1,31 +1,77 @@
  -dnl
  -dnl APACHE_MODULE(modname [, shared])
  -dnl
  -dnl Includes an extension in the build.
  -dnl
  -dnl "modname" is the name of the modules/ subdir where the extension resides
  -dnl "shared" can be set to "shared" or "yes" to build the extension as
  -dnl a dynamically loadable library.
  -dnl
  -dnl XXX - for now, all modules using this function are in modules/standard
  -AC_DEFUN(APACHE_MODULE,[
  -  if test -d "$cwd/$srcdir/modules/standard" ; then
  -dnlMOD_SUBDIRS="$MOD_SUBDIRS $1"
  -if test "$2" != "shared" -a "$2" != "yes"; then
  -  libname="`basename $1`"
  -  _extlib="libapachemod_${libname}.a"
  -  MOD_LTLIBS="$MOD_LTLIBS modules/standard/libapachemod_${libname}.la"
  -  MOD_LIBS="$MOD_LIBS standard/$_extlib"
  -  MOD_STATIC="$MOD_STATIC $1"
  +
  +AC_DEFUN(APACHE_PASSTHRU,[
  +  unset ac_cv_pass_$1
  +  AC_CACHE_VAL(ac_cv_pass_$1, [ac_cv_pass_$1=$$1])
  +])
  +
  +dnl APACHE_SUBST(VARIABLE)
  +dnl Makes VARIABLE available in generated files
  +dnl (do not use @variable@ in Makefiles, but $(variable))
  +AC_DEFUN(APACHE_SUBST,[
  +  APACHE_VAR_SUBST="$APACHE_VAR_SUBST $1"
  +  AC_SUBST($1)
  +])
  +
  +dnl APACHE_FAST_OUTPUT(FILENAME)
  +dnl Perform substitutions on FILENAME (Makefiles only)
  +AC_DEFUN(APACHE_FAST_OUTPUT,[
  +  APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $1"
  +])
  +
  +dnl APACHE_MKDIR_P_CHECK
  +dnl checks whether mkdir -p works
  +AC_DEFUN(APACHE_MKDIR_P_CHECK,[
  +  AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[
  +test -d conftestdir && rm -rf conftestdir
  +mkdir -p conftestdir/somedir >/dev/null 2>&1
  +if test -d conftestdir/somedir; then
  +  ac_cv_mkdir_p=yes
   else
  -  MOD_SHARED="$MOD_SHARED $1"
  +  ac_cv_mkdir_p=no
   fi
  -dnlAPACHE_OUTPUT(modules/$1/Makefile)
  -  fi
  +rm -rf conftestdir
  +  ])
  +])
  +
  +dnl APACHE_FAST_GENERATE
  +dnl Creates Makefiles and config_vars.mk
  +AC_DEFUN(APACHE_FAST_GENERATE,[
  +  APACHE_SUBST(abs_srcdir)
  +  APACHE_SUBST(bindir)
  +  APACHE_SUBST(cgidir)
  +  APACHE_SUBST(logdir)
  +  APACHE_SUBST(exec_prefix)
  +  APACHE_SUBST(libexecdir)
  +  APACHE_SUBST(htdocsdir)
  +  APACHE_SUBST(includedir)
  +  APACHE_SUBST(iconsdir)
  +  APACHE_SUBST(sysconfdir)
  +  APACHE_SUBST(prefix)
  +  APACHE_SUBST(CC)
  +  APACHE_SUBST(CFLAGS)
  +  APACHE_SUBST(CPPFLAGS)
  +  APACHE_SUBST(LDFLAGS)
  +  APACHE_SUBST(DEFS)
  +  APACHE_SUBST(LIBTOOL)
  +  APACHE_SUBS

cvs commit: apache-2.0/src/build - New directory

2000-01-11 Thread sascha
sascha  00/01/11 05:07:55

  apache-2.0/src/build - New directory


cvs commit: apache-2.0/src/regex .cvsignore

2000-01-11 Thread sascha
sascha  00/01/11 05:04:02

  Modified:src/ap   .cvsignore
   src  .cvsignore
   src/lib  .cvsignore
   src/main .cvsignore
   src/modules .cvsignore
   src/modules/mpm/dexter .cvsignore
   src/modules/mpm/mpmt_pthread .cvsignore
   src/modules/mpm/prefork .cvsignore
   src/modules/standard .cvsignore
   src/os/unix .cvsignore
   src/regex .cvsignore
  Added:   src/modules/mpm .cvsignore
   src/os   .cvsignore
  Log:
  Update .cvsignore files
  
  Revision  ChangesPath
  1.3   +0 -1  apache-2.0/src/ap/.cvsignore
  
  Index: .cvsignore
  ===
  RCS file: /home/cvs/apache-2.0/src/ap/.cvsignore,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- .cvsignore1999/12/24 18:35:05 1.2
  +++ .cvsignore2000/01/11 13:03:54 1.3
  @@ -1,4 +1,3 @@
  -Makefile.in
   .deps
   *.lo
   .libs
  
  
  
  1.4   +12 -2 apache-2.0/src/.cvsignore
  
  Index: .cvsignore
  ===
  RCS file: /home/cvs/apache-2.0/src/.cvsignore,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- .cvsignore1999/12/24 18:35:03 1.3
  +++ .cvsignore2000/01/11 13:03:54 1.4
  @@ -14,16 +14,26 @@
   CoreR
   httpd
   apache
  -buildconf.stamp
  +buildmk.stamp
   aclocal.m4
  -Makefile.in
   configure
   config.log
  +*.lo
   .libs
   .deps
   libtool
  +generated_lists
  +config_vars.mk
  +config.guess
  +config.sub
   config.cache
   config.status
  +shlibtool
  +ltconfig
  +ltmain.sh
  +install-sh
  +missing
  +mkinstalldirs
   libhttpd.*
   Makefile
   Makefile.config
  
  
  
  1.4   +0 -1  apache-2.0/src/lib/.cvsignore
  
  Index: .cvsignore
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/.cvsignore,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- .cvsignore1999/12/24 18:35:07 1.3
  +++ .cvsignore2000/01/11 13:03:55 1.4
  @@ -1,3 +1,2 @@
  -Makefile.in
   Makefile
   pth
  
  
  
  1.3   +0 -1  apache-2.0/src/main/.cvsignore
  
  Index: .cvsignore
  ===
  RCS file: /home/cvs/apache-2.0/src/main/.cvsignore,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- .cvsignore1999/12/24 18:35:10 1.2
  +++ .cvsignore2000/01/11 13:03:57 1.3
  @@ -1,5 +1,4 @@
   Makefile
  -Makefile.in
   .deps
   .libs
   *.lo
  
  
  
  1.3   +0 -1  apache-2.0/src/modules/.cvsignore
  
  Index: .cvsignore
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/.cvsignore,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- .cvsignore1999/12/24 18:35:11 1.2
  +++ .cvsignore2000/01/11 13:03:58 1.3
  @@ -1,2 +1 @@
  -Makefile.in
   Makefile
  
  
  
  1.3   +0 -1  apache-2.0/src/modules/mpm/dexter/.cvsignore
  
  Index: .cvsignore
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/.cvsignore,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- .cvsignore1999/12/24 18:35:12 1.2
  +++ .cvsignore2000/01/11 13:03:58 1.3
  @@ -1,4 +1,3 @@
  -Makefile.in
   *.lo
   *.la
   Makefile
  
  
  
  1.1  apache-2.0/src/modules/mpm/.cvsignore
  
  Index: .cvsignore
  ===
  Makefile
  
  
  
  1.3   +0 -1  apache-2.0/src/modules/mpm/mpmt_pthread/.cvsignore
  
  Index: .cvsignore
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/.cvsignore,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- .cvsignore1999/12/24 18:35:14 1.2
  +++ .cvsignore2000/01/11 13:03:59 1.3
  @@ -1,4 +1,3 @@
  -Makefile.in
   .deps
   .libs
   *.lo
  
  
  
  1.3   +0 -1  apache-2.0/src/modules/mpm/prefork/.cvsignore
  
  Index: .cvsignore
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/.cvsignore,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- .cvsignore1999/12/24 18:35:15 1.2
  +++ .cvsignore2000/01/11 13:04:00 1.3
  @@ -1,4 +1,3 @@
  -Makefile.in
   *.lo
   *.la
   Makefile
  
  
  
  1.3   +2 -1  apache-2.0/src/modules/standard/.cvsignore
  
  Index: .cvsignore
  ===
  RCS f

cvs commit: apache-2.0/src/lib/apr Makefile.in

2000-01-11 Thread sascha
sascha  00/01/11 05:00:29

  Modified:src/lib/apr Makefile.in
  Log:
  Add install and $(LIBAPR) target
  
  Revision  ChangesPath
  1.17  +10 -4 apache-2.0/src/lib/apr/Makefile.in
  
  Index: Makefile.in
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/Makefile.in,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -u -r1.16 -r1.17
  --- Makefile.in   2000/01/09 03:52:35 1.16
  +++ Makefile.in   2000/01/11 13:00:28 1.17
  @@ -28,6 +28,8 @@
   [EMAIL PROTECTED]@
   #shmem/@OSDIR@
   
  +LIBAPR = @[EMAIL PROTECTED]
  +
   #
   # Rules for turning inputs into outputs
   #
  @@ -38,13 +40,15 @@
   # Rules for building specific targets, starting with 'all' for
   # building the entire package.
   #
  -all: Makefile $(MODULES) subdirs
  +all: Makefile $(MODULES) subdirs $(LIBAPR)
  +
  +$(LIBAPR):
@rm -rf objs
@mkdir objs
  - @rm -f @[EMAIL PROTECTED]
  + @rm -f $@
for i in $(SUBDIRS); do cp $$i/*.o objs ; done;
  - $(AR) cr @[EMAIL PROTECTED] objs/*.o
  - $(RANLIB) @[EMAIL PROTECTED]
  + $(AR) cr $@ objs/*.o
  + $(RANLIB) $@
   
   clean: subdirs_clean
$(RM) -f *.o *.a *.so objs/*.o
  @@ -90,4 +94,6 @@
echo "<=== $(SDP)lib/apr/$$i"; \
done;
   
  +install: all
  + 
   # DO NOT REMOVE
  
  
  


cvs commit: apache-2.0/src/lib/apr configure.in

2000-01-11 Thread sascha
sascha  00/01/11 04:59:35

  Modified:src/lib/apr configure.in
  Log:
  Use REENTRANCY_FLAGS from config.cache (effectively only set by Apache)
  
  Revision  ChangesPath
  1.42  +4 -0  apache-2.0/src/lib/apr/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -u -r1.41 -r1.42
  --- configure.in  1999/12/29 23:54:27 1.41
  +++ configure.in  2000/01/11 12:59:34 1.42
  @@ -80,6 +80,10 @@
   AC_ARG_WITH(debug,[  --with-debug  Turn on debugging and compile 
time warnings],
[if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -g -Wall"; else 
CFLAGS="$CFLAGS -g"; fi])
   
  +dnl inherit REENTRANCY_FLAGS
  +test -n "$ac_cv_pass_REENTRANCY_FLAGS" && \
  +CFLAGS="$CFLAGS $ac_cv_pass_REENTRANCY_FLAGS"
  +
   dnl # this is the place to put specific options for platform/compiler
   dnl # combinations
   case "$OS:$CC" in
  
  
  


cvs commit: apache-2.0/src/lib/apr acconfig.h aclocal.m4

2000-01-11 Thread sascha
sascha  00/01/11 04:58:47

  Modified:src/lib/apr acconfig.h aclocal.m4
  Log:
  Typedef socklen_t instead of defining it.
  
  Revision  ChangesPath
  1.20  +4 -0  apache-2.0/src/lib/apr/acconfig.h
  
  Index: acconfig.h
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/acconfig.h,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -u -r1.19 -r1.20
  --- acconfig.h1999/12/31 04:15:08 1.19
  +++ acconfig.h2000/01/11 12:58:46 1.20
  @@ -78,4 +78,8 @@
   #define strcasecmp(s1,s2) stricmp(s1,s2)
   #endif
   
  +#if !defined(HAVE_SOCKLEN_T)
  +typedef int socklen_t;
  +#endif
  +
   #endif /* APR_CONFIG_H */
  
  
  
  1.9   +2 -2  apache-2.0/src/lib/apr/aclocal.m4
  
  Index: aclocal.m4
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aclocal.m4,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -u -r1.8 -r1.9
  --- aclocal.m41999/12/29 23:54:27 1.8
  +++ aclocal.m42000/01/11 12:58:46 1.9
  @@ -183,7 +183,7 @@
   ])
   ])
   
  -if test "$ac_cv_socklen_t" = "no"; then
  -  AC_DEFINE(socklen_t, unsigned int, [Whether you have socklen_t])
  +if test "$ac_cv_socklen_t" = "yes"; then
  +  AC_DEFINE(HAVE_SOCKLEN_T, 1, [Whether you have socklen_t])
   fi
   ])
  
  
  


cvs commit: apache-1.3 STATUS

2000-01-11 Thread rbb
rbb 00/01/11 04:47:12

  Modified:.STATUS
  Log:
  Update STATUS
  
  Revision  ChangesPath
  1.782 +2 -2  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.781
  retrieving revision 1.782
  diff -u -r1.781 -r1.782
  --- STATUS2000/01/10 21:32:58 1.781
  +++ STATUS2000/01/11 12:47:10 1.782
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 2000/01/10 21:32:58 $]
  +  Last modified at [$Date: 2000/01/11 12:47:10 $]
   
   Release:
   
  @@ -68,7 +68,7 @@
   * Ken's patch to allow for umask settings for suExec. Suggested
 by PR#4178.
   Message-ID: <[EMAIL PROTECTED]>
  -Status: Ken +1
  +Status: Ken +1, Ryan +1
   
   * Andrew Ford's patch (1999/12/05) to add absolute times to mod_expires
Message-ID: <[EMAIL PROTECTED]>