cvs commit: apache-1.3/src Configure

1999-08-16 Thread randy
randy   99/08/15 17:49:09

  Modified:src  Configure
  Log:
  Make HPUX use the default .so extension for DSO modules.
  
  The right way to do this is probably to propagate the use of SHLIB_EXT_NAME
  throughout the configuration process, but we have used .so forever for HPUX
  without any problem and a change of the code to do this The Right Way would
  be too risky at this late stage.
  
  Problem solved. Lets roll.
  
  Revision  ChangesPath
  1.369 +0 -2  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.368
  retrieving revision 1.369
  diff -u -r1.368 -r1.369
  --- Configure 1999/08/09 17:46:25 1.368
  +++ Configure 1999/08/16 00:49:08 1.369
  @@ -1217,7 +1217,6 @@
LDFLAGS_SHLIB=-b
LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT=-Wl,-E -Wl,-B,deferred
  - SHLIB_SUFFIX_NAME=sl
;;
*-hp-hpux10.*|*-hp-hpux11.*)
case $CC in
  @@ -1227,7 +1226,6 @@
LDFLAGS_SHLIB=-b
LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT=-Wl,-E -Wl,-B,deferred -Wl,+s
  - SHLIB_SUFFIX_NAME=sl
;;
*-ibm-aix*)
case $CC in
  
  
  


cvs commit: apache-1.3 STATUS

1999-08-16 Thread martin
martin  99/08/16 02:19:49

  Modified:.STATUS
  Log:
  Go for 1.3.9
  
  Revision  ChangesPath
  1.744 +2 -2  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.743
  retrieving revision 1.744
  diff -u -r1.743 -r1.744
  --- STATUS1999/08/15 14:38:32 1.743
  +++ STATUS1999/08/16 09:19:48 1.744
  @@ -1,11 +1,11 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/08/15 14:38:32 $]
  +  Last modified at [$Date: 1999/08/16 09:19:48 $]
   
   Release:
   
   1.3.9-dev: COUNTDOWN started at 08/14 2:30am PDT
  Tarball planned for Sunday morning unless problems found.
  -   Votes for rolling: Ralf +1
  +   Votes for rolling: Ralf +1, Martin +1
   
   1.3.8: Not released.
   1.3.7: Not released.
  
  
  


cvs commit: apache-1.3 STATUS

1999-08-16 Thread fielding
fielding99/08/16 02:52:26

  Modified:.STATUS
  Log:
  I knew I forgot something ...
  
  Revision  ChangesPath
  1.745 +5 -5  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.744
  retrieving revision 1.745
  diff -u -r1.744 -r1.745
  --- STATUS1999/08/16 09:19:48 1.744
  +++ STATUS1999/08/16 09:52:25 1.745
  @@ -1,11 +1,11 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/08/16 09:19:48 $]
  +  Last modified at [$Date: 1999/08/16 09:52:25 $]
   
   Release:
   
  -1.3.9-dev: COUNTDOWN started at 08/14 2:30am PDT
  -   Tarball planned for Sunday morning unless problems found.
  -   Votes for rolling: Ralf +1, Martin +1
  +1.3.9-dev: COUNTDOWN restarted at 08/15 3:00pm PDT
  +   Tarball planned for Monday morning unless problems found.
  +   Votes for rolling: Ralf +1, Martin +1, Roy +1
   
   1.3.8: Not released.
   1.3.7: Not released.
  @@ -27,7 +27,7 @@
 libstandard.a and adding .so objects to the libstandard.a starting
 with mod_vhost_alias.so.
   Message-ID: [EMAIL PROTECTED]
  - Status: Randy needs someone familiar with HPUX to look at it.
  + Status: Randy committed a temporary fix
   
   * long pathnames with many components and no AllowOverride None
 Workaround is to define Directory / with AllowOverride None,
  
  
  


cvs commit: apache-1.3/src/modules/experimental mod_auth_digest.c

