cvs commit: apachen/src/main fnmatch.c

[dgaudet]

dgaudet 97/11/06 14:03:40

  Modified:src  CHANGES
   src/main fnmatch.c
  Log:
  Inherit a bugfix to fnmatch.c from FreeBSD sources.
  
  PR: 1311
  Obtained from:FreeBSD-current
  Submitted by:   "[KOI8-R] áÎÄÒÅÊ þÅÒÎÏ×" <[EMAIL PROTECTED]>
  Reviewed by:Dean Gaudet, Jim Jagielski, Martin Kraemer
  
  Revision  ChangesPath
  1.491 +3 -0  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.490
  retrieving revision 1.491
  diff -u -r1.490 -r1.491
  --- CHANGES   1997/11/06 22:00:35 1.490
  +++ CHANGES   1997/11/06 22:03:38 1.491
  @@ -1,4 +1,7 @@
   Changes with Apache 1.3b3
  +  
  +  *) Inherit a bugfix to fnmatch.c from FreeBSD sources.
  + ["[KOI8-R] áÎÄÒÅÊ þÅÒÎÏ×" <[EMAIL PROTECTED]>] PR#1311
   
 *) When a configuration parse complained about a bad directive,
the logger would use whatever (unrelated) value was in errno.
  
  
  
  1.5   +4 -0  apachen/src/main/fnmatch.c
  
  Index: fnmatch.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/fnmatch.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- fnmatch.c 1997/09/16 00:35:40 1.4
  +++ fnmatch.c 1997/11/06 22:03:40 1.5
  @@ -110,6 +110,10 @@
return (FNM_NOMATCH);
if (*string == '/' && flags & FNM_PATHNAME)
return (FNM_NOMATCH);
  + if (*string == '.' && (flags & FNM_PERIOD) &&
  + (string == stringstart ||
  + ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
  + return (FNM_NOMATCH);
if ((pattern =
 rangematch(pattern, *string, flags)) == NULL)
return (FNM_NOMATCH);
  
  
  

cvs commit: apachen/src CHANGES

[coar]

coar97/11/06 14:00:36

  Modified:src  CHANGES
  Log:
Forgot to update CHANGES again.  {sigh}
  
  Revision  ChangesPath
  1.490 +4 -0  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.489
  retrieving revision 1.490
  diff -u -r1.489 -r1.490
  --- CHANGES   1997/11/06 21:57:36 1.489
  +++ CHANGES   1997/11/06 22:00:35 1.490
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3b3
   
  +  *) When a configuration parse complained about a bad directive,
  + the logger would use whatever (unrelated) value was in errno.
  + errno is now forced to EINVAL first in this case.  [Ken Coar]
  +
 *) A sed command in the Configure script pushed the edge of POSIXness,
breaking on some systems.  [Bhaba R.Misra <[EMAIL PROTECTED]>] PR#1368
 
  
  
  

cvs commit: apachen/src/helpers PrintPathOS2

[dgaudet]

dgaudet 97/11/06 13:59:37

  Modified:src/helpers PrintPathOS2
  Log:
  >* PrintPathOS2 uses "$test_exec_flag" without defining it...
  >   should it be '-x' or just '-r'?
  
  This fixes it up and also makes its output a bit more sensible by changing
  all the backslashes from the PATH to forward slashes (it was outputing
  a mixture of forward and back slashes, looked a bit funny...).
  
  Submitted by: Brian Havard <[EMAIL PROTECTED]>
  Reviewed by:  Dean Gaudet, Jim Jagielski, Martin Kraemer
  
  Revision  ChangesPath
  1.2   +3 -2  apachen/src/helpers/PrintPathOS2
  
  Index: PrintPathOS2
  ===
  RCS file: /export/home/cvs/apachen/src/helpers/PrintPathOS2,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PrintPathOS2  1997/11/05 12:48:15 1.1
  +++ PrintPathOS2  1997/11/06 21:59:36 1.2
  @@ -14,9 +14,10 @@
sed 's/^;/.;/
 s/;;/;.;/g
 s/;$/;./
  -  s/;/ /g' `
  +  s/;/ /g
  +  s//\\//g' `
   do
  -if [ $test_exec_flag $path/$1.exe ] && [ ! -d $path/$1.exe ]; then
  +if [ -r $path/$1.exe ] && [ ! -d $path/$1.exe ]; then
   if [ "$echo" = "yes" ]; then
