date:20000120

Re: cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h sockaddr.c

2000-01-20 Thread rbb


>   Convert HAVE_NETINET... to the APR mac

Please undo this change.  APR is not providing configuration macros for
Apache.  That is up to Apache to do.  The APR_HAVE_NETINET_H macro is
defined so that the APR PUBLIC header file can use it.  This macro should
also not be used by APR internal files.  It should only be used by header
files that APR provides for other programs, such as apr_network_io.h

Ryan

cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h sockaddr.c

2000-01-20 Thread stoddard

stoddard00/01/20 14:14:39

  Modified:src  acinclude.m4
   src/include ap_ac_config.h httpd.h
   src/lib/apr/lib apr_snprintf.c
   src/lib/apr/network_io/unix networkio.h sockaddr.c
  Log:
  Convert HAVE_NETINET... to the APR mac
  
  Revision  ChangesPath
  1.18  +1 -1  apache-2.0/src/acinclude.m4
  
  Index: acinclude.m4
  ===
  RCS file: /export/home/cvs/apache-2.0/src/acinclude.m4,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- acinclude.m4  2000/01/16 20:00:46 1.17
  +++ acinclude.m4  2000/01/20 22:14:05 1.18
  @@ -157,7 +157,7 @@
   #ifdef HAVE_SYS_SOCKET_H
   #include 
   #endif
  -#ifdef HAVE_NETINET_IN_H
  +#if APR_HAVE_NETINET_IN_H
   #include 
   #endif
   #ifdef HAVE_ARPA_INET_H
  
  
  
  1.6   +1 -1  apache-2.0/src/include/ap_ac_config.h
  
  Index: ap_ac_config.h
  ===
  RCS file: /export/home/cvs/apache-2.0/src/include/ap_ac_config.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ap_ac_config.h2000/01/19 01:14:26 1.5
  +++ ap_ac_config.h2000/01/20 22:14:12 1.6
  @@ -105,7 +105,7 @@
   #include 
   #endif
   
  -#ifdef HAVE_NETINET_IN_H
  +#if APR_HAVE_NETINET_IN_H
   #include 
   #endif
   
  
  
  
  1.21  +2 -0  apache-2.0/src/include/httpd.h
  
  Index: httpd.h
  ===
  RCS file: /export/home/cvs/apache-2.0/src/include/httpd.h,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- httpd.h   2000/01/19 02:41:49 1.20
  +++ httpd.h   2000/01/20 22:14:15 1.21
  @@ -81,7 +81,9 @@
   #include "ap.h"
   #include "ap_mmn.h"
   
  +#if APR_HAVE_NETINET_IN_H
   #include 
  +#endif
   
   #ifdef CORE_PRIVATE
   
  
  
  
  1.8   +1 -1  apache-2.0/src/lib/apr/lib/apr_snprintf.c
  
  Index: apr_snprintf.c
  ===
  RCS file: /export/home/cvs/apache-2.0/src/lib/apr/lib/apr_snprintf.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apr_snprintf.c1999/12/14 15:28:22 1.7
  +++ apr_snprintf.c2000/01/20 22:14:23 1.8
  @@ -70,7 +70,7 @@
   #ifdef HAVE_CTYPE_H
   #include 
   #endif
  -#ifdef HAVE_NETINET_IN_H
  +#if APR_HAVE_NETINET_IN_H
   #include 
   #endif
   #ifdef HAVE_SYS_SOCKET_H
  
  
  
  1.14  +1 -1  apache-2.0/src/lib/apr/network_io/unix/networkio.h
  
  Index: networkio.h
  ===
  RCS file: 