1999-08-16 Thread martin
martin  99/08/16 04:06:15

  Modified:src/modules/experimental mod_auth_digest.c
  Log:
  Cosmetics: echo output now looks like other modules' output
  
  Revision  ChangesPath
  1.7   +2 -2  apache-1.3/src/modules/experimental/mod_auth_digest.c
  
  Index: mod_auth_digest.c
  ===
  RCS file: 
/export/home/cvs/apache-1.3/src/modules/experimental/mod_auth_digest.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_auth_digest.c 1999/08/14 08:35:52 1.6
  +++ mod_auth_digest.c 1999/08/16 11:06:14 1.7
  @@ -107,10 +107,10 @@
fi
   fi
   if [ $RULE_DEV_RANDOM = truerand ]; then
  - echo o mod_auth_digest using truerand library (-lrand) for the 
random seed
  + echo   using truerand library (-lrand) for the random seed
LIBS=$LIBS -L/usr/local/lib -lrand
   else
  - echo o mod_auth_digest using $RULE_DEV_RANDOM for the random seed
  + echo   using $RULE_DEV_RANDOM for the random seed
CFLAGS=$CFLAGS -DDEV_RANDOM=$RULE_DEV_RANDOM
   fi
   
  
  
  


cvs commit: apache-1.3 STATUS

1999-08-16 Thread jim
jim 99/08/16 09:27:06

  Modified:.STATUS
  Log:
  Fer de record
  
  Revision  ChangesPath
  1.747 +3 -2  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.746
  retrieving revision 1.747
  diff -u -r1.746 -r1.747
  --- STATUS1999/08/16 16:06:48 1.746
  +++ STATUS1999/08/16 16:27:02 1.747
  @@ -1,11 +1,12 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/08/16 16:06:48 $]
  +  Last modified at [$Date: 1999/08/16 16:27:02 $]
   
   Release:
   
   1.3.9-dev: COUNTDOWN restarted at 08/15 3:00pm PDT
  Tarball planned for Monday morning unless problems found.
  -   Votes for rolling: Ralf +1, Martin +1, Roy +1, Randy +1
  +   Votes for rolling: Ralf +1, Martin +1, Roy +1, Randy +1,
  +   Jim +1
   
   1.3.8: Not released.
   1.3.7: Not released.
  
  
  


cvs commit: apache-1.3/src/os/win32 registry.c

1999-08-16 Thread coar
coar99/08/16 10:58:15

  Modified:src/include httpd.h
   src/os/win32 registry.c
  Log:
Bumping the version to 1.3.9 final.
  
  Revision  ChangesPath
  1.294 +2 -2  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.293
  retrieving revision 1.294
  diff -u -r1.293 -r1.294
  --- httpd.h   1999/08/14 08:35:47 1.293
  +++ httpd.h   1999/08/16 17:57:53 1.294
  @@ -419,7 +419,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha 
*/
   
  -#define SERVER_BASEVERSION Apache/1.3.9-dev/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION Apache/1.3.9/* SEE COMMENTS ABOVE */
   #define SERVER_VERSION  SERVER_BASEVERSION
   enum server_token_type {
   SrvTk_MIN,   /* eg: Apache/1.3.0 */
  @@ -435,7 +435,7 @@
* Always increases along the same track as the source branch.
* For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'.
*/
  -#define APACHE_RELEASE 10309000
  +#define APACHE_RELEASE 10309100
   
   #define SERVER_PROTOCOL HTTP/1.1
   #ifndef SERVER_SUPPORT
  
  
  
  1.25  +1 -1  apache-1.3/src/os/win32/registry.c
  
  Index: registry.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- registry.c1999/08/09 17:46:32 1.24
  +++ registry.c1999/08/16 17:58:13 1.25
  @@ -38,7 +38,7 @@
   
   #define VENDOR   Apache Group
   #define SOFTWARE Apache
  -#define VERSION  1.3.9 dev
  +#define VERSION  1.3.9
   
   #define REGKEY SOFTWARE\\ VENDOR \\ SOFTWARE \\ VERSION
   
  
  
  


cvs commit: apache-1.3 STATUS

1999-08-16 Thread wsanchez
wsanchez99/08/16 10:59:41

  Modified:.STATUS
  Log:
  Add Rhapsody to binaries list.
  
  Revision  ChangesPath
  1.748 +4 -4  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.747
  retrieving revision 1.748
  diff -u -r1.747 -r1.748
  --- STATUS1999/08/16 16:27:02 1.747
  +++ STATUS1999/08/16 17:59:39 1.748
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/08/16 16:27:02 $]
  +  Last modified at [$Date: 1999/08/16 17:59:39 $]
   
   Release:
   
  @@ -485,11 +485,14 @@