echo $path/$1.exe
fi
  
  
  

cvs commit: apachen/src CHANGES Configure

[dgaudet]

dgaudet 97/11/06 13:57:39

  Modified:src  CHANGES Configure
  Log:
  A sed command in the Configure script pushed the edge of POSIXness,
  breaking on some systems
  
  PR: 1368
  Submitted by:   Bhaba R.Misra <[EMAIL PROTECTED]>
  Reviewed by:Dean Gaudet, Jim Jagielski, Martin Kraemer
  
  Revision  ChangesPath
  1.489 +3 -0  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.488
  retrieving revision 1.489
  diff -u -r1.488 -r1.489
  --- CHANGES   1997/11/06 10:46:58 1.488
  +++ CHANGES   1997/11/06 21:57:36 1.489
  @@ -1,4 +1,7 @@
   Changes with Apache 1.3b3
  +
  +  *) A sed command in the Configure script pushed the edge of POSIXness,
  + breaking on some systems.  [Bhaba R.Misra <[EMAIL PROTECTED]>] PR#1368
 
 *) Solaris >= 2.5 was totally broken due to a mess up using pthread
mutexes.  [Roy Fielding, Dean Gaudet]
  
  
  
  1.169 +1 -1  apachen/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apachen/src/Configure,v
  retrieving revision 1.168
  retrieving revision 1.169
  diff -u -r1.168 -r1.169
  --- Configure 1997/11/05 12:48:12 1.168
  +++ Configure 1997/11/06 21:57:37 1.169
  @@ -1063,7 +1063,7 @@
# it's responsible for the rest of its Makefile
:
else
  - basedir=`echo $moddir | sed 's/^[^/]*\///g'`
  + basedir=`echo $moddir | sed '[EMAIL PROTECTED]/]*/@@g'`
