date:19990629

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

1999-06-29 Thread manoj

manoj   99/06/28 17:18:04

  Modified:pthreads/src/include httpd.h
   pthreads/src/main http_accept.c
  Log:
  Change the workings of get_connection in USE_MULTI_ACCEPT mode to search
  the pollfd array rather than the listener linked list. The code is a bit
  easier to follow with this change (our fingers are muddling with fewer
  data structures at once), but the main benefit is for the MPM based on
  this code.
  
  Revision  ChangesPath
  1.18  +0 -1  apache-apr/pthreads/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/include/httpd.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -d -u -r1.17 -r1.18
  --- httpd.h   1999/06/10 06:25:56 1.17
  +++ httpd.h   1999/06/29 00:18:03 1.18
  @@ -933,7 +933,6 @@
   struct sockaddr_in local_addr;   /* local IP address and port */
   int fd;
   int used;  /* Only used during restart */
  -int index;/* index into the listenfds array */
   /* more stuff here, like which protocol is bound to the port */
   };
   
  
  
  
  1.19  +15 -28apache-apr/pthreads/src/main/http_accept.c
  
  Index: http_accept.c
  ===
  RCS file: /home/cvs/apache-apr/pthreads/src/main/http_accept.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -d -u -r1.18 -r1.19
  --- http_accept.c 1999/06/10 06:26:07 1.18
  +++ http_accept.c 1999/06/29 00:18:03 1.19
  @@ -300,8 +300,8 @@