m68k-apple-aux3.1.1   no  Jim Jagielski
m88k-dg-dgux5.4R2.01  no  Sameer parekh
m88k-next-nextno  Rob Hartill
  + mips-dec-ultrix4.4no  Sameer Parekh
  + mips-unknown-linuxno  Lars Eilebrecht
mips-sgi-irix5.3  no  Mark Imbrianco
mips-sgi-irix6.2  no  Lars Eilebrecht
mips-sgi-irix6.4  no  Lars Eilebrecht
mips-sni-svr4 no  Martin Kraemer
OS/2  no  Brian Havard
  + powerpc-apple-rhapsody5.3 no  Wilfredo Sanchez
rs6000-ibm-aix3.2.5   no  Sameer Parekh
rs6000-ibm-aix4.1 no  Lars Eilebrecht
rs6000-ibm-aix4.2 no  Bill Stoddard
  @@ -500,6 +503,3 @@
sparc-sun-sunos4.1.4  no  Lars Eilebrecht, Michael Douglass
sparc-sun-sunos4.1.3_U1   no  Sameer Parekh
sparc-unknown-linux   no  Lars Eilebrecht
  - mips-dec-ultrix4.4no  Sameer Parekh
  - mips-unknown-linuxno  Lars Eilebrecht
  -
  
  
  


cvs commit: apache-1.3/src Configure CHANGES

1999-08-16 Thread coar
coar99/08/16 11:55:47

  Modified:src/include httpd.h
   src/os/win32 registry.c
   src  Configure CHANGES
  Log:
Advance everything to 1.3.10-dev.
  
  Revision  ChangesPath
  1.295 +2 -2  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.294
  retrieving revision 1.295
  diff -u -r1.294 -r1.295
  --- httpd.h   1999/08/16 17:57:53 1.294
  +++ httpd.h   1999/08/16 18:55:31 1.295
  @@ -419,7 +419,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha 
*/
   
  -#define SERVER_BASEVERSION Apache/1.3.9/* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION Apache/1.3.10-dev   /* SEE COMMENTS ABOVE */
   #define SERVER_VERSION  SERVER_BASEVERSION
   enum server_token_type {
   SrvTk_MIN,   /* eg: Apache/1.3.0 */
  @@ -435,7 +435,7 @@
* Always increases along the same track as the source branch.
* For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'.
*/
  -#define APACHE_RELEASE 10309100
  +#define APACHE_RELEASE 1031
   
   #define SERVER_PROTOCOL HTTP/1.1
   #ifndef SERVER_SUPPORT
  
  
  
  1.26  +1 -1  apache-1.3/src/os/win32/registry.c
  
  Index: registry.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- registry.c1999/08/16 17:58:13 1.25
  +++ registry.c1999/08/16 18:55:38 1.26
  @@ -38,7 +38,7 @@
   
   #define VENDOR   Apache Group
   #define SOFTWARE Apache
  -#define VERSION  1.3.9
  +#define VERSION  1.3.10 dev
   
   #define REGKEY SOFTWARE\\ VENDOR \\ SOFTWARE \\ VERSION
   
  
  
  
  1.370 +1 -1  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.369
  retrieving revision 1.370
  diff -u -r1.369 -r1.370
  --- Configure 1999/08/16 00:49:08 1.369
  +++ Configure 1999/08/16 18:55:44 1.370
  @@ -1735,7 +1735,7 @@
#select the special subtarget for shared core generation
SUBTARGET=target_shared
#determine additional suffixes for libhttpd.so
  - V=1 R=3 P=9
  + V=1 R=3 P=10
if [ x$SHLIB_SUFFIX_DEPTH = x0 ]; then
SHLIB_SUFFIX_LIST=
fi
  
  
  
  1.1423+2 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1422
  retrieving revision 1.1423
  diff -u -r1.1422 -r1.1423
  --- CHANGES   1999/08/14 09:21:15 1.1422
  +++ CHANGES   1999/08/16 18:55:45 1.1423
  @@ -1,3 +1,5 @@
  +Changes with Apache 1.3.10
  +
   Changes with Apache 1.3.9
   
 *) Remove bogus error message when a redirect doesn't set Location.
  
  
  