awk >> $moddir/Makefile < $tmpfile '
BEGIN {
printf "OBJS="
  
  
  

cvs commit: apachen/src/modules/standard mod_cgi.c

[dgaudet]

dgaudet 97/11/06 13:54:15

  Modified:src/main alloc.c http_log.c http_main.c httpd.h
   src/modules/standard mod_cgi.c
  Log:
  Commit the RAISE_SIGSTOP debugging support.
  
  Reviewed by:  Jim Jagielski, Martin Kraemer
  
  Revision  ChangesPath
  1.57  +1 -0  apachen/src/main/alloc.c
  
  Index: alloc.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/alloc.c,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- alloc.c   1997/11/01 21:13:20 1.56
  +++ alloc.c   1997/11/06 21:54:07 1.57
  @@ -1361,6 +1361,7 @@
   
   if (!pid) {
/* Child process */
  + RAISE_SIGSTOP(SPAWN_CHILD);
   
if (pipe_out) {
close(out_fds[0]);
  
  
  
  1.43  +1 -0  apachen/src/main/http_log.c
  
  Index: http_log.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- http_log.c1997/10/27 19:09:43 1.42
  +++ http_log.c1997/11/06 21:54:08 1.43
  @@ -413,6 +413,7 @@
/* XXX: need to check what open fds the logger is actually passed,
 * XXX: and CGIs for that matter ... cleanup_for_exec *should*
 * XXX: close all the relevant stuff, but hey, it could be broken. */
  + RAISE_SIGSTOP(PIPED_LOG_SPAWN);
/* we're now in the child */
close (STDIN_FILENO);
dup2 (pl->fds[0], STDIN_FILENO);
  
  
  
  1.246 +12 -1 apachen/src/main/http_main.c
  
  Index: http_main.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
  retrieving revision 1.245
  retrieving revision 1.246
  diff -u -r1.245 -r1.246
  --- http_main.c   1997/11/06 10:47:01 1.245
  +++ http_main.c   1997/11/06 21:54:10 1.246
  @@ -223,6 +223,10 @@
   
   int one_process = 0;
   
  +#ifdef DEBUG_SIGSTOP
  +int raise_sigstop_flags;
  +#endif
  +
   #ifndef NO_OTHER_CHILD
   /* used to maintain list of children which aren't part of the scoreboard */
   typedef struct other_child_rec other_child_rec;
  @@ -2144,6 +2148,7 @@
fprintf(stderr, "httpd: unable to fork new process\n");
exit(1);
   }
  +RAISE_SIGSTOP(DETACH);
   #endif
   #ifndef NO_SETSID
   if ((pgrp = setsid()) == -1) {
  @@ -2983,6 +2988,7 @@
   }
   
   if (!pid) {
  + RAISE_SIGSTOP(MAKE_CHILD);
/* Disable the restart signal handlers and enable the just_die stuff.
 * Note that since restart() just notes that a restart has been
 * requested there's no race condition here.
  @@ -3424,7 +3430,7 @@
   
   setup_prelinked_modules();
   
  -while ((c = getopt(argc, argv, "Xd:f:vhl")) != -1) {
  +while ((c = getopt(argc, argv, "Xd:f:vhlZ:")) != -1) {
switch (c) {
case 'd':
strncpy(server_root, optarg, sizeof(server_root) - 1);
  @@ -3446,6 +3452,11 @@
case 'X':
++one_process;  /* Weird debugging mode. */
break;
  +#ifdef DEBUG_SIGSTOP
  + case 'Z':
  + raise_sigstop_flags = atoi(optarg);
  + break;
  +#endif
case '?':
usage(argv[0]);
}
  
  
  
  1.166 +20 -0 apachen/src/main/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.165
  retrieving revision 1.166
  diff -u -r1.165 -r1.166
  --- httpd.h   1997/10/26 21:57:13 1.165
  +++ httpd.h   1997/11/06 21:54:11 1.166
  @@ -903,3 +903,23 @@
   #if !defined (MULTITHREAD) && (defined (HAVE_MMAP) || defined (HAVE_SHMGET))
   #define OPTIMIZE_TIMEOUTS
   #endif
  +
  +/* A set of flags which indicate places where the server should 
raise(SIGSTOP).
  + * This is useful for debugging, because you can then attach to that process
  + * with gdb and continue.  This is important in cases where one_process
  + * debugging isn't possible.
  + */
  +#define SIGSTOP_DETACH   1
  +#define SIGSTOP_MAKE_CHILD   2
  +#define SIGSTOP_SPAWN_CHILD  4
  +#define SIGSTOP_PIPED_LOG_SPAWN  8
  +#define SIGSTOP_CGI_CHILD16
  +
  +#ifdef DEBUG_SIGSTOP
  +extern int raise_sigstop_flags;
  +#define RAISE_SIGSTOP(x) do { \
  + if (raise_sigstop_flags & SIGSTOP_##x) raise(SIGSTOP);\
  +} while (0)
  +#else
  +#define RAISE_SIGSTOP(x)
  +#endif
  
  
  
  1.63  +1 -0  apachen/src/modules/standard/mod_cgi.c
  
  Index: mod_cgi.c
  ===
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_cgi.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- mod_cgi.c 1997/10/25 22:35:18 1.62
  +++ mo

cvs commit: apachen ABOUT_APACHE

[martin]

martin  97/11/06 13:23:11

  Modified:.ABOUT_APACHE
  Log:
  Move my name from contributors to members
  
  Revision  ChangesPath
  1.7   +4 -4  apachen/ABOUT_APACHE
  
  Index: ABOUT_APACHE
  ===
  RCS file: /home/cvs/apachen/ABOUT_APACHE,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- ABOUT_APACHE  1997/11/03 18:39:42 1.6
  +++ ABOUT_APACHE  1997/11/06 21:23:11 1.7
  @@ -67,7 +67,7 @@
   
   
   
  -Current Apache Group in alphabetical order as of 1 August 1997:
  +Current Apache Group in alphabetical order as of 1 November 1997:
   
  Brian Behlendorf   Organic Online, California 
  Ken Coar   Process Software Corporation, New England, USA 
  @@ -78,6 +78,7 @@
  Rob HartillInternet Movie DB, UK 
  Jim Jagielski  jaguNET ISP, Maryland 
  Alexei Kosut   Stanford University, California 
  +   Martin Kraemer Munich, Germany
  Ben Laurie Freelance Consultant, UK 
  Chuck Murcko   The Topsail Group, Pennsylvania 
  Doug MacEachernTOG Research Institute, Massachusetts
  @@ -114,9 +115,8 @@
   project.  Patch contributors are listed in the src/CHANGES file.
   Frequent contributors have included Petr Lampa, Tom Tromey,
   James H. Cloos Jr., Ed Korthof, Nathan Neulinger, Jason S. Clary,
  -Jason A. Dour, Michael Douglass, Tony Sanders, Martin Kraemer,
  -Brian Tao, Michael Smith, Adam Sussman, Nathan Schrenk, Matthew Gray,
  -and John Heidemann.
  +Jason A. Dour, Michael Douglass, Tony Sanders, Brian Tao, Michael Smith,
  +Adam Sussman, Nathan Schrenk, Matthew Gray, and John Heidemann.
   
   
   
  
  
  

cvs commit: apachen/src/main http_config.c

[coar]

coar97/11/06 12:40:43

  Modified:src/main http_config.c
  Log:
Set errno to something reasonable when reporting an invalid
directive.
  
  Reviewed by:  Dean Gaudet, Jim Jagielski, Martin Kraemer
  
  Revision  ChangesPath
  1.85  +8 -4  apachen/src/main/http_config.c
  
  Index: http_config.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_config.c,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- http_config.c 1997/10/26 20:19:37 1.84
  +++ http_config.c 1997/11/06 20:40:42 1.85
  @@ -803,7 +803,9 @@
   
   do {
if (!(cmd = find_command_in_modules(cmd_name, &mod))) {
  - return pstrcat(parms->pool, "Invalid command ", cmd_name, NULL);
  +errno = EINVAL;
  +return pstrcat(parms->pool, "Invalid command '", cmd_name, "'",
  +   NULL);
}
else {
void *mconfig = get_module_config(config, mod);
  @@ -835,9 +837,10 @@
   
   while (!(cfg_getline(l, MAX_STRING_LEN, parms->config_file))) {
const char *errmsg = handle_command(parms, config, l);
  - if (errmsg)
  +if (errmsg) {
return errmsg;
   }
  +}
   
   return NULL;
   }
  @@ -980,8 +983,9 @@
cfg_closefile(f);
   
if (errmsg) {
  - aplog_error(APLOG_MARK, APLOG_ALERT, r->server, "%s: %s", filename, 
errmsg);
  - return SERVER_ERROR;
  +aplog_error(APLOG_MARK, APLOG_ALERT, r->server, "%s: %s",
  +filename, errmsg);
  +return HTTP_INTERNAL_SERVER_ERROR;
}
   
*result = dc;
  
  
  

cvs commit: apachen/htdocs/manual/misc FAQ.html

[marc]

marc97/11/06 06:52:49

  Modified:htdocs/manual/misc FAQ.html
  Log:
  1.3 now exists.  That means this slips even further.
  
  Revision  ChangesPath
  1.93  +2 -2  apachen/htdocs/manual/misc/FAQ.html
  
  Index: FAQ.html
  ===
  RCS file: /export/home/cvs/apachen/htdocs/manual/misc/FAQ.html,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- FAQ.html  1997/11/01 04:45:51 1.92
  +++ FAQ.html  1997/11/06 14:52:47 1.93
  @@ -15,7 +15,7 @@
 
 Apache Server Frequently Asked Questions
 
  -  $Revision: 1.92 $ ($Date: 1997/11/01 04:45:51 $)
  +  $Revision: 1.93 $ ($Date: 1997/11/06 14:52:47 $)
 
 
 The latest version of this FAQ is always available from the main
  @@ -823,7 +823,7 @@
 
 
 This is a feature The Apache Group hopes to add in the next major
  -  release after 1.2.
  +  release after 1.3.
 
 

  
  
  

cvs commit: apachen/src/main conf.h http_main.c

[dgaudet]

dgaudet 97/11/06 02:47:03

  Modified:src  CHANGES
   src/main conf.h http_main.c
  Log:
  Papa Roy said I could commit this.  Fix USE_PTHREAD_SERIALIZED_ACCEPT, I
  totally didn't do it right the first time.
  
  Reviewed by:  Roy Fielding
  
  Revision  ChangesPath
  1.488 +3 -6  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.487
  retrieving revision 1.488
  diff -u -r1.487 -r1.488
  --- CHANGES   1997/11/06 03:03:08 1.487
  +++ CHANGES   1997/11/06 10:46:58 1.488
  @@ -1,10 +1,7 @@
   Changes with Apache 1.3b3
  -
  -  *) Restored USE_FCNTL_SERIALIZED_ACCEPT as the default for Solaris2,
  - since the PTHREAD mechanism was losing locks on Solaris 2.5.0.
  - You can now set -DUSE_SYSVSEM_SERIALIZED_ACCEPT or
  - -DUSE_PTHREAD_SERIALIZED_ACCEPT in Configuration if you want to
  - test the other two methods.  [Roy Fielding]
  +  
  +  *) Solaris >= 2.5 was totally broken due to a mess up using pthread
  + mutexes.  [Roy Fielding, Dean Gaudet]
   
 *) OS/2 Port updated; it should be possible to build OS/2 from the same