/export/home/cvs/apache-2.0/src/lib/apr/network_io/unix/networkio.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- networkio.h   1999/12/29 23:56:24 1.13
  +++ networkio.h   2000/01/20 22:14:30 1.14
  @@ -86,7 +86,7 @@
   #if HAVE_NETINET_TCP_H
   #include 
   #endif
  -#if HAVE_NETINET_IN_H
  +#if APR_HAVE_NETINET_IN_H
   #include 
   #endif
   #if HAVE_ARPA_INET_H
  
  
  
  1.3   +1 -1  apache-2.0/src/lib/apr/network_io/unix/sockaddr.c
  
  Index: sockaddr.c
  ===
  RCS file: /export/home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockaddr.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sockaddr.c1999/12/03 15:18:34 1.2
  +++ sockaddr.c2000/01/20 22:14:33 1.3
  @@ -203,7 +203,7 @@
   
   
   
  -#if HAVE_NETINET_IN_H
  +#if APR_HAVE_NETINET_IN_H
   /* ***APRDOC
* ap_status_t ap_get_local_name(struct sockaddr_in **name, const 
ap_socket_t *socket)
*Return the local socket name as a BSD style struct sockaddr_in.

cvs commit: apache-2.0/src/os/win32 ApacheOS.dsp ApacheOS.mak

2000-01-20 Thread stoddard

stoddard00/01/20 12:58:55

  Modified:src/os/win32 ApacheOS.dsp ApacheOS.mak
  Log:
  Add lib/apr/include to preprocessor search paths
  
  Revision  ChangesPath
  1.2   +1 -1  apache-2.0/src/os/win32/ApacheOS.dsp
  
  Index: ApacheOS.dsp
  ===
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheOS.dsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ApacheOS.dsp  1999/08/24 06:45:38 1.1
  +++ ApacheOS.dsp  2000/01/20 20:58:43 1.2
  @@ -60,7 +60,7 @@
   # PROP Intermediate_Dir "ApacheOSD"
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" 
/YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" 
/YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../lib/apr/include" /D "WIN32" 
/D "_DEBUG" /D "_WINDOWS" /YX /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  
  
  
  1.2   +70 -19apache-2.0/src/os/win32/ApacheOS.mak
  
  Index: ApacheOS.mak
  ===
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheOS.mak,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ApacheOS.mak  1999/08/24 06:45:38 1.1
  +++ ApacheOS.mak  2000/01/20 20:58:46 1.2
  @@ -26,8 +26,6 @@
   NULL=nul
   !ENDIF 
   
  -CPP=cl.exe
  -
   !IF  "$(CFG)" == "ApacheOS - Win32 Release"
   
   OUTDIR=.\ApacheOSR
  @@ -54,10 +52,42 @@
   "$(OUTDIR)" :
   if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
/Fp"$(INTDIR)\ApacheOS.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheOSR/
   CPP_SBRS=.
  +
  +.c{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.c{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheOS.bsc" 
   BSC32_SBRS= \
  @@ -98,26 +128,13 @@
   "$(OUTDIR)" :
   if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
  - /Fp"$(INTDIR)\ApacheOS.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP=cl.exe
  +CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "../../lib/apr/include" /D "WIN32" 
/D\
  + "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheOS.pch" /YX /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheOSD/
   CPP_SBRS=.
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheOS.bsc" 
  -BSC32_SBRS= \
  - 
  -LIB32=link.exe -lib
  -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ApacheOS.lib" 
  -LIB32_OBJS= \
  - "$(INTDIR)\os.obj"
   
  -"$(OUTDIR)\ApacheOS.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
  -$(LIB32) @<<
  -  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
  -<<
  -
  -!ENDIF 
  -
   .c{$(CPP_OBJS)}.obj::
  $(CPP) @<<
  $(CPP_PROJ) $< 
  @@ -148,16 +165,50 @@
  $(CPP_PROJ) $< 
   <<
   
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheOS.bsc" 
  +BSC32_SBRS= \
  + 
  +LIB32=link.exe -lib
  +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ApacheOS.lib" 
  +LIB32_OBJS= \
  + "$(INTDIR)\os.obj"
   
  +"$(OUTDIR)\ApacheOS.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
  +$(LIB32) @<<
  +  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
  +<<
  +
  +!ENDIF 
  +
  +
   !IF "$(CFG)" == "ApacheOS - Win32 Release" || "$(CFG)" ==\
"ApacheOS - Win32 Debug"
   SOURCE=.\os.c
  +
  +!IF  "$(CFG)" == "ApacheOS - Win32 Release"
  +
  +DEP_CPP_OS_C0=\
  + ".\os.h"\
  + 
  +NODEP_CPP_OS_C0=\
  + ".\apr_win.h"\
  + 
  +
  +"$(INTDIR)\os.obj" : $(SOURCE) $(DEP_CPP_OS_C0) "$(INTDIR)"
  +
  +
  +!ELSEIF  "$(CFG)" == "ApacheOS - Win32 Debug"
  +
   DEP_CPP_OS_C0=\
  + "..\..\lib\apr\include\apr_win.h"\
".\os.h"\

   
   "$(INTDIR)\os.obj" : $(SOURCE) $(DEP_CPP_OS_C0) "$(INTDIR)"
   
  +
  +!ENDIF 
   
   
   !ENDIF

cvs commit: apache-site/contributors index.html

2000-01-20 Thread rbb

rbb 00/01/20 07:23:35

  Modified:contributors index.html
  Log:
  Update the contributors page with my new information.
  
  Revision  ChangesPath
  1.86  +2 -2  apache-site/contributors/index.html
  
  Index: index.html
  ===
  RCS file: /home/cvs/apache-site/contributors/index.html,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- index.html2000/01/07 13:32:00 1.85
  +++ index.html2000/01/20 15:23:33 1.86
  @@ -188,9 +188,9 @@
   
   
   Name: Ryan Bloom
  -Email: mailto:[EMAIL PROTECTED]">[EMAIL 
PROTECTED]
  +Email: mailto:[EMAIL PROTECTED]">[EMAIL 
PROTECTED]
   URL: http://www.ntrnet.net/~rbb";>http://www.ntrnet.net/~rbb
  -Organization: IBM Corp
  +Organization:Covalent Technologies
   Occupation: Software Engineer
   Location: Research Triangle Park, NC
   OS Expertise: Linux, AIX, Windows

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

2000-01-20 Thread jim

jim 00/01/19 18:55:02

  Modified:src  CHANGES Configure
   src/include httpd.h
   src/os/win32 registry.c
  Log:
  And we bump up to 1.3.12-dev
  
  Revision  ChangesPath
  1.1503+3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1502
  retrieving revision 1.1503
  diff -u -r1.1502 -r1.1503
  --- CHANGES   2000/01/18 17:12:13 1.1502
  +++ CHANGES   2000/01/20 02:54:52 1.1503
  @@ -1,3 +1,6 @@
  +Changes with Apache 1.3.12
  +
  +
   Changes with Apache 1.3.11
   
 *) MPE builds are no longer stripped, which caused the executable
  
  
  
  1.391 +1 -1  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.390
  retrieving revision 1.391
  diff -u -r1.390 -r1.391
  --- Configure 2000/01/17 00:48:30 1.390
  +++ Configure 2000/01/20 02:54:54 1.391
  @@ -1775,7 +1775,7 @@
#select the special subtarget for shared core generation
SUBTARGET=target_shared
#determine additional suffixes for libhttpd.so
  - V=1 R=3 P=11
  + V=1 R=3 P=12
if [ "x$SHLIB_SUFFIX_DEPTH" = "x0" ]; then
SHLIB_SUFFIX_LIST=""
fi
  
  
  
  1.302 +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.301
  retrieving revision 1.302
  diff -u -r1.301 -r1.302
  --- httpd.h   2000/01/20 02:41:16 1.301
  +++ httpd.h   2000/01/20 02:55:00 1.302
  @@ -421,7 +421,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
*/
   
  -#define SERVER_BASEVERSION "Apache/1.3.11"   /* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION "Apache/1.3.12-dev"   /* SEE COMMENTS ABOVE */
   #define SERVER_VERSION  SERVER_BASEVERSION
   enum server_token_type {
   SrvTk_MIN,   /* eg: Apache/1.3.0 */
  @@ -437,7 +437,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 10311100
  +#define APACHE_RELEASE 10312000
   
   #define SERVER_PROTOCOL "HTTP/1.1"
   #ifndef SERVER_SUPPORT
  
  
  
  1.30  +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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- registry.c2000/01/20 02:41:18 1.29
  +++ registry.c2000/01/20 02:55:02 1.30
  @@ -38,7 +38,7 @@
   
   #define VENDOR   "Apache Group"
   #define SOFTWARE "Apache"
  -#define VERSION  "1.3.11"
  +#define VERSION  "1.3.12 dev"
   
   #define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION

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

2000-01-20 Thread jim

jim 00/01/19 18:41:19

  Modified:src/include httpd.h
   src/os/win32 registry.c
  Log:
  Get ready to tag: we are 1.3.11
  
  Revision  ChangesPath
  1.301 +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.300
  retrieving revision 1.301
  diff -u -r1.300 -r1.301
  --- httpd.h   2000/01/17 00:48:32 1.300
  +++ httpd.h   2000/01/20 02:41:16 1.301
  @@ -421,7 +421,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
*/
   
  -#define SERVER_BASEVERSION "Apache/1.3.11-dev"   /* SEE COMMENTS ABOVE */
  +#define SERVER_BASEVERSION "Apache/1.3.11"   /* SEE COMMENTS ABOVE */
   #define SERVER_VERSION  SERVER_BASEVERSION
   enum server_token_type {
   SrvTk_MIN,   /* eg: Apache/1.3.0 */
  @@ -437,7 +437,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 10311000
  +#define APACHE_RELEASE 10311100
   
   #define SERVER_PROTOCOL "HTTP/1.1"
   #ifndef SERVER_SUPPORT
  
  
  
  1.29  +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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- registry.c2000/01/17 00:48:33 1.28
  +++ registry.c2000/01/20 02:41:18 1.29
  @@ -38,7 +38,7 @@
   
   #define VENDOR   "Apache Group"
   #define SOFTWARE "Apache"
  -#define VERSION  "1.3.11 dev"
  +#define VERSION  "1.3.11"
   
   #define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION

Re: cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h sockaddr.c

cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h sockaddr.c

cvs commit: apache-2.0/src/os/win32 ApacheOS.dsp ApacheOS.mak

cvs commit: apache-site/contributors index.html

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

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

6 matches

Site Navigation

Mail list logo

Footer information