cvs commit: apache-1.3 STATUS

[lars]

lars98/12/23 13:31:54

  Modified:.STATUS
  Log:
  
  
  Revision  ChangesPath
  1.563 +4 -0  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.562
  retrieving revision 1.563
  diff -u -r1.562 -r1.563
  --- STATUS1998/12/23 21:05:32 1.562
  +++ STATUS1998/12/23 21:31:52 1.563
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1998/12/23 21:05:32 $]
  +  Last modified at [$Date: 1998/12/23 21:31:52 $]
   
   Release:
   
  @@ -100,6 +100,10 @@
vhost-xxx.html document out of it. -- rse
   
   Available Patches:
  +
  +* Fabien Coelho's errmsg patch for http_config.c
  +Message-ID: PR#3573
  +Status: Martin +1 (on concept)
   
   * Jim Patterson's patch to make mod_info work on Win32
   Message-ID: PR#1442
  
  
  

cvs commit: apache-1.3 STATUS

[lars]

lars98/12/23 13:05:37

  Modified:.STATUS
  Log:
  yet another update...
  
  Revision  ChangesPath
  1.562 +24 -2 apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.561
  retrieving revision 1.562
  diff -u -r1.561 -r1.562
  --- STATUS1998/12/23 20:04:30 1.561
  +++ STATUS1998/12/23 21:05:32 1.562
  @@ -1,11 +1,12 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1998/12/23 20:04:30 $]
  +  Last modified at [$Date: 1998/12/23 21:05:32 $]
   
   Release:
   
   1.3.4-dev: current.
   Lars is RM.
   Possible release on January 4. (tagged/rolled on January 2.)
  +Win32 distribution: ??? (any volunteer?)
   
   1.3.3: Tagged and rolled on Oct. 7.  Released on 9th, announced on 10th.
   1.3.2: Tagged and rolled on Sep. 21. Announced and released on 23rd.
  @@ -100,7 +101,26 @@
   
   Available Patches:
   
  -* PR#3541 Koen Holtman's cleanup of negotiation
  +* Jim Patterson's patch to make mod_info work on Win32
  +Message-ID: PR#1442
  +Status: Lars +1 (on concept)
  +
  +* Peter Greis' new '%m' CustomLog option: the time taken to serve the
  +  request, in milli-seconds.
  +Message-ID: PR#2838
  +Status: 
  +
  +* Ask Bjoern Hansen's patch to make Apache set Cache-Control and Pragma
  +  headers if r->no_cache is set and r->headers_out contains an
  +  Expires header.
  +Message-ID: PR#3023
  +Status: 
  +
  +* Ronald Tschalär's ap_uuencode() bugfix
  +Message-ID: PR#3411
  +Status: Lars +1 (on concept)
  +
  +* Koen Holtman's cleanup of negotiation
Message-ID: PR#3541
Status: 
   
  @@ -357,6 +377,8 @@
   * should have a pretty little icon for Apache on Win32
   
   * proxy module doesn't load on Win95.  Why?  Good question.  PR#1462.
  +
  +* Proxy cache garbage collection doesn't work. PR#1891
   
   * "Directory /", "Directory C:/" both fail to do anything, 
 while "Directory *" SEGVs.
  @@ -438,7 +460,7 @@
- mod_auth_db.c  (do we want to even try this?  We should have some
 db of some sort... what else can we pick from under win32?)
- mod_auth_dbm.c
  - - mod_info.c (PR re exporting symbols for it...)
  + - mod_info.c (PR#1442 re exporting symbols for it...)
- mod_log_agent.c
- mod_log_referer.c
- mod_mime_magic.c (needs access to mod_mime API stage...)
  
  
  

cvs commit: apache-1.3 STATUS

[lars]

lars98/12/23 12:04:31

  Modified:.STATUS
  Log:
  Update...
  
  Revision  ChangesPath
  1.561 +12 -9 apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.560
  retrieving revision 1.561
  diff -u -r1.560 -r1.561
  --- STATUS1998/12/17 15:12:19 1.560
  +++ STATUS1998/12/23 20:04:30 1.561
  @@ -1,10 +1,11 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1998/12/17 15:12:19 $]
  +  Last modified at [$Date: 1998/12/23 20:04:30 $]
   
   Release:
   
   1.3.4-dev: current.
  -(Lars volunteers as release manager)
  +Lars is RM.
  +Possible release on January 4. (tagged/rolled on January 2.)
   
   1.3.3: Tagged and rolled on Oct. 7.  Released on 9th, announced on 10th.
   1.3.2: Tagged and rolled on Sep. 21. Announced and released on 23rd.
  @@ -15,6 +16,13 @@
   
   RELEASE SHOWSTOPPERS:
   
  +* APACI: make "--config-layout=Apache" the default path layout
  +Status: Ralf is working on a patch
  +
  +* Version component misbehaviour
  +See: <[EMAIL PROTECTED]>
  +Status: Ralf mentioned that he knows a solution... (?)
  +
   * Paul's [PATCH] Win32 device files
   Message-ID: <[EMAIL PROTECTED]>
   and <[EMAIL PROTECTED]>
  @@ -92,7 +100,7 @@
   
   Available Patches:
   
  -* PR#3541 Koen Holtman's cleanup of negociation
  +* PR#3541 Koen Holtman's cleanup of negotiation
