cvs commit: apache-1.3 STATUS

1999-06-14 Thread gstein 
gstein  99/06/14 04:13:14

  Modified:.STATUS
  Log:
  so these two toads were crossing the road...
  
  Revision  ChangesPath
  1.716 +7 -1  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.715
  retrieving revision 1.716
  diff -u -r1.715 -r1.716
  --- STATUS1999/06/13 19:59:34 1.715
  +++ STATUS1999/06/14 11:13:13 1.716
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/06/13 19:59:34 $]
  +  Last modified at [$Date: 1999/06/14 11:13:13 $]
   
   Release:
   
  @@ -168,6 +168,12 @@
   * Ronald Tschalär's major update of mod_digest
   Message-ID: [EMAIL PROTECTED]
   Status: Big change -- needs review.
  +
  +* Greg's XML Handling patch
  +Message-ID: [EMAIL PROTECTED]
  +Message-ID: [EMAIL PROTECTED]
  +Status: Greg +1
  +
   
   In progress:

cvs commit: apache-apr/apr/test server.c

1999-06-14 Thread rbb 
rbb 99/06/14 05:43:13

  Modified:apr/network_io/unix networkio.h poll.c
   apr/test server.c
  Log:
  The rest of the changes for the poll api change.  These are not thoroughly
  tested, but they work in the bit of testing I have done, and they hide more
  of the internal details, so those systems using select don't have to deal with
  as much.
  
  Revision  ChangesPath
  1.10  +1 -0  apache-apr/apr/network_io/unix/networkio.h
  
  Index: networkio.h
  ===
  RCS file: /home/cvs/apache-apr/apr/network_io/unix/networkio.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- networkio.h   1999/05/21 19:53:36 1.9
  +++ networkio.h   1999/06/14 12:43:10 1.10
  @@ -73,6 +73,7 @@
   struct socket_t *sock;
   ap_int16_t events;
   ap_int16_t revents;
  +int curpos;
   };
   
   ap_int16_t get_event(ap_int16_t);
  
  
  
  1.12  +23 -6 apache-apr/apr/network_io/unix/poll.c
  
  Index: poll.c
  ===
  RCS file: /home/cvs/apache-apr/apr/network_io/unix/poll.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- poll.c1999/06/02 18:44:53 1.11
  +++ poll.c1999/06/14 12:43:10 1.12
  @@ -68,6 +68,7 @@
   return APR_ENOMEM;
   }
   (*new)-cntxt = cont;
  +(*new)-curpos = 0;
   return APR_SUCCESS;
   }
   
  @@ -112,11 +113,19 @@
   }
   
   ap_status_t ap_add_poll_socket(struct pollfd_t *aprset, 
  -struct socket_t *sock, ap_int16_t event, 
  -   ap_int32_t pos)
  +struct socket_t *sock, ap_int16_t event)
   {
  -aprset[pos].sock = sock;
  -aprset[pos].events = get_event(event);
  +int i = 0;
  +
  +while (i  aprset-curpos  aprset[i].sock-socketdes != 
sock-socketdes) {
  +i++;
  +}
  +if (i = aprset-curpos) {
  +aprset-curpos++;
  +} 
  +aprset[i].sock = sock;
  +aprset[i].events = get_event(event);
  +
   return APR_SUCCESS;
   }
   
  @@ -151,9 +160,17 @@
   return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_revents(struct pollfd_t *aprset, ap_int32_t pos, 
ap_int16_t *event)
  +ap_status_t ap_get_revents(struct pollfd_t *aprset, struct socket_t *sock, 
ap_int16_t *event)
   {
  -(*event) = aprset[pos].revents;
  +int i = 0;
  +
  +while (i  aprset-curpos  aprset[i].sock-socketdes != 
sock-socketdes) {
  +i++;
  +}
  +if (i = aprset-curpos) {
  +return APR_INVALSOCK;
  +} 
  +(*event) = aprset[i].revents;
   return APR_SUCCESS;
   }

  
  
  
  1.8   +1 -1  apache-apr/apr/test/server.c
  
  Index: server.c
  ===
  RCS file: /home/cvs/apache-apr/apr/test/server.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- server.c  1999/05/25 17:03:53 1.7
  +++ server.c  1999/06/14 12:43:12 1.8
  @@ -122,7 +122,7 @@
   
   fprintf(stdout, \tServer:  Setting up socket for polling...);
   ap_setup_poll(context, 1, sdset);
  -ap_add_poll_socket(sdset, sock, APR_POLLIN, 0);
  +ap_add_poll_socket(sdset, sock, APR_POLLIN);
   fprintf(stdout, OK\n);
   
   fprintf(stdout, \tServer:  Beginning to poll for socket...);