* USE_MULTI_ACCEPT
* Worker threads do the accept and process the request. 
*/
  -static listen_rec *head_listener;
   static struct pollfd *listenfds;
  +static int last_pollfd = 0; /* 0 = ap_pipe_of_death */
   
   void accept_parent_init(pool *pconf, int listener_count)
   {
  @@ -319,14 +319,12 @@
   SAFE_ACCEPT(intra_mutex_init(pchild, 1));
   SAFE_ACCEPT(accept_mutex_child_init(pchild));
   requests_this_child = ap_max_requests_per_child;
  -head_listener = ap_listeners;
   
   listenfds = ap_palloc(pchild, sizeof(struct pollfd) * (num_listenfds + 
1));
   listenfds[0].fd = ap_pipe_of_death[0];
   listenfds[0].events = POLLIN;
   listenfds[0].revents = 0;
   for (lr = ap_listeners, i = 1; i = num_listenfds; lr = lr-next, ++i) {
  - lr-index = i;
listenfds[i].fd = lr-fd;
listenfds[i].events = POLLIN; /* should we add POLLPRI ?*/
listenfds[i].revents = 0;
  @@ -344,6 +342,7 @@
   int ret;
   listen_rec *lr;
   char pipe_read_char;
  +int curr_pollfd;
   
   size_t len = sizeof(struct sockaddr);
   
  @@ -404,44 +403,32 @@
   
/* This conditional is used because the single listen case is the
 * only one where the accept might not be serialized. In that
  -  * case, multiple threads mucking around with the head_listener
  -  * pointer will be harmful */
  +  * case, multiple threads mucking around with the listenfds array
  +  *  and last_pollfd */
   if (num_listenfds == 1) {
/* only one socket, just pretend we did the other stuff */
sd = ap_listeners-fd;
   }
   else {
   /* find a listener */
  -/* Loop or NULL terminated list? That is the question. Be
  - * consistent across all the accept techniques */
  -lr = head_listener;
  +curr_pollfd = last_pollfd;
   do {
  -/* XXX: should we check for PR_POLL_ERR ?? */
  -if (listenfds[lr-index].revents  POLLIN) {
  -/* advance to the next listener for next loop */
  -head_listener = lr-next;
  -/* hack to handle listenfds being NULL terminated 
list 
  - * rather than a loop 
  - */
  -if (head_listener == NULL) {
  -head_listener = ap_listeners;
  -}
  -goto got_lr;
  +curr_pollfd++;
  +if (curr_pollfd  num_listenfds) {
  +curr_pollfd = 1;
   }
  -lr = lr-next;
  -if (lr == NULL) {
  - lr = ap_listeners;
  +/* XXX: should we check for POLLERR? */
  +if (listenfds[curr_pollfd].revents  POLLIN) {
  +last_pollfd = curr_pollfd;
  +sd = listenfds[curr_pollfd].fd;
  +goto got_lr;
   }
  -} while (lr != head_listener);
  +} while (curr_pollfd != last_pollfd);

cvs commit: apache-2.0/mpm/src/include ap_listen.h

1999-06-29 Thread manoj

manoj   99/06/28 19:49:30

  Modified:mpm/src/main listen.c
   mpm/src/modules/mpm/mpmt_pthread http_accept.c
   mpm/src/include ap_listen.h
  Log:
  Change method of checking for active FDs after poll() in the pthread
  MPM. The new method doesn't require any changes to the listen
  abstraction.
  
  Revision  ChangesPath
  1.3   +0 -1  apache-2.0/mpm/src/main/listen.c
  
  Index: listen.c
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/main/listen.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -d -u -r1.2 -r1.3
  --- listen.c  1999/06/27 03:45:14 1.2
  +++ listen.c  1999/06/29 02:49:26 1.3
  @@ -182,7 +182,6 @@
   new = malloc(sizeof(ap_listen_rec));
   new-local_addr = *local_addr;
   new-fd = -1;
  -new-index = -1;
   new-next = ap_listeners;
   ap_listeners = new;
   }
  
  
  
  1.3   +17 -21apache-2.0/mpm/src/modules/mpm/mpmt_pthread/http_accept.c
  
  Index: http_accept.c
  ===
  RCS file: 
/home/cvs/apache-2.0/mpm/src/modules/mpm/mpmt_pthread/http_accept.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -d -u -r1.2 -r1.3
  --- http_accept.c 1999/06/27 03:45:15 1.2
  +++ http_accept.c 1999/06/29 02:49:27 1.3
  @@ -303,8 +303,8 @@
* USE_MULTI_ACCEPT
* Worker threads do the accept and process the request. 
*/
  -static ap_listen_rec *last_lr;
   static struct pollfd *listenfds;
  +static int last_pollfd = 0;
   
   void accept_parent_init(pool *pconf, int listener_count)
   {
  @@ -322,14 +322,12 @@
   SAFE_ACCEPT(intra_mutex_init(pchild, 1));
   SAFE_ACCEPT(accept_mutex_child_init(pchild));
   requests_this_child = ap_max_requests_per_child;
  -last_lr = ap_listeners;
   
   listenfds = ap_palloc(pchild, sizeof(struct pollfd) * (num_listenfds + 
1));
   listenfds[0].fd = ap_pipe_of_death[0];
   listenfds[0].events = POLLIN;
   listenfds[0].revents = 0;
   for (lr = ap_listeners, i = 1; i = num_listenfds; lr = lr-next, ++i) {
  - lr-index = i;
listenfds[i].fd = lr-fd;
listenfds[i].events = POLLIN; /* should we add POLLPRI ?*/
listenfds[i].revents = 0;
  @@ -347,6 +345,7 @@
   int ret;
   ap_listen_rec *lr;
   char pipe_read_char;
  +int curr_pollfd;
   
   size_t len = sizeof(struct sockaddr);
   
  @@ -405,36 +404,33 @@
   continue;
   }
   
  - /* This conditional is used because the single listen case is the
  -  * only one where the accept might not be serialized. In that
  -  * case, multiple threads mucking around with the last_lr
  -  * pointer will be harmful */
  +/* This conditional is used because the single listen case
  + * is the only one where the accept might not be serialized.
  + * In that case, multiple threads mucking around with
  + * listenfds or last_pollfd will be harmful */
   if (num_listenfds == 1) {
/* only one socket, just pretend we did the other stuff */
sd = ap_listeners-fd;
   }
   else {
   /* find a listener */
  -lr = last_lr;
  +curr_pollfd = last_pollfd;
   do {
  -/* XXX: should we check for POLLERR? */
  -if (listenfds[lr-index].revents  POLLIN) {
  -last_lr = lr-next;
  -if (last_lr == NULL) {
  -last_lr = ap_listeners;
  -}
  -goto got_lr;
  +curr_pollfd++;
  +if (curr_pollfd  num_listenfds) {
  +curr_pollfd = 1;
   }
  -lr = lr-next;
  -if (lr == NULL) {
  -lr = ap_listeners;
  +/* XXX: Should we check for POLLERR? */
  +if (listenfds[curr_pollfd].revents  POLLIN) {
  +last_pollfd = curr_pollfd;
  +sd = listenfds[curr_pollfd].fd;
  +goto got_lr;
   }
  -} while (lr != last_lr);
  +} while (curr_pollfd != last_pollfd);
   /* if we don't find anything then just start again */
   continue;
  -got_lr:
  -sd = lr-fd;
   }
  +got_lr:
   csd = ap_accept(sd, sa_client, len);   
   requests_this_child--;
   
  
  
  
  1.3   +0 -1  apache-2.0/mpm/src/include/ap_listen.h
  
  Index: ap_listen.h
  ===
  RCS file:

cvs commit: apache-1.3/htdocs/manual/mod mod_vhost_alias.html

1999-06-29 Thread rse

rse 99/06/29 01:27:06

  Modified:htdocs/manual/mod mod_vhost_alias.html
  Log:
  Fix hyperlink
  
  Revision  ChangesPath
  1.3   +1 -1  apache-1.3/htdocs/manual/mod/mod_vhost_alias.html
  
  Index: mod_vhost_alias.html
  ===
  RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_vhost_alias.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_vhost_alias.html  1999/06/23 18:24:03 1.2
  +++ mod_vhost_alias.html  1999/06/29 08:27:05 1.3
  @@ -28,7 +28,7 @@
   override the behaviour of other modules that do filename translation,
   e.g. A HREF=mod_userdir.htmlCODEmod_userdir/CODE/A and
   A HREF=mod_alias.htmlCODEmod_alias/CODE/A. It provides
  -support for A HREF=../vhost/mass.htmldynamically configured mass
  +support for A HREF=../vhosts/mass.htmldynamically configured mass
   virtual hosting/A.
   /P

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

1999-06-29 Thread rse

rse 99/06/29 01:37:44

  Modified:src/modules/standard mod_rewrite.c
  Log:
  typos
  
  Revision  ChangesPath
  1.141 +2 -2  apache-1.3/src/modules/standard/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
  retrieving revision 1.140
  retrieving revision 1.141
  diff -u -r1.140 -r1.141
  --- mod_rewrite.c 1999/06/22 00:51:37 1.140
  +++ mod_rewrite.c 1999/06/29 08:37:43 1.141
  @@ -158,9 +158,9 @@
   { RewriteBase, cmd_rewritebase, NULL, OR_FILEINFO, TAKE1,
 the base URL of the per-directory context },
   { RewriteCond, cmd_rewritecond, NULL, OR_FILEINFO, RAW_ARGS,
  -  a input string and a to be applied regexp-pattern },
  +  an input string and a to be applied regexp-pattern },
   { RewriteRule, cmd_rewriterule, NULL, OR_FILEINFO, RAW_ARGS,
  -  a URL-applied regexp-pattern and a substitution URL },
  +  an URL-applied regexp-pattern and a substitution URL },
   { RewriteMap,  cmd_rewritemap,  NULL, RSRC_CONF,   TAKE2,
 a mapname and a filename },
   { RewriteLock, cmd_rewritelock, NULL, RSRC_CONF,   TAKE1,

cvs commit: apache-2.0/mpm/src/os/unix Makefile.tmpl

1999-06-29 Thread ben

ben 99/06/29 02:00:32

  Modified:mpm/src  Makefile.tmpl
   mpm/src/ap Makefile.tmpl
   mpm/src/include http_config.h http_connection.h httpd.h
   mpm/src/main Makefile.tmpl http_config.c http_connection.c
   mpm/src/modules/mpm/prefork Makefile.tmpl prefork.c
   mpm/src/modules/standard Makefile.tmpl
   mpm/src/os/unix Makefile.tmpl
  Log:
  New API for I/O layering, and dependency updates.
  
  Revision  ChangesPath
  1.4   +5 -6  apache-2.0/mpm/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-2.0/mpm/src/Makefile.tmpl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.tmpl 1999/06/20 23:14:29 1.3
  +++ Makefile.tmpl 1999/06/29 09:00:04 1.4
  @@ -123,11 +123,10 @@
   # DO NOT REMOVE
   buildmark.o: buildmark.c include/ap_config.h include/ap_mmn.h \
include/ap_config_auto.h os/unix/os.h os/unix/os-inline.c \
  - include/ap_ctype.h include/hsregex.h include/httpd.h include/alloc.h \
  - include/buff.h include/ap_iol.h include/ap.h include/apr.h \
  - include/util_uri.h
  + include/ap_ctype.h include/httpd.h include/alloc.h include/buff.h \
  + include/ap_iol.h include/ap.h include/apr.h include/util_uri.h
   modules.o: modules.c include/httpd.h include/ap_config.h \
include/ap_mmn.h include/ap_config_auto.h os/unix/os.h \
  - os/unix/os-inline.c include/ap_ctype.h include/hsregex.h \
  - include/alloc.h include/buff.h include/ap_iol.h include/ap.h \
  - include/apr.h include/util_uri.h include/http_config.h
  + os/unix/os-inline.c include/ap_ctype.h include/alloc.h include/buff.h \
  + include/ap_iol.h include/ap.h include/apr.h include/util_uri.h \
  + include/http_config.h
  
  
  
  1.5   +20 -22apache-2.0/mpm/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===
  RCS file: /export/home/cvs/apache-2.0/mpm/src/ap/Makefile.tmpl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.tmpl 1999/06/20 23:14:30 1.4
  +++ Makefile.tmpl 1999/06/29 09:00:06 1.5
  @@ -41,41 +41,39 @@
   # DO NOT REMOVE
   ap_buf.o: ap_buf.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_buf.h
  + $(INCDIR)/ap_ctype.h $(INCDIR)/ap_buf.h
   ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h $(INCDIR)/util_uri.h
   ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h $(INCDIR)/util_uri.h
   ap_fnmatch.o: ap_fnmatch.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h
  + $(INCDIR)/ap_ctype.h $(INCDIR)/fnmatch.h
   ap_getpass.o: ap_getpass.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap.h \
  - $(INCDIR)/apr.h
  + $(INCDIR)/ap_ctype.h $(INCDIR)/ap.h $(INCDIR)/apr.h
   ap_md5c.o: ap_md5c.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_md5.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h
  + $(INCDIR)/ap_ctype.h $(INCDIR)/ap_md5.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h
   ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
  - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h
  + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
  + $(INCDIR)/apr.h $(INCDIR)/util_uri.h
   ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  -

cvs commit: apache-site top.html

1999-06-29 Thread fielding

fielding99/06/29 02:58:57

  Modified:.top.html
  Log:
  Be consistent in docs.
  
  Revision  ChangesPath
  1.2   +7 -5  apache-site/top.html
  
  Index: top.html
  ===
  RCS file: /export/home/cvs/apache-site/top.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- top.html  1999/06/26 10:01:42 1.1
  +++ top.html  1999/06/29 09:58:57 1.2
  @@ -27,14 +27,16 @@
 a href=foundation/contact.htmlContact Info/abr
 a href=foundation/credits.htmlCredits/abr
   /b
  -   hr width=50% size=4
  -  font size=-1ASF Projects:/fontbr
  -b   a href=foundation/Foundation/abr
  -  a href=./Apache Server/abr
  +/b
  +hr width=50% size=4
  +  a href=foundation/projects.htmlfont size=-1ASF 
Projects:/font/abr
  +b   a href=./Apache Server/abr
 a href=http://jakarta.apache.org/;Jakarta/abr
  -  a href=http://java.apache.org/;JServ/JSSI/abr
  +  a href=http://java.apache.org/;Java-Apache/abr
 a href=http://perl.apache.org/;mod_perl/abr
 a href=http://php.apache.org/;mod_php/abr
  +  a href=foundation/conferences.htmlConferences/abr
  +  a href=foundation/Foundation/abr
  hr width=50% size=4
 a href=related_projects.htmlRelated Projects/abr
   /b

cvs commit: apache-1.3/htdocs/manual/mod mod_example.html

1999-06-29 Thread rse

rse 99/06/29 05:06:36

  Modified:htdocs/manual/mod mod_example.html
  Log:
  Fix description of Example directive. It just activates a demo flag and
  doesn't really enable the example contents handler.
  
  Revision  ChangesPath
  1.8   +7 -6  apache-1.3/htdocs/manual/mod/mod_example.html
  
  Index: mod_example.html
  ===
  RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_example.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_example.html  1998/01/26 16:54:11 1.7
  +++ mod_example.html  1999/06/29 12:06:36 1.8
  @@ -155,12 +155,13 @@
  available in Apache 1.2 and later.
 /P
 P
  -  The SAMPExample/SAMP directive activates the example module's
  -  content handler 
  -  for a particular location or file type.  It takes no arguments.  If
  -  you browse to an URL to which the example content-handler applies, you
  -  will get a display of the routines within the module and how and in
  -  what order they were called to service the document request.
  +  The SAMPExample/SAMP directive just sets a demonstration flag which the
  +  example module's content handler displays.  It takes no arguments.  If you
  +  browse to an URL to which the example content-handler applies, you will get
  +  a display of the routines within the module and how and in what order they
  +  were called to service the document request. The effect of this directive
  +  one can observe under the point SAMPExample directive declared
  +  here: YES/NO/SAMP. 
 /P
 !--#include virtual=footer.html --
/BODY

cvs commit: apache-1.3/src/helpers mkshadow.sh

1999-06-29 Thread rse

rse 99/06/29 06:43:15

  Modified:src/helpers mkshadow.sh
  Log:
  Merge in two robustness enhancements and
  a real bugfix from GNU shtool's mkshadow
  
  Revision  ChangesPath
  1.10  +3 -3  apache-1.3/src/helpers/mkshadow.sh
  
  Index: mkshadow.sh
  ===
  RCS file: /home/cvs/apache-1.3/src/helpers/mkshadow.sh,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mkshadow.sh   1999/04/21 14:32:29 1.9
  +++ mkshadow.sh   1999/06/29 13:43:15 1.10
  @@ -52,7 +52,7 @@
   if [ ! -d $dst ]; then
   mkdir $dst
   fi
  -DIRS=`cd $src
  +DIRS=`cd $src; \
  find . -type d -print |\
  sed -e '/\/CVS/d' \
  -e '/^\.$/d' \
  @@ -64,7 +64,7 @@
   IFS=$OIFS
   
   #   fill directory tree with symlinks to files
  -FILES=`cd $src
  +FILES=`cd $src; \
   find . -depth -print |\
   sed -e '/\.o$/d' \
   -e '/\.a$/d' \
  @@ -81,7 +81,7 @@
   OIFS=$IFS IFS=$DIFS
   for file in $FILES; do
#  don't use `-type f' above for find because of symlinks
  - if [ -d $file ]; then
  + if [ -d $src/$file ]; then
continue
fi
basename=`echo $file | sed -e 's:^.*/::'`

cvs commit: apache-1.3/src/helpers buildinfo.sh

1999-06-29 Thread rse

rse 99/06/29 06:49:14

  Modified:src/helpers buildinfo.sh
  Log:
  Overtake also some fixes from GNU shtool for buildinfo.sh...
  
  Revision  ChangesPath
  1.9   +6 -6  apache-1.3/src/helpers/buildinfo.sh
  
  Index: buildinfo.sh
  ===
  RCS file: /home/cvs/apache-1.3/src/helpers/buildinfo.sh,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- buildinfo.sh  1999/04/21 14:30:26 1.8
  +++ buildinfo.sh  1999/06/29 13:49:14 1.9
  @@ -58,10 +58,10 @@
   if [ x$username = x ]; then
   username=$USER
   if [ x$username = x ]; then
  -username=`whoami 2/dev/null |\
  +username=`(whoami) 2/dev/null |\
  awk '{ printf(%s, $1); }'`
   if [ x$username = x ]; then
  -username=`who am i 2/dev/null |\
  +username=`(who am i) 2/dev/null |\
  awk '{ printf(%s, $1); }'`
   if [ x$username = x ]; then
   username='unknown'
  @@ -73,10 +73,10 @@
   #
   #   determine hostname and domainname
   #
  -hostname=`uname -n 2/dev/null |\
  +hostname=`(uname -n) 2/dev/null |\
  awk '{ printf(%s, $1); }'`
   if [ x$hostname = x ]; then
  -hostname=`hostname 2/dev/null |\
  +hostname=`(hostname) 2/dev/null |\
  awk '{ printf(%s, $1); }'`
   if [ x$hostname = x ]; then
   hostname='unknown'
  @@ -115,8 +115,8 @@
   if [ x$time_year = x ]; then
   time_year=`date '+%y' | awk '{ printf(%s, $1); }'`
   case $time_year in
  -9[0-9]*) time_year=19$time_year ;;
  -  *) time_year=20$time_year ;;
  +[5-9][0-9]) time_year=19$time_year ;;
  +[0-4][0-9]) time_year=20$time_year ;;
   esac
   fi
   case $time_month in

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

