cvs commit: apache-apr/pthreads/src/os/win32 os.h

[manoj]

manoj   99/02/04 12:31:27

  Modified:pthreads/src/include multithread.h
   pthreads/src/modules/standard mod_mime_magic.c
   pthreads/src/os/unix multithread.c os-inline.c os.h
   pthreads/src/os/win32 os.h
  Log:
  Minor cleanup of spawnvp operations. No functionality change.
  
  Revision  ChangesPath
  1.3   +0 -1  apache-apr/pthreads/src/include/multithread.h
  
  Index: multithread.h
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/include/multithread.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- multithread.h 1999/01/27 16:15:46 1.2
  +++ multithread.h 1999/02/04 20:31:19 1.3
  @@ -55,7 +55,6 @@
   API_EXPORT(int) ap_acquire_mutex(mutex *mutex_id);
   API_EXPORT(int) ap_release_mutex(mutex *mutex_id);
   API_EXPORT(void) ap_destroy_mutex(mutex *mutex_id);
  -API_EXPORT(int) ap_spawnvp(const char *, char *const []);
   #endif /* ndef MULTITHREAD */
   
   #ifdef __cplusplus
  
  
  
  1.4   +1 -5  apache-apr/pthreads/src/modules/standard/mod_mime_magic.c
  
  Index: mod_mime_magic.c
  ===
  RCS file: 
/home/cvs/apache-apr/pthreads/src/modules/standard/mod_mime_magic.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- mod_mime_magic.c  1999/02/03 07:49:02 1.3
  +++ mod_mime_magic.c  1999/02/04 20:31:20 1.4
  @@ -2145,12 +2145,8 @@