sources as Unix now.  [Brian Havard <[EMAIL PROTECTED]>]
  
  
  
  1.153 +2 -2  apachen/src/main/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/conf.h,v
  retrieving revision 1.152
  retrieving revision 1.153
  diff -u -r1.152 -r1.153
  --- conf.h1997/11/06 02:57:23 1.152
  +++ conf.h1997/11/06 10:47:00 1.153
  @@ -125,8 +125,8 @@
   #define HAVE_SYS_RESOURCE_H
   #define bzero(a,b) memset(a,0,b)
   #if !defined(USE_SYSVSEM_SERIALIZED_ACCEPT) && \
  -!defined(USE_PTHREAD_SERIALIZED_ACCEPT)
  -#define USE_FCNTL_SERIALIZED_ACCEPT
  +!defined(USE_FCNTL_SERIALIZED_ACCEPT)
  +#define USE_PTHREAD_SERIALIZED_ACCEPT
   #endif
   #define NEED_UNION_SEMUN
   #define HAVE_MMAP
  
  
  
  1.245 +47 -3 apachen/src/main/http_main.c
  
  Index: http_main.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
  retrieving revision 1.244
  retrieving revision 1.245
  diff -u -r1.244 -r1.245
  --- http_main.c   1997/11/05 12:48:17 1.244
  +++ http_main.c   1997/11/06 10:47:01 1.245
  @@ -333,18 +333,33 @@
   #elif defined (USE_PTHREAD_SERIALIZED_ACCEPT)
   
   /* This code probably only works on Solaris ... but it works really fast
  - * on Solaris
  + * on Solaris.  Note that pthread mutexes are *NOT* released when a task
  + * dies ... the task has to free it itself.  So we block signals and
  + * try to be nice about releasing the mutex.
*/
   
   #include 
   
  -static pthread_mutex_t *accept_mutex;
  +static pthread_mutex_t *accept_mutex = (void *)(caddr_t) -1;
  +static int have_accept_mutex;
  +static sigset_t accept_block_mask;
  +static sigset_t accept_previous_mask;
  +
  +static void accept_mutex_child_cleanup(void *data)
  +{
  +if (accept_mutex != (void *)(caddr_t)-1
  + && have_accept_mutex) {
  + pthread_mutex_unlock(accept_mutex);
  +}
  +}
   
   static void accept_mutex_cleanup(void)
   {
  -if (munmap((caddr_t) accept_mutex, sizeof(*accept_mutex))) {
  +if (accept_mutex != (void *)(caddr_t)-1
  + && munmap((caddr_t) accept_mutex, sizeof(*accept_mutex))) {
perror("munmap");
   }
  +accept_mutex = (void *)(caddr_t)-1;
   }
   
   static void accept_mutex_init(pool *p)
  @@ -376,14 +391,25 @@
perror("pthread_mutex_init");
exit(1);
   }
  +sigfillset(&accept_block_mask);
  +sigdelset(&accept_block_mask, SIGHUP);
  +sigdelset(&accept_block_mask, SIGTERM);
  +sigdelset(&accept_block_mask, SIGUSR1);
  +register_cleanup(pconf, NULL, accept_mutex_child_cleanup,
  + accept_mutex_child_cleanup);
   }
   
   static void accept_mutex_on()
   {
  +if (sigprocmask(SIG_BLOCK, &accept_block_mask, &accept_previous_mask)) {
  + perror("sigprocmask(SIG_BLOCK)");
  + exit (1);
  +}
   if (pthread_mutex_lock(accept_mutex)) {
perror("pthread_mutex_lock");
exit(1);
   }
  +have_accept_mutex = 1;
   }
   
   static void accept_mutex_off()
  @@ -391,6 +417,24 @@
   if (pthread_mutex_unlock(accept_mutex)) {
perror("pthread_mutex_unlock");
exit(1);
  +}
  +/* There is a slight race condition right here... if we were to die right
  + * now, we'd do another pthread_mutex_unlock.  Now, doing that would let
  + * another process into the mutex.  pthread mutexes are designed to be
  + * fast, as such they don't have protection for things like testing if 
the
  + * thread owning a mutex is actually unlocking it (or even any way of
  + * testing who owns the mutex).
  + *
  + * If we were to unset have

cvs commit: apachen/src CHANGES

[fielding]

fielding97/11/05 19:03:10

  Modified:src  CHANGES
  Log:
  Document change to USE_FCNTL_SERIALIZED_ACCEPT on Solaris2.
  
  Revision  ChangesPath
  1.487 +6 -0  apachen/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.486
  retrieving revision 1.487
  diff -u -r1.486 -r1.487
  --- CHANGES   1997/11/05 12:48:11 1.486
  +++ CHANGES   1997/11/06 03:03:08 1.487
  @@ -1,5 +1,11 @@
   Changes with Apache 1.3b3
   
  +  *) Restored USE_FCNTL_SERIALIZED_ACCEPT as the default for Solaris2,
  + since the PTHREAD mechanism was losing locks on Solaris 2.5.0.
  + You can now set -DUSE_SYSVSEM_SERIALIZED_ACCEPT or
  + -DUSE_PTHREAD_SERIALIZED_ACCEPT in Configuration if you want to
  + test the other two methods.  [Roy Fielding]
  +
 *) OS/2 Port updated; it should be possible to build OS/2 from the same
sources as Unix now.  [Brian Havard <[EMAIL PROTECTED]>]
   
  
  
  

cvs commit: apachen/src/main conf.h

[fielding]

fielding97/11/05 18:57:24

  Modified:src/main conf.h
  Log:
  USE_PTHREAD_SERIALIZED_ACCEPT results in locking problems when the
  child that has the current lock gets killed by the parent.  Restore
  USE_FCNTL_SERIALIZED_ACCEPT as the default for Solaris2, at least
  until we get one of the other locking mechanisms to work reliably.
  
  Reviewed by:  Dean Gaudet
  
  Revision  ChangesPath
  1.152 +2 -5  apachen/src/main/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apachen/src/main/conf.h,v
  retrieving revision 1.151
  retrieving revision 1.152
  diff -u -r1.151 -r1.152
  --- conf.h1997/11/05 12:48:15 1.151
  +++ conf.h1997/11/06 02:57:23 1.152
  @@ -124,12 +124,9 @@
   #undef NO_SETSID
   #define HAVE_SYS_RESOURCE_H
   #define bzero(a,b) memset(a,0,b)
  -/*#define USE_FCNTL_SERIALIZED_ACCEPT */
  -/*#define USE_SYSVSEM_SERIALIZED_ACCEPT */
  -#if SOLARIS2 < 250
  +#if !defined(USE_SYSVSEM_SERIALIZED_ACCEPT) && \
  +!defined(USE_PTHREAD_SERIALIZED_ACCEPT)
   #define USE_FCNTL_SERIALIZED_ACCEPT
  -#else
  -#define USE_PTHREAD_SERIALIZED_ACCEPT
   #endif
   #define NEED_UNION_SEMUN
   #define HAVE_MMAP
  
  
  