Message-ID: PR#3541
Status: 
   
  @@ -100,11 +108,6 @@
   Message-ID: <[EMAIL PROTECTED]>
   Status: 
   
  -* Ralf's [PATCH] Cleanup command line options
  -Message-ID: <[EMAIL PROTECTED]>
  -Status: Ralf +1, Roy +1, Jim 0 (is a 1.3.3->1.3.4 bump the place?)
  -Lars 0 (for 1.3)
  -
   * Michael van Elst's patch [PR#3160] to improve mod_rewrite's
 in-core cache handling by using a hash table.
   Message-ID: <[EMAIL PROTECTED]>
  @@ -466,7 +469,7 @@
  for the two stable release versions, and nothing under Old unless
  the new version just doesn't work on that platform.
   
  -1.2.6   1.3.3   Old
  +1.2.6   1.3.4   Old
  aix_4.1N   N 1.2.5, 1.3.1
  alphalinux N   N 1.3.0
  aux_3.1N   N 1.3.0
  
  
  

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

[dgaudet]

dgaudet 98/12/23 10:34:27

  Modified:src  CHANGES
   src/modules/standard mod_log_config.c
  Log:
  For %v log ServerName regardless of the UseCanonicalName
  setting (similarly for %p).
  
  Revision  ChangesPath
  1.1177+3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1176
  retrieving revision 1.1177
  diff -u -r1.1176 -r1.1177
  --- CHANGES   1998/12/23 00:36:12 1.1176
  +++ CHANGES   1998/12/23 18:34:19 1.1177
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.4
   
  +  *) For %v log ServerName regardless of the UseCanonicalName
  + setting (similarly for %p).  [Dean Gaudet]
  +
 *) Configure was initializing the variables $OSDIR, $INCDIR and $SHELL
rather late (too late for some invocations of TestCompile).
This improves the make environment available to TestCompile and
  
  
  
  1.69  +3 -2  apache-1.3/src/modules/standard/mod_log_config.c
  
  Index: mod_log_config.c
  ===
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_log_config.c,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- mod_log_config.c  1998/12/02 00:00:16 1.68
  +++ mod_log_config.c  1998/12/23 18:34:25 1.69
  @@ -407,12 +407,13 @@
*/
   static const char *log_virtual_host(request_rec *r, char *a)
   {
  -return ap_get_server_name(r);
  +return r->server->server_hostname;
   }
   
   static const char *log_server_port(request_rec *r, char *a)
   {
  -return ap_psprintf(r->pool, "%u", ap_get_server_port(r));
  +return ap_psprintf(r->pool, "%u",
  + r->server->port ? r->server->port : ap_default_port(r));
   }
   
   static const char *log_child_pid(request_rec *r, char *a)
  
  
  

cvs commit: apache-1.3/src/os/bs2000 bs2login.c

[martin]