close(STDERR_FILENO);
   }
   
  -#if defined(WIN32)
  -child_pid = spawnvp(compr[parm->method].argv[0],
  +child_pid = ap_spawnvp(compr[parm->method].argv[0],
compr[parm->method].argv);
  -#else
  -child_pid = ap_spawnvp(compr[parm->method].argv[0], 
compr[parm->method].argv);
  -#endif
   if (child_pid == -1)
   ap_log_rerror(APLOG_MARK, APLOG_ERR, parm->r,
MODNAME ": could not execute `%s'.",
  
  
  
  1.4   +0 -13 apache-apr/pthreads/src/os/unix/multithread.c
  
  Index: multithread.c
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/os/unix/multithread.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- multithread.c 1999/02/03 17:50:14 1.3
  +++ multithread.c 1999/02/04 20:31:22 1.4
  @@ -30,16 +30,3 @@
   pthread_mutex_destroy((pthread_mutex_t *) mutex_id);
   }
   
  -API_EXPORT(int) ap_spawnvp(const char *file, char *const argv[])
  -{
  -int pid;
  -
  -if ((pid = fork()) == -1) {
  -return pid;
  -} else if (pid == 0) {
  -if (execvp(file, argv) == -1)
  - return -1;
  -} else 
  -return pid;
  -}
  -
  
  
  
  1.2   +14 -0 apache-apr/pthreads/src/os/unix/os-inline.c
  
  Index: os-inline.c
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/os/unix/os-inline.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -u -r1.1 -r1.2
  --- os-inline.c   1999/01/21 23:08:40 1.1
  +++ os-inline.c   1999/02/04 20:31:23 1.2
  @@ -29,3 +29,17 @@
   {
 return file[0] == '/';
   }
  +
  +INLINE int ap_spawnvp(const char *file, char *const argv[])
  +{
  +int pid;
  +
  +if ((pid = fork()) == -1) {
  +return pid;
  +} else if (pid == 0) {
  +if (execvp(file, argv) == -1)
  +return -1;
  +} else 
  +return pid;
  +}
  +
  
  
  
  1.2   +6 -0  apache-apr/pthreads/src/os/unix/os.h
  
  Index: os.h
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/os/unix/os.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -u -r1.1 -r1.2
  --- os.h  1999/01/21 23:08:40 1.1
  +++ os.h  1999/02/04 20:31:23 1.2
  @@ -94,6 +94,12 @@
   #endif
   
   /*
  + * spawn = fork + exec on unix
  + */
  +
  +extern int ap_spawnvp(const char *, char *const []);
  +
  +/*
* Do not use native AIX DSO support
*/
   #ifdef AIX
  
  
  
  1.2   +3 -0  apache-apr/pthreads/src/os/win32/os.h
  
  Index: os.h
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/os/win32/os.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -u -r1.1 -r1.2
  --- os.h  1999/01/21 23:08:41 1.1
  +++ os.h  1999/02/04 20:31:25 1.2
  @@ -13,6 +13,9 @@
   /* char *crypt(const char *pw, const char *salt); */
   #define crypt(buf,salt)  (buf)
   
  +/* Use the Windows built-in spawnvp */
  +#define ap_spawnvp(file, argv) (spawnvp(file, argv))
  +
   /* Although DIR_TYPE is dirent (see nt/readdir.h) we need direct.h for
  chdir() */
   #include 
  
  
  

cvs commit: apache-1.3/htdocs/manual/misc FAQ.html

[coar]

coar99/02/04 10:15:07

  Modified:htdocs/manual/misc FAQ.html
  Log:
Fix a typo..
  
  PR:   3831
  Submitted by: William Lipp <[EMAIL PROTECTED]>
  Reviewed by:  Ken Coar
  
  Revision  ChangesPath
  1.137 +2 -2  apache-1.3/htdocs/manual/misc/FAQ.html
  
  Index: FAQ.html
  ===
  RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/FAQ.html,v
  retrieving revision 1.136
  retrieving revision 1.137
  diff -u -r1.136 -r1.137
  --- FAQ.html  1999/01/27 03:36:37 1.136
  +++ FAQ.html  1999/02/04 18:15:05 1.137
  @@ -14,7 +14,7 @@
 
 Apache Server Frequently Asked Questions
 
  -  $Revision: 1.136 $ ($Date: 1999/01/27 03:36:37 $)
  +  $Revision: 1.137 $ ($Date: 1999/02/04 18:15:05 $)
 
 
 The latest version of this FAQ is always available from the main
  @@ -1132,7 +1132,7 @@
 Why does Apache send a cookie on every response?

 
  -  Apache does not send automatically send a cookie on every
  +  Apache does not automatically send a cookie on every
 response, unless you have re-compiled it with the
 mod_usertrack
 module, and specifically enabled it with the
  
  
  

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

[manoj]

manoj   99/02/03 22:52:41

  Modified:pthreads/src/main http_config.c http_protocol.c
  Log:
  Temporarily fix bug where server threads would lock up after a single
  request under Linux. LinuxThreads uses SIGUSR1 (and SIGUSR2) so they aren't
  available to us. We need to find an alternate means to get graceful
  restarts kicked off if we want to support Linux 2.0 kernel threads.
  
  Revision  ChangesPath
  1.3   +5 -0  apache-apr/pthreads/src/main/http_config.c
  
  Index: http_config.c
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/main/http_config.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- http_config.c 1999/01/22 16:10:55 1.2
  +++ http_config.c 1999/02/04 06:52:38 1.3
  @@ -1503,9 +1503,14 @@
   #ifdef SIGHUP
   signal(SIGHUP, SIG_IGN);
   #endif
  +/* XXX - LinuxThreads uses SIGUSR1, so we can't muck with it. Bummer. We
  + * need to find another way to do graceful restarts if we want to support
  + * kernel threads with Linux 2.0 (2.2 is supposed to fix this) - mvsk */
  +#ifndef LINUX
   #ifdef SIGUSR1
   signal(SIGUSR1, SIG_IGN);
   #endif
  +#endif /* ndef LINUX */
   
   for (m = top_module; m; m = m->next)
if (m->child_exit)
  
  
  
  1.2   +6 -0  apache-apr/pthreads/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/main/http_protocol.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -u -r1.1 -r1.2
  --- http_protocol.c   1999/01/21 23:08:33 1.1
  +++ http_protocol.c   1999/02/04 06:52:39 1.2
  @@ -675,9 +675,15 @@
   }
   }
   /* we've probably got something to do, ignore graceful restart requests 
*/
  +
  +/* XXX - LinuxThreads uses SIGUSR1, so we can't muck with it. Bummer. We
  + * need to find another way to do graceful restarts if we want to support
  + * kernel threads with Linux 2.0 (2.2 is supposed to fix this) - mvsk */
  +#ifndef LINUX
   #ifdef SIGUSR1
   signal(SIGUSR1, SIG_IGN);
   #endif
  +#endif /* ndef LINUX */
   
   ap_bsetflag(conn->client, B_SAFEREAD, 0);
   
  
  
  

cvs commit: apache-apr/pthreads/src Configure

[manoj]

manoj   99/02/03 16:26:00

  Modified:pthreads/src Configure
  Log:
  Make this compile out of the box on Linux.
  
  Revision  ChangesPath
  1.2   +1 -1  apache-apr/pthreads/src/Configure
  
  Index: Configure
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/Configure,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -u -r1.1 -r1.2
  --- Configure 1999/01/21 23:08:31 1.1
  +++ Configure 1999/02/04 00:25:56 1.2
  @@ -430,7 +430,7 @@
DEF_WANTHSREGEX=yes
OS='Linux'
CFLAGS="$CFLAGS -DLINUX=2"
  - LIBS="$LIBS -lm"
  + LIBS="$LIBS -lm -lpthread"
;;
   *-linux1)
DEF_WANTHSREGEX=yes