cvs commit: apache-apr/apr/file_io/unix filedup.c fileio.h open.c readwrite.c seek.c

1999-08-16 Thread rbb
rbb 99/08/16 12:10:20

  Modified:apr/file_io/unix filedup.c fileio.h open.c readwrite.c
seek.c
  Log:
  Get the buffered file I/O stuff in APR for unix finally.  This has been on
  my TODO list for a while, but it's off now.
  
  Revision  ChangesPath
  1.16  +18 -0 apache-apr/apr/file_io/unix/filedup.c
  
  Index: filedup.c
  ===
  RCS file: /home/cvs/apache-apr/apr/file_io/unix/filedup.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- filedup.c 1999/06/02 18:44:33 1.15
  +++ filedup.c 1999/08/16 19:10:11 1.16
  @@ -67,6 +67,7 @@
*/ 
   ap_status_t ap_dupfile(struct file_t *old_file, struct file_t **new_file)
   {
  +char *buf_oflags;
   (*new_file) = (struct file_t *)ap_palloc(old_file-cntxt,
  sizeof(struct file_t));
   
  @@ -74,7 +75,24 @@
   return APR_ENOMEM;
   }
   (*new_file)-cntxt = old_file-cntxt; 
  +if (old_file-buffered) {
  +switch (old_file-oflags) {
  +case O_RDONLY:
  +buf_oflags = r;
  +break;
  +case O_WRONLY:
  +buf_oflags = w;
  +break;
  +case O_RDWR:
  +buf_oflags = r+;
  +break;
  +}
  +(*new_file)-filehand = freopen(old_file-fname, buf_oflags, 
  +old_file-filehand); 
  +}
  +else {
   (*new_file)-filedes = dup(old_file-filedes); 
  +}
   (*new_file)-fname = ap_pstrdup(old_file-cntxt, old_file-fname);
   (*new_file)-buffered = old_file-buffered;
   (*new_file)-protection = old_file-protection;
  
  
  
  1.10  +2 -0  apache-apr/apr/file_io/unix/fileio.h
  
  Index: fileio.h
  ===
  RCS file: /home/cvs/apache-apr/apr/file_io/unix/fileio.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- fileio.h  1999/08/04 17:51:53 1.9
  +++ fileio.h  1999/08/16 19:10:12 1.10
  @@ -69,7 +69,9 @@
   struct file_t {
   ap_context_t *cntxt;
   int filedes;
  +FILE *filehand;
   char * fname;
  +int oflags;
   int buffered;
   int stated;
   int eof_hit;
  
  
  
  1.34  +36 -1 apache-apr/apr/file_io/unix/open.c
  
  Index: open.c
  ===
  RCS file: /home/cvs/apache-apr/apr/file_io/unix/open.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- open.c1999/08/04 17:51:54 1.33
  +++ open.c1999/08/16 19:10:13 1.34
  @@ -65,7 +65,15 @@
   ap_status_t file_cleanup(void *thefile)
   {
   struct file_t *file = thefile;
  -if (close(file-filedes) == 0) {
  +int rv;
  +if (file-buffered) {
  +rv = fclose(file-filehand);
  +}
  +else {
  +rv = close(file-filedes);
  +}
  +
  +if (rv == 0) {
   file-filedes = -1;
   return APR_SUCCESS;
   }
  @@ -100,10 +108,12 @@
   int oflags = 0;
   struct stat info;
   mode_t mode = get_fileperms(perm);
  +char *buf_oflags;
   
   (*new) = (struct file_t *)ap_palloc(cont, sizeof(struct file_t));
   
   (*new)-cntxt = cont;
  +(*new)-oflags = oflags;
   
   if ((flag  APR_READ)  (flag  APR_WRITE)) {
   oflags = O_RDWR;
  @@ -154,6 +164,25 @@
  (*new)-eof_hit = 1;
   return errno;
   }
  +
  +if ((*new)-buffered) {
  +switch (oflags) {
  +case O_RDONLY: 
  +buf_oflags = r;
  +break;
  +case O_WRONLY:
  +buf_oflags = w;
  +break;
  +case O_RDWR:
  +buf_oflags = r+;
  +break;
  +}
  +(*new)-filehand = fdopen((*new)-filedes, buf_oflags);
  +if ((*new)-filehand == NULL) {
  +file_cleanup(*new);
  +return errno; 
  +}
  +}
   (*new)-stated = 0;  /* we haven't called stat for this file yet. */
   (*new)-eof_hit = 0;
   ap_register_cleanup((*new)-cntxt, (void *)(*new), file_cleanup, NULL);
  @@ -239,6 +268,12 @@
   ap_status_t ap_eof(ap_file_t *fptr)
   {
   char ch;
  +if (fptr-buffered) {
  +if (feof(fptr-filehand) == 0) {
  +return APR_SUCCESS;
  +}
  +return APR_EOF;
  +}
   if (fptr-eof_hit == 1) {
   return APR_EOF;
   }
  
  
  
  1.15  +31 -4 apache-apr/apr/file_io/unix/readwrite.c
  
  Index: readwrite.c
  ===
  RCS file: /home/cvs/apache-apr/apr/file_io/unix/readwrite.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- readwrite.c   1999/08/04 

cvs commit: apache-2.0/mpm/src/main http_core.c

1999-08-16 Thread stoddard
stoddard99/08/16 15:25:39

  Modified:mpm/src/main http_core.c
  Log:
  Win32: Open files as binary. Waiting for APR...
  
  Revision  ChangesPath
  1.22  +1 -1  apache-2.0/mpm/src/main/http_core.c
  
  Index: http_core.c
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/main/http_core.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- http_core.c   1999/08/15 00:15:43 1.21
  +++ http_core.c   1999/08/16 22:25:38 1.22
  @@ -2519,7 +2519,7 @@

   #if defined(OS2) || defined(WIN32)
   /* Need binary mode for OS/2 */
  -fd = ap_popenf(r-pool, r-filename, O_RDONLY, 0);
  +fd = ap_popenf(r-pool, r-filename, O_RDONLY | O_BINARY, 0);
   #else
   fd = ap_popenf(r-pool, r-filename, O_RDONLY, 0);
   #endif
  
  
  


cvs commit: apache-2.0/mpm/src/modules/mpm/winnt winnt.c

1999-08-16 Thread stoddard
stoddard99/08/16 15:36:26

  Modified:mpm/src/modules/mpm/winnt winnt.c
  Log:
  Server will build and serve static pages (page size  bufsize) with the 
appropriate makefile hacks (remove mod_cgi, mod_include, etc.).
  
  Revision  ChangesPath
  1.6   +33 -41apache-2.0/mpm/src/modules/mpm/winnt/winnt.c
  
  Index: winnt.c
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/winnt/winnt.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- winnt.c   1999/08/13 19:45:26 1.5
  +++ winnt.c   1999/08/16 22:36:25 1.6
  @@ -113,7 +113,7 @@
   mutex *start_mutex;
   int my_pid;
   int parent_pid;
  -int listenmaxfd;
  +int listenmaxfd = -1;
   
   /* a clean exit from a child with proper cleanup 
  static void clean_child_exit(int code) __attribute__ ((noreturn)); 
  @@ -362,11 +362,20 @@
   ap_listen_rec *lr;
   int num_listeners = 0;
   
  +/* Setup the listeners */
  +listenmaxfd = -1;
  +FD_ZERO(listenfds);
  +
   if (ap_listen_open(pconf, s-port)) {
  return 0;
   }
   for (lr = ap_listeners; lr; lr = lr-next) {
   num_listeners++;
  +if (lr-fd = 0) {
  +FD_SET(lr-fd, listenfds);
  +if (lr-fd  listenmaxfd)
  +listenmaxfd = lr-fd;
  +}
   }
   
   head_listener = ap_listeners;
  @@ -671,7 +680,7 @@
   int csd = -1;
   ap_iol *iol;
   int srv = 0;
  -
  +int conn_id = 1;
   /* Note: current_conn used to be a defined at file scope as follows... 
Since the signal code is
  not being used in WIN32, make the variable local */
   //static APACHE_TLS conn_rec *volatile current_conn;
  @@ -776,7 +785,8 @@
   
current_conn = ap_new_connection(ptrans, server_conf, conn_io,
(struct sockaddr_in *) sa_client,
  - (struct sockaddr_in *) sa_server);
  + (struct sockaddr_in *) sa_server,
  + conn_id);
   
   ap_process_connection(current_conn);
   }
  @@ -896,12 +906,8 @@
   
   pchild = ap_make_sub_pool(pconf);
   
  -//ap_standalone = 1;
  -//sd = -1; ?? this variable is global in 1.3.x!
   nthreads = ap_threads_per_child;
   
  -my_pid = getpid();
  -
   //ap_restart_time = time(NULL);
   
   //reinit_scoreboard(pconf);
  @@ -1077,7 +1083,6 @@
   destroy_semaphore(allowed_globals.jobsemaphore);
   ap_destroy_mutex(allowed_globals.jobmutex);
   
  -//ap_child_exit_modules(pconf, server_conf);
   ap_destroy_pool(pchild);
   
   //cleanup_scoreboard();
  @@ -1139,7 +1144,6 @@
int rv;
char buf[1024];
char *pCommand;
  - char *pEnvBlock;
   
STARTUPINFO si;   /* Filled in prior to call to CreateProcess */
PROCESS_INFORMATION pi;   /* filled in on call to CreateProces */
  @@ -1179,7 +1183,6 @@
return -1;
}
   
  -// pEnvBlock = ap_psprintf(p, AP_PARENT_PID=%d\0,parent_pid);
SetEnvironmentVariable(AP_PARENT_PID,ap_psprintf(p,%d,parent_pid));
   
/* Give the read in of the pipe (hPipeRead) to the child as stdin. The 
  @@ -1194,8 +1197,8 @@
   
if (!CreateProcess(NULL, pCommand, NULL, NULL, 
   TRUE,   /* Inherit handles */
  -CREATE_SUSPENDED,   /* Creation flags */ // checkout 
DETACHED_PROCESS here and in the CGI
  -NULL,  /* Environment block */
  +CREATE_SUSPENDED,   /* Creation flags */
  +NULL,   /* Environment block */
   NULL,
   si, pi)) {
ap_log_error(APLOG_MARK, APLOG_WIN32ERROR | APLOG_CRIT, server_conf,
  @@ -1220,7 +1223,7 @@
   
/* Create the exit_event, apCHILD_PID */
kill_event = CreateEvent(NULL, TRUE, FALSE, 
  -  ap_psprintf(pconf,ap%d, pi.dwProcessId));
  +  ap_psprintf(pconf,apC%d, 
pi.dwProcessId)); // exit_event_name...
if (!kill_event) {
ap_log_error(APLOG_MARK, APLOG_WIN32ERROR | APLOG_CRIT, 
server_conf,
 Parent: Could not create exit event for child 
process);
  @@ -1450,7 +1453,7 @@
   static void winnt_pre_config(pool *pconf, pool *plog, pool *ptemp) 
   {
   char *pid;
  -one_process = !!getenv(ONE_PROCESS);
  +one_process=1;//!!getenv(ONE_PROCESS);
   
   /* Track parent/child pids... */
   pid = getenv(AP_PARENT_PID);
  @@ -1474,7 +1477,6 @@
   
   ap_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
   
  -AMCSocketInitialize();
   }
   
   /*
  @@ -1499,26 +1501,36 @@
   
 

cvs commit: apache-1.3 KEYS

1999-08-16 Thread coar
coar99/08/16 15:46:43

  Modified:.KEYS
  Log:
Update my key.
  
  Revision  ChangesPath
  1.24  +49 -17apache-1.3/KEYS
  
  Index: KEYS
  ===
  RCS file: /home/cvs/apache-1.3/KEYS,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- KEYS  1999/08/07 13:35:01 1.23
  +++ KEYS  1999/08/16 22:46:42 1.24
  @@ -40,14 +40,16 @@
   -END PGP PUBLIC KEY BLOCK-
   
   
  -Type Bits/KeyIDDate   User ID
  -pub  1024/A99F75DD 1997/01/24 Rodent of Unusual Size [EMAIL PROTECTED]
  -  Rodent of Unusual Size [EMAIL PROTECTED]
  -  Rodent of Unusual Size [EMAIL PROTECTED]
  -  Rodent of Unusual Size [EMAIL PROTECTED]
  +Type Bits KeyID  CreatedExpiresAlgorithm   Use
  +sec+ 1024 0xA99F75DD 1997-01-24 -- RSA Sign  Encrypt 
  +uid  Rodent of Unusual Size [EMAIL PROTECTED]
  +uid  Rodent of Unusual Size [EMAIL PROTECTED]
  +uid  Rodent of Unusual Size [EMAIL PROTECTED]
  +uid  Rodent of Unusual Size [EMAIL PROTECTED]
  +uid  Rodent of Unusual Size [EMAIL PROTECTED]
   
   -BEGIN PGP PUBLIC KEY BLOCK-
  -Version: 2.6.3a
  +Version: PGPfreeware 5.0i for non-commercial use
   
   mQCNAzLpIyUAAAEEAN9KC8CxTeozPYJjsnhFpJ14d4Hhf2M6OTgqPQFRHOswM/3j
   B7IW0s+HwVyQ5/SjIlo+8ur9X7yaj1FS2GQmKD1x9LKeHRAoosBIs33okRtoeDRy
  @@ -56,17 +58,47 @@
   AwUQNiiZ2JrNPMCpn3XdAQGlgwP+JLlZvNV/fJ2azKIwjibDa4n2LUDxa7ofKboU
   QL+D7FD24zQcmzmkBQm/BL/FSUtxZasJkvdVbU98N3G4h3C4AyErfQOFcrepyGAB
   M88onQ1DbQ6tiUA3gw9gIB+2l1C5R8wBOtlwoRJM4GFvjjtRp+KaQqvN3f+lLMMt
  -hKYB70m0KFJvZGVudCBvZiBVbnVzdWFsIFNpemUgPGNvYXJAQXBhY2hlLk9yZz6J
  -AJUDBRA2KJmIms08wKmfdd0BAT3yBADEDHAn++77n7bLA/u9QYM2LBQHnXdw5Is8
  -YGHpHcNZVDA8CtRTOdub8rhe9qgsid/jEry0hT9Sygfx/ry5ntjmF12ltnxBDPdZ
  -uU2DaHaIh/zBUAv0hyaQeAXEYiV9J75GrDkTj5Jrrnd623uyIRoMZPKYb+oqsZ4H
  -jIe/w+CDfrQtUm9kZW50IG9mIFVudXN1YWwgU2l6ZSA8Q29hckBSYWxlaWdoLklC
  -TS5Db20+iQCVAwUQNiiiaZrNPMCpn3XdAQFnMwP/cX21KHwg6ID7NoGzEKxsfZE/
  -dEgRGHFp5T6vznI9fO9WZZ2HmISWjEjri5zAAmXvQG2nWEYFVcF1oWph/ndLgLws
  -PfIsZiPXpj1LD7oon5PEXvJlkFfpHDqiG4xOORbbGWBcv1sqkx6djkpfyXLoMD36
  -5YazFuKurHpWPwAQRJK0J1JvZGVudCBvZiBVbnVzdWFsIFNpemUgPENvYXJAREVD
  -VVMuT3JnPg==
  -=kWdi
  +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