1999-06-29 Thread rse

rse 99/06/29 07:27:43

  Modified:src  CHANGES
   src/main http_main.c
  Log:
  Fixed `httpd' usage display: -D was missing.
  PR: 4614
  
  Revision  ChangesPath
  1.1389+3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1388
  retrieving revision 1.1389
  diff -u -r1.1388 -r1.1389
  --- CHANGES   1999/06/29 14:16:42 1.1388
  +++ CHANGES   1999/06/29 14:27:39 1.1389
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.7
   
  +  *) Fixed `httpd' usage display: -D was missing.
  + [Ralf S. Engelschall] PR#4614
  +
 *) Fix `make r' test procedure in src/regex/: ap_isprint was not found.
[Ralf S. Engelschall] PR#4561, PR#4562
   
  
  
  
  1.451 +2 -2  apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===
  RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.450
  retrieving revision 1.451
  diff -u -r1.450 -r1.451
  --- http_main.c   1999/06/24 16:38:50 1.450
  +++ http_main.c   1999/06/29 14:27:42 1.451
  @@ -1028,9 +1028,9 @@
pad[i] = ' ';
   pad[i] = '\0';
   #ifdef SHARED_CORE
  -fprintf(stderr, Usage: %s [-R directory] [-d directory] [-f file]\n, 
bin);
  +fprintf(stderr, Usage: %s [-R directory] [-D name] [-d directory] [-f 
file]\n, bin);
   #else
  -fprintf(stderr, Usage: %s [-d directory] [-f file]\n, bin);
  +fprintf(stderr, Usage: %s [-D name] [-d directory] [-f file]\n, bin);
   #endif
   fprintf(stderr,%s [-C \directive\] [-c \directive\]\n, 
pad);
   fprintf(stderr,%s [-v] [-V] [-h] [-l] [-L] [-S] [-t]\n, pad);

cvs commit: apache-1.3/htdocs/manual/mod mod_alias.html

1999-06-29 Thread rse

rse 99/06/29 07:32:17

  Modified:htdocs/manual/mod mod_alias.html
  Log:
  Fix context description of RedirectMatch. It's also
  useable in per-dir context - similar to Redirect.
  
  Submitted by: Klaus Johannes Rusch [EMAIL PROTECTED]
  PR: 4611
  
  Revision  ChangesPath
  1.24  +2 -1  apache-1.3/htdocs/manual/mod/mod_alias.html
  
  Index: mod_alias.html
  ===
  RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_alias.html,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mod_alias.html1999/03/15 22:14:39 1.23
  +++ mod_alias.html1999/06/29 14:32:15 1.24
  @@ -221,7 +221,8 @@
   A
HREF=directive-dict.html#Context
REL=Help
  -STRONGContext:/STRONG/A server config, virtual hostBR
  +STRONGContext:/STRONG/A server config, virtual host, directory,
  + .htaccessBR
   A
HREF=directive-dict.html#Override
REL=Help

cvs commit: apache-apr/include apr_general.h

1999-06-29 Thread rbb

rbb 99/06/29 08:52:14

  Modified:apr/include apr_win.h
   apr/misc/win32 misc.def misc.dsp start.c
   apr/network_io/win32 network_io.dsp
   apr/test client.dsp server.dsp test.dsw testfile.dsp
testproc.dsp testsock.dsp timetest.dsp
   apr/threadproc/win32 proc.c
   include  apr_general.h
  Added:   apr/signal/win32 signal.c signal.def signal.dsp
   apr/test testsig.c
  Log:
  The abstracts out asynchsignals on Windows.  This is NOT safe code to put in 
a production
  server yet, but it works, and that's more than it was doing earlier today.
  
  Revision  ChangesPath
  1.5   +37 -1 apache-apr/apr/include/apr_win.h
  
  Index: apr_win.h
  ===
  RCS file: /home/cvs/apache-apr/apr/include/apr_win.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_win.h 1999/06/18 19:10:58 1.4
  +++ apr_win.h 1999/06/29 15:52:07 1.5
  @@ -65,9 +65,42 @@
   
   typedef enum {APR_WIN_NT, APR_WIN_95, APR_WIN_98} ap_oslevel_e;
   
  +#define SIGHUP 1
  +/* 2 is used for SIGINT on windows */
  +#define SIGQUIT3
  +/* 4 is used for SIGILL on windows */
  +#define SIGTRAP5
  +#define SIGIOT 6
  +#define SIGBUS 7
  +/* 8 is used for SIGFPE on windows */
  +#define SIGKILL9
  +#define SIGUSR110
  +/* 11 is used for SIGSEGV on windows */
  +#define SIGUSR212
  +#define SIGPIPE13
  +#define SIGALRM14
  +/* 15 is used for SIGTERM on windows */
  +#define SIGSTKFLT  16
  +#define SIGCHLD17 
  +#define SIGCONT18
  +#define SIGSTOP19
  +#define SIGTSTP20
  +/* 21 is used for SIGBREAK on windows */
  +/* 22 is used for SIGABRT on windows */
  +#define SIGTTIN23
  +#define SIGTTOU24
  +#define SIGURG 25
  +#define SIGXCPU26
  +#define SIGXFSZ27
  +#define SIGVTALRM  28
  +#define SIGPROF29
  +#define SIGWINCH   30
  +#define SIGIO  31
  +
   typedef _off_t  off_t;
   typedef int pid_t;
  -typedef void Sigfunc(int);
  +typedef void (Sigfunc)(int);
  +typedef int ap_signum_t;
   
   #define __attribute__(__x) 
   #define APR_INLINE 
  @@ -82,6 +115,9 @@
   #define sleep(t) Sleep(t * 1000)
   
   time_t WinTimeToUnixTime(FILETIME *);
  +unsigned __stdcall SignalHandling(void *);
  +
  +int thread_ready(void);
   
   #endif  /*APR_WIN_H*/
   #endif  /*WIN32*/
  
  
  
  1.4   +2 -1  apache-apr/apr/misc/win32/misc.def
  
  Index: misc.def
  ===
  RCS file: /home/cvs/apache-apr/apr/misc/win32/misc.def,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- misc.def  1999/06/23 15:00:08 1.3
  +++ misc.def  1999/06/29 15:52:08 1.4
  @@ -14,4 +14,5 @@
WinTimeToUnixTime   @7
ap_get_oslevel   @8
   ap_get_userdata   @9
  -ap_set_userdata   @10
  \ No newline at end of file
  +ap_set_userdata   @10
  +ap_initialize   @11
  \ No newline at end of file
  
  
  
  1.3   +1 -1  apache-apr/apr/misc/win32/misc.dsp
  
  Index: misc.dsp
  ===
  RCS file: /home/cvs/apache-apr/apr/misc/win32/misc.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- misc.dsp  1999/06/15 17:43:14 1.2
  +++ misc.dsp  1999/06/29 15:52:08 1.3
  @@ -77,7 +77,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib 
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib 
odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 
/pdbtype:sept
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib 
odbccp32.lib ws2_32.lib ..\..\lib\Debug\lib.lib /nologo /subsystem:windows /dll 
/debug /machine:I386 /pdbtype:sept
  +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib 
odbccp32.lib ws2_32.lib ..\..\lib\Debug\lib.lib 
..\..\signal\win32\Debug\signal.lib /nologo /subsystem:windows /dll /debug 
/machine:I386 /pdbtype:sept
   
   !ENDIF 
   
  
  
  
  1.6   +16 -0 apache-apr/apr/misc/win32/start.c
  
  Index: start.c
  ===
  RCS file: /home/cvs/apache-apr/apr/misc/win32/start.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- start.c   1999/06/23 15:00:08 1.5
  +++ start.c   1999/06/29 15:52:08 1.6
  @@ -60,6 +60,7 @@
   #include apr_pools.h
   #include apr_lib.h
   #include string.h
  +#include process.h
   
   ap_status_t clean_cont(void *data)
   {
  @@ -194,3 +195,18 @@
   return APR_ENOCONT;
   }
   
  +/* This puts one

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

cvs commit: apache-2.0/mpm/src/include ap_listen.h

cvs commit: apache-1.3/htdocs/manual/mod mod_vhost_alias.html

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

cvs commit: apache-2.0/mpm/src/os/unix Makefile.tmpl

cvs commit: apache-site top.html

cvs commit: apache-1.3/htdocs/manual/mod mod_example.html

cvs commit: apache-1.3/src/helpers mkshadow.sh

cvs commit: apache-1.3/src/helpers buildinfo.sh

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

cvs commit: apache-1.3/htdocs/manual/mod mod_alias.html

cvs commit: apache-apr/include apr_general.h

12 matches

Site Navigation

Mail list logo

Footer information