martin  98/12/23 03:17:21

  Modified:src/os/bs2000 bs2login.c
  Log:
  Use regular fork() when calling user is not root.
  
  Revision  ChangesPath
  1.7   +10 -1 apache-1.3/src/os/bs2000/bs2login.c
  
  Index: bs2login.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/bs2login.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- bs2login.c1998/10/28 19:26:25 1.6
  +++ bs2login.c1998/12/23 11:17:21 1.7
  @@ -194,9 +194,18 @@
   {
   struct utsname os_version;
   
  +/*
  + * When we run as a normal user (and bypass setuid() and _rini()),
  + * we use the regular fork().
  + */
  +if (getuid() != 0) {
  + return fork();
  +}
  +
   if (uname(&os_version) >= 0)
   {
  - /* Old versions (before XPG4 SPEC1170) don't work with Apache
  + /*
  +  * Old versions (before XPG4 SPEC1170) don't work with Apache
 * and they require a fork(), not a _rfork()
 */
if (strcmp(os_version.release, "01.0A") == 0 ||
  
  
  

cvs commit: apache-1.3/src CHANGES

[martin]

martin  98/12/22 16:36:14

  Modified:src  CHANGES
  Log:
  Document my recent commits
  
  Revision  ChangesPath
  1.1176+10 -0 apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1175
  retrieving revision 1.1176
  diff -u -r1.1175 -r1.1176
  --- CHANGES   1998/12/22 14:51:42 1.1175
  +++ CHANGES   1998/12/23 00:36:12 1.1176
  @@ -1,5 +1,15 @@
   Changes with Apache 1.3.4
   
  +  *) Configure was initializing the variables $OSDIR, $INCDIR and $SHELL
  + rather late (too late for some invocations of TestCompile).
  + This improves the make environment available to TestCompile and
  + the *.module scripts. [Martin Kraemer]
  +
  +  *) The hashbang emulation code in ap_execve.c would interpret
  + #!/hashbang/scripts correctly, but failed to fall back to a
  + standard shell for scripts which did NOT start with #!
  + Now SHELL_PATH is started in these cases. [Martin Kraemer]
  +
 *) PORT: Added the Cyberguard V2 port [Richard Stagg <[EMAIL PROTECTED]>]
PR#3336
   
  
  
  

cvs commit: apache-1.3/src Configure

[martin]

martin  98/12/22 16:26:07

  Modified:src  Configure
  Log:
  Move some of the variables which are added to Makefile.config
  further up to a place where TestCompile can take advantage of them.
  This could improve some of the configuration guessing attempts
  and especially module inititialization routines which are called
  in an early stage of the Configure process.
  
  Revision  ChangesPath
  1.315 +12 -7 apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.314
  retrieving revision 1.315
  diff -u -r1.314 -r1.315
  --- Configure 1998/12/22 15:05:17 1.314
  +++ Configure 1998/12/23 00:26:06 1.315
  @@ -764,6 +764,16 @@
   SUBDIRS="$OSDIR $SUBDIRS"
   
   
  +# Continue building the stub file
  +# Set variables as soon as possible so that TestCompile can use them
  +##
  +echo >>Makefile.config "OSDIR=\$(SRCDIR)/$OSDIR"
  +echo >>Makefile.config "INCDIR=\$(SRCDIR)/include"
  +echo >>Makefile.config "INCLUDES0=-I\$(OSDIR) -I\$(INCDIR)"
  +echo >>Makefile.config "INCLUDES1=$INCLUDES"
  +echo >>Makefile.config "SHELL=$SHELL"
  +
  +
   ## And adjust/override WANTHSREGEX as needed
   ##
   if [ "$RULE_WANTHSREGEX" = "default" ]; then
  @@ -1374,7 +1384,7 @@
   ## the module) is like this:
   ##
   ##  1 If extension is not given or is .c, assume .o was given and goto 3
  -##  2 If extension if .module, go to D1
  +##  2 If extension is .module, go to D1
   ##  3 If extension is .o, look for a corresponding .c file and if
   ##  found, go to C1
   ##  4 If no .c file was found, look for a .module file (Apache module
  @@ -1461,7 +1471,7 @@
$CAT $modbase.module > $tmpfile2
else
if [ -f $modbase.c ] ; then
  - # Guess module structure name in case there is not
  + # Guess module structure name in case there is no