cvs commit: apachen/htdocs/manual/misc perf-hp.html perf.html index.html

[brian]

brian   97/11/05 18:55:09

  Modified:htdocs/manual/misc perf.html index.html
  Added:   htdocs/manual/misc perf-hp.html
  Log:
  Added notes about HP
  
  Revision  ChangesPath
  1.15  +1 -0  apachen/htdocs/manual/misc/perf.html
  
  Index: perf.html
  ===
  RCS file: /export/home/cvs/apachen/htdocs/manual/misc/perf.html,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- perf.html 1997/11/03 23:34:05 1.14
  +++ perf.html 1997/11/06 02:55:07 1.15
  @@ -26,6 +26,7 @@
   A/UX (Apple's UNIX)
   BSD-based (BSDI, FreeBSD, etc)
   Digital UNIX
  +HPUX
   Linux
   SGI
   Solaris
  
  
  
  1.8   +6 -0  apachen/htdocs/manual/misc/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apachen/htdocs/manual/misc/index.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- index.html1997/10/13 21:11:59 1.7
  +++ index.html1997/11/06 02:55:07 1.8
  @@ -92,6 +92,12 @@
   performance on Digital UNIX systems.
  
  Performance Notes (HPUX)
  +   
  +   Email from an HP engineer on how to optimize HP-UX 10.20.
  +   
  +   Performance Notes (General)
  
  
  
  
  1.1  apachen/htdocs/manual/misc/perf-hp.html
  
  Index: perf-hp.html
  ===
  
  
  
  Running a High-Performance Web Server on HPUX
  
  
  
  
  
  
   
   
Apache HTTP Server Version 1.3
   
  
  
  
  Running a High-Performance Web Server for HPUX
  
  
  Date: Wed, 05 Nov 1997 16:59:34 -0800
  From: Rick Jones [EMAIL 
PROTECTED]>
  Reply-To: [EMAIL PROTECTED]
  Organization: Network Performance
  Subject: HP-UX tuning tips
  
  
  Here are some tuning tips for HP-UX to add to the tuning page.
  
  
  
  For HP-UX 9.X: Upgrade to 10.20
  For HP-UX 10.[00|01|10]: Upgrade to 10.20
  
  
  
  For HP-UX 10.20: 
  
  
  
  Install the latest cumulative ARPA Transport Patch. This will allow you
  to configure the size of the TCP connection lookup hash table. The
  default is 256 buckets and must be set to a power of two. This is
  accomplished with adb against the *disc* image of the kernel. The
  variable name is tcp_hash_size.
  
  
  
  How to pick the value? Examine the output of
  ftp://ftp.cup.hp.com/dist/networking/tools/connhist";>
  ftp://ftp.cup.hp.com/dist/networking/tools/connhist and see how many
  total TCP connections exist on the system. You probably want that number
  divided by the hash table size to be reasonably small, say less than 10.
  Folks can look at HP's SPECweb96 disclosures for some common settings.
  These can be found at http://www.specbench.org/";>
  http://www.specbench.org/. If an HP-UX system was
  performing at 1000 SPECweb96 connections per second, the TIME_WAIT time
  of 60 seconds would mean 60,000 TCP "connections" being tracked. 
  
  
  
  Folks can check their listen queue depths with
  ftp://ftp.cup.hp.com/dist/networking/misc/listenq";>
  ftp://ftp.cup.hp.com/dist/networking/misc/listenq.
  
  
  
  If folks are running Apache on a PA-8000 based system, they should
  consider "chatr'ing" the Apache executable to have a large page size.
  This would be "chatr +pi L ." The GID of the running executable
  must have MLOCK priviledges. Setprivgrp(1m) should be consulted for
  assigning MLOCK. The change can be validated by running Glance and
  examining the memory regions of the server(s) to make sure that they
  show a non-trivial fraction of the text segment being locked.
  
  
  
  If folks are running Apache on MP systems, they might consider writing a
  small program that uses mpctl() to bind processes to processors. A
  simple pid % numcpu algorithm is probably sufficient. This might even go
  into the source code.
  
  
  
  If folks are concerned about the number of FIN_WAIT_2 connections, they
  can use nettune to shrink the value of tcp_keepstart. However, they
  should be careful there - certainly do not make it less than oh two to
  four minutes. If tcp_hash_size has been set well, it is probably OK to
  let the FIN_WAIT_2's take longer to timeout (perhaps even the default
  two hours) - they will not on average have a big impact on performance.
  
  
  
  There are other things that could go into the code base, but that might
  be left for another email. Feel free to drop me a message if you or
  others are interested.
  
  
  
  sincerely,
  
  
  
  rick jones
  http://www.cup.hp.com/netperf/NetperfPage.html";>
  http://www.cup.hp.com/netperf/NetperfPage.html
  
  
  
  
   Apache HTTP Server Version 1.3