cvs commit: apache-apr/apr/network_io/os2 networkio.h poll.c

1999-06-14 Thread bjh 
bjh 99/06/14 06:52:41

  Modified:apr/network_io/os2 networkio.h poll.c
  Log:
  Update OS/2's poll with Ryans changes.
  
  Revision  ChangesPath
  1.2   +1 -0  apache-apr/apr/network_io/os2/networkio.h
  
  Index: networkio.h
  ===
  RCS file: /home/cvs/apache-apr/apr/network_io/os2/networkio.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- networkio.h   1999/06/04 16:15:56 1.1
  +++ networkio.h   1999/06/14 13:52:40 1.2
  @@ -72,6 +72,7 @@
   struct socket_t *sock;
   ap_int16_t events;
   ap_int16_t revents;
  +int curpos;
   };
   
   ap_int16_t get_event(ap_int16_t);
  
  
  
  1.3   +27 -11apache-apr/apr/network_io/os2/poll.c
  
  Index: poll.c
  ===
  RCS file: /home/cvs/apache-apr/apr/network_io/os2/poll.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- poll.c1999/06/11 07:23:01 1.2
  +++ poll.c1999/06/14 13:52:40 1.3
  @@ -70,22 +70,31 @@
   }
   
   (*new)-cntxt = cont;
  +(*new)-curpos = 0;
   return APR_SUCCESS;
   }
   
   
   
  -ap_status_t ap_add_poll_socket(struct pollfd_t *aprset,
  -   struct socket_t *sock, ap_int16_t event, 
  -   ap_int32_t pos) 
  -{ 
  -aprset[pos].sock = sock; 
  -aprset[pos].events = event;
  -return APR_SUCCESS; 
  -} 
  +ap_status_t ap_add_poll_socket(struct pollfd_t *aprset, 
  +struct socket_t *sock, ap_int16_t event)
  +{
  +int i = 0;
  +
  +while (i  aprset-curpos  aprset[i].sock-socketdes != 
sock-socketdes) {
  +i++;
  +}
  +if (i = aprset-curpos) {
  +aprset-curpos++;
  +} 
  +aprset[i].sock = sock;
  +aprset[i].events = event;
   
  +return APR_SUCCESS;
  +}
   
   
  +
   ap_status_t ap_poll(struct pollfd_t *pollfdset, ap_int32_t *nsds, ap_int32_t 
timeout)
   {
   int i;
  @@ -144,9 +153,16 @@
   
   
   
  -ap_status_t ap_get_revents(struct pollfd_t *aprset, ap_int32_t pos, 
ap_int16_t *event)
  +ap_status_t ap_get_revents(struct pollfd_t *aprset, struct socket_t *sock, 
ap_int16_t *event)
   {
  -(*event) = aprset[pos].revents;
  +int i = 0;
  +
  +while (i  aprset-curpos  aprset[i].sock-socketdes != 
sock-socketdes) {
  +i++;
  +}
  +if (i = aprset-curpos) {
  +return APR_INVALSOCK;
  +} 
  +(*event) = aprset[i].revents;
   return APR_SUCCESS;
   }
  -

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

1999-06-14 Thread martin 
martin  99/06/14 11:41:28

  Modified:htdocs/manual/mod core.html
  Log:
  Typo in HREF.
  
  Revision  ChangesPath
  1.149 +1 -1  apache-1.3/htdocs/manual/mod/core.html
  
  Index: core.html
  ===
  RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
  retrieving revision 1.148
  retrieving revision 1.149
  diff -u -r1.148 -r1.149
  --- core.html 1999/06/13 20:06:42 1.148
  +++ core.html 1999/06/14 18:41:23 1.149
  @@ -36,7 +36,7 @@
   LIA HREF=#directorylt;Directorygt;/A
   LIA HREF=#directorymatchlt;DirectoryMatchgt;/A
   LIA HREF=#documentrootDocumentRoot/A
  -LIA HREF=#documentrootCheckDocumentRootCheck/A
  +LIA HREF=#documentrootcheckDocumentRootCheck/A
   LIA HREF=#errordocumentErrorDocument/A
   LIA HREF=#errorlogErrorLog/A
   LIA HREF=#fileslt;Filesgt;/A

cvs commit: apache-apr/apr/network_io/win32 network_io.def network_io.dsp networkio.h poll.c sendrecv.c sockets.c sockopt.c

1999-06-14 Thread rbb 
rbb 99/06/14 12:11:18

  Added:   apr/network_io/win32 network_io.def network_io.dsp
networkio.h poll.c sendrecv.c sockets.c sockopt.c
  Log:
  First pass at Windows Network I/O.  Couldn't get WSARecv to work, but I am 
still working
  on it.  This mostly works, and it provides a select implementation that 
mimics poll.  Not
  sure the select works yet, but it's close.  I'll update it as soon as I fix 
the rest of the
  bugs.
  
  Revision  ChangesPath
  1.1  apache-apr/apr/network_io/win32/network_io.def
  
  Index: network_io.def
  ===
  ; network_io.def : 
  
  LIBRARY network_io
  DESCRIPTION ''
  
  EXPORTS
; Add new API calls to the end of this list.
  ap_create_tcp_socket   @1
  ap_shutdown   @2
  ap_close_socket   @3
  ap_bind   @4
  ap_listen   @5
  ap_accept   @6
  ap_connect   @7
  ap_get_remote_hostname   @8
  ap_gethostname   @9
  ap_send   @10
  ap_recv   @11
  ap_setsocketopt   @12
  ap_setport   @13
  ap_setup_poll   @14
  ap_poll   @15
  ap_add_poll_socket   @16
  ap_get_revents   @17
  
  
  
  1.1  apache-apr/apr/network_io/win32/network_io.dsp
  
  Index: network_io.dsp
  ===
  # Microsoft Developer Studio Project File - Name=network_io - Package 
Owner=4
  # Microsoft Developer Studio Generated Build File, Format Version 5.00
  # ** DO NOT EDIT **
  
  # TARGTYPE Win32 (x86) Dynamic-Link Library 0x0102
  
  CFG=network_io - Win32 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f network_io.mak.
  !MESSAGE 
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f network_io.mak CFG=network_io - Win32 Debug
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE network_io - Win32 Release (based on\
   Win32 (x86) Dynamic-Link Library)
  !MESSAGE network_io - Win32 Debug (based on\
   Win32 (x86) Dynamic-Link Library)
  !MESSAGE 
  
  # Begin Project
  # PROP Scc_ProjName 
  # PROP Scc_LocalPath 
  CPP=cl.exe
  MTL=midl.exe
  RSC=rc.exe
  
  !IF  $(CFG) == network_io - Win32 Release
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir Release
  # PROP BASE Intermediate_Dir Release
  # PROP BASE Target_Dir 
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir Release
  # PROP Intermediate_Dir Release
  # PROP Target_Dir 
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS 
/YX /FD /c
  # ADD CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /YX 
/FD /c
  # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /o NUL /win32
  # ADD MTL /nologo /D NDEBUG /mktyplib203 /o NUL /win32
  # ADD BASE RSC /l 0x409 /d NDEBUG
  # ADD RSC /l 0x409 /d NDEBUG
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # 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 /machine:I386
  # 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 /nologo /subsystem:windows /dll /machine:I386
  
  !ELSEIF  $(CFG) == network_io - Win32 Debug
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir Debug
  # PROP BASE Intermediate_Dir Debug
  # PROP BASE Target_Dir 
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir Debug
  # PROP Intermediate_Dir Debug
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir 
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D WIN32 /D _DEBUG /D 
_WINDOWS /YX /FD /c
  # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ..\..\include /I 
..\..\..\include /D WIN32 /D _DEBUG /D _WINDOWS /YX /FD /c
  # ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /o NUL /win32
  # ADD MTL /nologo /D _DEBUG /mktyplib203 /o NUL /win32
  # ADD BASE RSC /l 0x409 /d _DEBUG
  # ADD RSC /l 0x409 /d _DEBUG
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # 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 
..\..\misc\win32\Debug\misc.lib /nologo /subsystem:windows /dll /debug 
/machine:I386 /pdbtype:sept
  
  !ENDIF

cvs commit: apache-apr/include apr_general.h apr_network_io.h

1999-06-14 Thread rbb 
rbb 99/06/14 12:26:37

  Modified:include  apr_general.h apr_network_io.h
  Log:
  Changes to get things to compile more cleanly cross-platform.
  
  Revision  ChangesPath
  1.16  +8 -0  apache-apr/include/apr_general.h
  
  Index: apr_general.h
  ===
  RCS file: /home/cvs/apache-apr/include/apr_general.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- apr_general.h 1999/06/07 19:04:04 1.15
  +++ apr_general.h 1999/06/14 19:26:37 1.16
  @@ -57,6 +57,14 @@
   #include apr_config.h
   #endif
   
  +#ifdef HAVE_STDIO_H
  +#include stdio.h
  +#endif
  +
  +#ifdef HAVE_UNISTD_H
  +#include unistd.h
  +#endif
  +
   #ifdef HAVE_MALLOC_H
   #include malloc.h
   #endif
  
  
  
  1.24  +5 -0  apache-apr/include/apr_network_io.h
  
  Index: apr_network_io.h
  ===
  RCS file: /home/cvs/apache-apr/include/apr_network_io.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- apr_network_io.h  1999/06/10 12:15:38 1.23
  +++ apr_network_io.h  1999/06/14 19:26:37 1.24
  @@ -56,8 +56,13 @@
   #ifndef APR_NETWORK_IO_H
   #define APR_NETWORK_IO_H
   
  +#ifdef WIN32
  +#include winsock2.h
  +#endif
  +
   #include apr_general.h
   #include apr_errno.h
  +#include time.h
   
   #ifdef __cplusplus
   extern C {

cvs commit: apache-1.3 STATUS

1999-06-14 Thread martin 
martin  99/06/14 12:29:11

  Modified:.STATUS
  Log:
  Getting warmer finally
  
  Revision  ChangesPath
  1.717 +16 -7 apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.716
  retrieving revision 1.717
  diff -u -r1.716 -r1.717
  --- STATUS1999/06/14 11:13:13 1.716
  +++ STATUS1999/06/14 19:29:09 1.717
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/06/14 11:13:13 $]
  +  Last modified at [$Date: 1999/06/14 19:29:09 $]
   
   Release:
   
  @@ -93,7 +93,7 @@
   
   * Stipe Tolj's Cygwin32 port
PR#: 2936
  -Status: Lars +1 (on concept)
  +Status: Lars +1 (on concept), Martin +1 (on concept)
   
   * Salvador Ortiz Garcia [EMAIL PROTECTED]' patch to allow 
DirectoryIndex
 to refer to URIs for non-static resources.
  @@ -105,6 +105,7 @@
Status: Jim +1, Mark +1, Dean +1, BenH +1,
Randy +1 (please choose name other than hook)
   Doug +1 on concept (untested), Lars +1 on concept,
  + Martin +1 (untested),
Ken -1 for pre-2.0 if it will force a new release of
mod_perl or mod_php in order to maintain compatibility
   
  @@ -112,7 +113,7 @@
Message-ID: [EMAIL PROTECTED]
Message-ID: [EMAIL PROTECTED]
Message-ID: [EMAIL PROTECTED]
  - Status: Dean +1, Randy +1, Jim +1, Lars +1
  + Status: Dean +1, Randy +1, Jim +1, Lars +1, Martin +1 (untested)
Previous Status: Dean +1, Randy +1, Jim +1,
Lars +1 (if someone writes the docs)
   
  @@ -134,7 +135,8 @@
   * Jun-ichiro itojun Hagino's [PATCH] IPv6 enable patch
 ftp://ftp.kame.net/pub/kame/misc/apache-134-v6-19990118.diff.gz
   Message-ID: [EMAIL PROTECTED]
  -Status: Lars +1 (on concept) Dirkx +1 (tested)
  +Status: Lars +1 (on concept), Dirkx +1 (tested),
  + Martin +1 (on concept; the patch may need a little cleanup)
   
   * Jim Patterson's patch to make mod_info work on Win32
   Message-ID: PR#1442
  @@ -172,7 +174,7 @@
   * Greg's XML Handling patch
   Message-ID: [EMAIL PROTECTED]
   Message-ID: [EMAIL PROTECTED]
  -Status: Greg +1
  +Status: Greg +1, Martin +1 (on concept)
   
   
   In progress:
  @@ -244,6 +246,9 @@
 dirkx: -1 (as some of the modules from modules.apache.org seem
(rightly?) to assume that they can modify the returned escaped
string whilst relying on the passed string not to be damaged.
  +  Martin: +1 (a separate interface is like in the case of
  +ap_table_setn() complementing ap_table_set(). It would not
  + interfere with any existing code).
   
   * Should we disallow requests with bogus characters in the method?
 See [EMAIL PROTECTED]
  @@ -256,18 +261,20 @@
   * there are still some PRs about inetd mode
 Should we deprecate ServerType inetd if the next release is 1.4.0?
   +1: Lars
  + -0: Martin (ISTR someone volunteered to keep it working. I fear
  + some exotic platforms may require it)
   
   * general/3787: SERVER_PORT is always 80 if client comes to any port
 = needs review by the protocol guys, I think.
   
   * Paul would like to see a 'gdbm' option because he uses
 it a lot.
  -+1: Greg (volunteers)
  ++1: Greg (volunteers), Martin
   
   * Many people have asked for a DBM to be distributed with Apache to
 isolate it from platform inconsistencies. SDBM (used by mod_ssl,
 mod_dav, Perl, and others) should fit the bill and is public domain.
  -+1: Greg (volunteers)
  ++1: Greg (volunteers), Martin
   
   * Maybe a http_paths.h file? See
[EMAIL PROTECTED]
  @@ -289,6 +296,7 @@
   * Ken's PR#1053: an error when accessing a negotiated document
 explicitly names the variant selected.  Should it do so, or should
 the original URI be referenced?
  +Martin: keep as is (helps identifying errors. IMO no privacy issue.)
   
   * Proposed API Changes:
   
  @@ -379,6 +387,7 @@
   * should trap ^C when running not-as-service and do proper shutdown
   
   * should have a pretty little icon for Apache on Win32
  +  (Resolved?! there's a tiny feather icon now!?!)
   
   * proxy module doesn't load on Win95.  Why?  Good question.  PR#1462.
 David Whitmarsh [EMAIL PROTECTED] says it's because