# module definition in this file
modname=`egrep '^module .*;' $modbase.c | head -1 |\
sed 's/^module.*[   ][  ]*//' | \
  @@ -1751,16 +1761,11 @@
   ## can only alter $LIBS
   ##
   echo "CFLAGS1=$CFLAGS">> Makefile.config
  -echo "OSDIR=\$(SRCDIR)/$OSDIR">> Makefile.config
  -echo "INCDIR=\$(SRCDIR)/include" >>Makefile.config
  -echo "INCLUDES0=-I\$(OSDIR) -I\$(INCDIR)">> Makefile.config
  -echo "INCLUDES1=$INCLUDES">> Makefile.config
   echo "LIBS_SHLIB=$LIBS_SHLIB">> Makefile.config
   echo "LDFLAGS1=$LDFLAGS">> Makefile.config
   echo "MFLAGS_STATIC=$MFLAGS_STATIC">> Makefile.config
   echo "REGLIB=$REGLIB">> Makefile.config
   echo "RANLIB=$RANLIB">> Makefile.config
  -echo "SHELL=$SHELL">> Makefile.config
   
   
   ## Some OS-related stuff for the DSO mechanism:
  
  
  

cvs commit: apache-1.3/src/ap ap_execve.c

[martin]

martin  98/12/22 16:20:59

  Modified:src/ap   ap_execve.c
  Log:
  The hashbang emulation code was "forgetting" to use the default shell
  for scripts without a "#!/interpreter" staring line. Now it behaves
  like a regular shell or a regular OS's execve() implementation.
  
  Revision  ChangesPath
  1.10  +59 -17apache-1.3/src/ap/ap_execve.c
  
  Index: ap_execve.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/ap/ap_execve.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ap_execve.c   1998/03/31 12:52:10 1.9
  +++ ap_execve.c   1998/12/23 00:20:58 1.10
  @@ -126,7 +126,8 @@
   }
   va_end(adummy);
   
  -argv = (char **) malloc((argc + 2) * sizeof(*argv));
  +if ((argv = (char **) malloc((argc + 2) * sizeof(*argv))) == NULL)
  + return -1;
   
   /* Pass two --- copy the argument strings into the result space */
   va_start(adummy, argv0);
  @@ -143,10 +144,27 @@
   return ret;
   }
   
  +/* Count number of entries in vector "args", including the trailing NULL 
entry
  + */
  +static int
  +count_args(const char **args)
  +{
  +int i;
  +for (i = 0; args[i] != NULL; ++i) {
  + continue;
  +}
  +return i+1;
  +}
  +
  +/* Emulate the execve call, respecting a #!/interpreter line if present.
  + * On "real" unixes, the kernel does this.
  + * We have to fiddle with the argv array to make it work on platforms
  + * which don't support the "hashbang" interpreter line by default.
  + */
   int ap_execve(const char *filename, const char *argv[],
  const char *envp[])
   {
  -const char *argv0 = argv[0];
  +const char **script_argv;
   extern char **environ;
   
   if (envp == NULL) {
  @@ -174,26 +192,50 @@
* ELOOP  filename contains a circular reference (i.e., via a symbolic 
link)
*/
   
  -if (errno == ENOEXEC
  -/* Probably a script.
  - * Have a look; if there's a "#!" header then try to emulate
  - * the feature found in all modern OS's:
  - * Interpret the line following the #! as a command line
  - * in shell style.
  - */
  - && (argv = hashbang(filename, argv)) != NULL) {
  +if (errno == ENOEXEC) {
  + /* Probably a script.
  +  * Have a look; if there's a "#!" header then try to emulate
  +  * the feature found in all modern OS's:
  +  * Interpret the line following the #! as a command line
  +  * in shell style.
  +  */
  + if ((script_argv = hashbang(filename, argv)) != NULL) {
  +
  + /* new filename is the interpreter to call */
  + filename = script_argv[0];
  +
  + /* Restore argv[0] as on entry */
  + if (argv[0] != NULL) {
  + script_argv[0] = argv[0];
  + }
   
  - /* new filename is the interpreter to call */
  - filename = argv[0];
  + execve(filename, script_argv, envp);
   
  - /* Restore argv[0] as on entry */
  - if (argv0 != NULL) {
  - argv[0] = argv0;
  + free(script_argv);
}
  + /*
  +  * Script doesn't start with a hashbang line!
  +  * So, try to have the default shell execute it.
  +  * For this, the size of argv must be increased by one
  +  * entry: the shell's name. The remaining args are appended.
  +  */
  + else {
  + int i = count_args(argv) + 1;   /* +1 for leading SHELL_PATH */
  +
  + if ((script_argv = malloc(sizeof(*script_argv) * i)) == NULL)
  + return -1;
  +
  + script_argv[0] = SHELL_PATH;
  +
  + while (i > 0) {
  + script_argv[i] = argv[i-1];
  + --i;
  + }
   
  - execve(filename, argv, envp);
  + execve(SHELL_PATH, script_argv, envp);
   
  - free(argv);
  + free(script_argv);
  + }
   }
   return -1;
   }
  
  
  

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

[martin]

martin  98/12/22 16:14:11

  Modified:src/main http_main.c
  Log:
  Fix the SHARED_CORE_BOOTSTRAP main routine. It would not compile
  after recent changes because the undefined variable
  ap_server_argv0 was referenced.
  
  Revision  ChangesPath
  1.413 +1 -1  apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.412
  retrieving revision 1.413
  diff -u -r1.412 -r1.413
  --- http_main.c   1998/12/17 15:09:31 1.412
  +++ http_main.c   1998/12/23 00:14:10 1.413
  @@ -6130,7 +6130,7 @@
   if (execve(prog, argv, envp) == -1) {
fprintf(stderr, 
"%s: Unable to exec Shared Core Executable Program `%s'\n",
  - ap_server_argv0, prog);
  + argv[0], prog);
return 1;
   }
   else