You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/12/22 01:02:53 UTC
cvs commit: httpd-2.0/support ab.c htpasswd.c logresolve.c
rbb 00/12/21 16:02:52
Modified: . CHANGES
. CHANGES configure.in
include apr.h.in apr.hw
support ab.c htpasswd.c logresolve.c
Log:
Cleanups so that the support programs build cleanly. The Win32 values
need to be sanity checked.
Submitted by: Cliff Woolley <cl...@yahoo.com>
Reviewed by: Ryan Bloom
Revision Changes Path
1.20 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- CHANGES 2000/12/21 01:04:23 1.19
+++ CHANGES 2000/12/22 00:02:48 1.20
@@ -1,5 +1,8 @@
Changes with Apache 2.0b1
+ *) Get the support programs building cleanly again.
+ [Cliff Woolley <cl...@yahoo.com>]
+
*) The Apache/Win32 Apache.exe and dll's now live in bin. The
current directory logic now backs up over bin/ to determine the
server root from the Apache.exe path.
1.29 +4 -1 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- CHANGES 2000/12/21 14:51:19 1.28
+++ CHANGES 2000/12/22 00:02:49 1.29
@@ -1,7 +1,10 @@
Changes with APR b1
+ *) Cleanup to help Apache support programs build cleanly.
+ [Cliff Woolley <cl...@yahoo.com>]
+
*) Cleanup some compiler warnings on Solaris
- [Dale Ghent <da...@elemental.org>
+ [Dale Ghent <da...@elemental.org>]
*) apr_getaddrinfo() can now return multiple addresses for a host
via the next field in apr_sockaddr_t. [Jeff Trawick]
1.194 +11 -6 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- configure.in 2000/12/21 20:59:24 1.193
+++ configure.in 2000/12/22 00:02:50 1.194
@@ -255,7 +255,7 @@
AC_CHECK_HEADERS(ByteOrder.h)
AC_CHECK_HEADERS(conio.h)
-AC_CHECK_HEADERS(crypt.h)
+AC_CHECK_HEADERS(crypt.h, crypth="1", crypth="0")
AC_CHECK_HEADERS(ctype.h, ctypeh="1", ctypeh="0")
AC_CHECK_HEADERS(dir.h)
AC_CHECK_HEADERS(dirent.h, direnth="1", dirent="0")
@@ -274,9 +274,9 @@
AC_CHECK_HEADERS(signal.h, signalh="1", signalh="0")
AC_CHECK_HEADERS(stdarg.h, stdargh="1", stdargh="0")
AC_CHECK_HEADERS(stddef.h)
-AC_CHECK_HEADERS(stdio.h, stdioh="1", stdioh"0")
-AC_CHECK_HEADERS(stdlib.h)
-AC_CHECK_HEADERS(string.h)
+AC_CHECK_HEADERS(stdio.h, stdioh="1", stdioh="0")
+AC_CHECK_HEADERS(stdlib.h, stdlibh="1", stdlibh="0")
+AC_CHECK_HEADERS(string.h, stringh="1", stringh="0")
AC_CHECK_HEADERS(strings.h)
AC_CHECK_HEADERS(sysapi.h)
AC_CHECK_HEADERS(sysgtime.h)
@@ -290,7 +290,7 @@
AC_CHECK_HEADERS(poll.h)
AC_CHECK_HEADERS(sys/poll.h)
AC_CHECK_HEADERS(unix.h)
-AC_CHECK_HEADERS(arpa/inet.h)
+AC_CHECK_HEADERS(arpa/inet.h, arpa_ineth="1", arpa_ineth="0")
AC_CHECK_HEADERS(netinet/in.h, netinet_inh="1", netinet_inh="0")
AC_CHECK_HEADERS(netinet/tcp.h)
AC_CHECK_HEADERS(iconv.h)
@@ -301,7 +301,7 @@
AC_CHECK_HEADERS(sys/resource.h)
AC_CHECK_HEADERS(sys/select.h)
AC_CHECK_HEADERS(sys/sendfile.h)
-AC_CHECK_HEADERS(sys/signal.h)
+AC_CHECK_HEADERS(sys/signal.h, sys_signalh="1", sys_signalh="0")
AC_CHECK_HEADERS(sys/socket.h, sys_socketh="1", sys_socketh="0")
AC_CHECK_HEADERS(sys/stat.h)
AC_CHECK_HEADERS(sys/types.h, sys_typesh="1", sys_typesh="0")
@@ -311,15 +311,20 @@
AC_CHECK_HEADERS(kernel/OS.h)
+AC_SUBST(arpa_ineth)
AC_SUBST(ctypeh)
AC_SUBST(crypth)
AC_SUBST(errnoh)
AC_SUBST(direnth)
AC_SUBST(fcntlh)
AC_SUBST(ioh)
+AC_SUBST(netdbh)
AC_SUBST(netinet_inh)
AC_SUBST(stdargh)
AC_SUBST(stdioh)
+AC_SUBST(stdlibh)
+AC_SUBST(stringh)
+AC_SUBST(sys_signalh)
AC_SUBST(sys_socketh)
AC_SUBST(sys_typesh)
AC_SUBST(sys_uioh)
1.59 +5 -0 apr/include/apr.h.in
Index: apr.h.in
===================================================================
RCS file: /home/cvs/apr/include/apr.h.in,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- apr.h.in 2000/12/21 20:59:26 1.58
+++ apr.h.in 2000/12/22 00:02:50 1.59
@@ -24,16 +24,21 @@
#define ENUM_BITFIELD(e,n,w) e n : w
#endif
+#define APR_HAVE_ARPA_INET_H @arpa_ineth@
#define APR_HAVE_CRYPT_H @crypth@
#define APR_HAVE_CTYPE_H @ctypeh@
#define APR_HAVE_DIRENT_H @direnth@
#define APR_HAVE_ERRNO_H @errnoh@
#define APR_HAVE_FCNTL_H @fcntlh@
#define APR_HAVE_IO_H @ioh@
+#define APR_HAVE_NETDB_H @netdbh@
#define APR_HAVE_NETINET_IN_H @netinet_inh@
#define APR_HAVE_PTHREAD_H @pthreadh@
#define APR_HAVE_STDARG_H @stdargh@
#define APR_HAVE_STDIO_H @stdioh@
+#define APR_HAVE_STDLIB_H @stdlibh@
+#define APR_HAVE_STRING_H @stringh@
+#define APR_HAVE_SYS_SIGNAL_H @sys_signalh@
#define APR_HAVE_SYS_SOCKET_H @sys_socketh@
#define APR_HAVE_SYS_TYPES_H @sys_typesh@
#define APR_HAVE_SYS_UIO_H @sys_uioh@
1.44 +5 -0 apr/include/apr.hw
Index: apr.hw
===================================================================
RCS file: /home/cvs/apr/include/apr.hw,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- apr.hw 2000/12/21 20:59:26 1.43
+++ apr.hw 2000/12/22 00:02:51 1.44
@@ -115,16 +115,21 @@
#define NO_USE_SIGACTION
+#define APR_HAVE_ARPA_INET_H 0
#define APR_HAVE_CRYPT_H 0
#define APR_HAVE_CTYPE_H 1
#define APR_HAVE_DIRENT_H 0
#define APR_HAVE_ERRNO_H 1
#define APR_HAVE_FCNTL_H 1
#define APR_HAVE_IO_H 1
+#define APR_HAVE_NETDB_H 0
#define APR_HAVE_NETINET_IN_H 0
#define APR_HAVE_PTHREAD_H 0
#define APR_HAVE_STDARG_H 1
#define APR_HAVE_STDIO_H 1
+#define APR_HAVE_STDLIB_H 1
+#define APR_HAVE_STRING_H 1
+#define APR_HAVE_SYS_SIGNAL_H 0
#define APR_HAVE_SYS_SOCKET_H 0
#define APR_HAVE_SYS_TYPES_H 1
#define APR_HAVE_SYS_UIO_H 0
1.46 +5 -2 httpd-2.0/support/ab.c
Index: ab.c
===================================================================
RCS file: /home/cvs/httpd-2.0/support/ab.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ab.c 2000/12/21 21:00:43 1.45
+++ ab.c 2000/12/22 00:02:51 1.46
@@ -125,6 +125,9 @@
#if APR_HAVE_STDIO_H
#include <stdio.h> /* for EOF */
#endif
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
#include "ap_base64.h"
#ifdef NOT_ASCII
@@ -893,14 +896,14 @@
static void copyright(void)
{
if (!use_html) {
- printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.45 $> apache-2.0");
+ printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.46 $> apache-2.0");
printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
printf("Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/\n");
printf("\n");
}
else {
printf("<p>\n");
- printf(" This is ApacheBench, Version %s <i><%s></i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.45 $");
+ printf(" This is ApacheBench, Version %s <i><%s></i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.46 $");
printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
printf(" Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/<br>\n");
printf("</p>\n<p>\n");
1.30 +9 -0 httpd-2.0/support/htpasswd.c
Index: htpasswd.c
===================================================================
RCS file: /home/cvs/httpd-2.0/support/htpasswd.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- htpasswd.c 2000/12/21 21:00:44 1.29
+++ htpasswd.c 2000/12/22 00:02:52 1.30
@@ -100,6 +100,15 @@
#if APR_HAVE_CRYPT_H
#include <crypt.h>
#endif
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#if APR_HAVE_STRING_H
+#include <string.h>
+#endif
+#if APR_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#ifdef WIN32
#include <conio.h>
1.14 +6 -0 httpd-2.0/support/logresolve.c
Index: logresolve.c
===================================================================
RCS file: /home/cvs/httpd-2.0/support/logresolve.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- logresolve.c 2000/12/21 21:00:45 1.13
+++ logresolve.c 2000/12/22 00:02:52 1.14
@@ -43,6 +43,9 @@
#if APR_HAVE_STDIO_H
#include <stdio.h>
#endif
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
#if APR_HAVE_CTYPE_H
#include <ctype.h>
#endif
@@ -51,6 +54,9 @@
#endif
#if APR_HAVE_NETINET_IN_H
#include <netinet/in.h>
+#endif
+#if APR_HAVE_STRING_H
+#include <string.h>
#endif
#if APR_HAVE_SYS_SOCKET_H
#include <sys/socket.h>
Re: cvs commit: httpd-2.0/support ab.c htpasswd.c logresolve.c
Posted by "William A. Rowe, Jr." <wr...@lnd.com>.
> rbb 00/12/21 16:02:52
>
> Modified: . CHANGES
> . CHANGES configure.in
> include apr.h.in apr.hw
> support ab.c htpasswd.c logresolve.c
> Log:
> Cleanups so that the support programs build cleanly. The Win32 values
> need to be sanity checked.
> Submitted by: Cliff Woolley <cl...@yahoo.com>
> Reviewed by: Ryan Bloom
>
> 1.44 +5 -0 apr/include/apr.hw
>
> Index: apr.hw
> ===================================================================
> RCS file: /home/cvs/apr/include/apr.hw,v
> retrieving revision 1.43
> retrieving revision 1.44
> diff -u -r1.43 -r1.44
> --- apr.hw 2000/12/21 20:59:26 1.43
> +++ apr.hw 2000/12/22 00:02:51 1.44
> @@ -115,16 +115,21 @@
>
> #define NO_USE_SIGACTION
>
> +#define APR_HAVE_ARPA_INET_H 0
> #define APR_HAVE_CRYPT_H 0
> #define APR_HAVE_CTYPE_H 1
> #define APR_HAVE_DIRENT_H 0
> #define APR_HAVE_ERRNO_H 1
> #define APR_HAVE_FCNTL_H 1
> #define APR_HAVE_IO_H 1
> +#define APR_HAVE_NETDB_H 0
> #define APR_HAVE_NETINET_IN_H 0
> #define APR_HAVE_PTHREAD_H 0
> #define APR_HAVE_STDARG_H 1
> #define APR_HAVE_STDIO_H 1
> +#define APR_HAVE_STDLIB_H 1
> +#define APR_HAVE_STRING_H 1
> +#define APR_HAVE_SYS_SIGNAL_H 0
> #define APR_HAVE_SYS_SOCKET_H 0
> #define APR_HAVE_SYS_TYPES_H 1
> #define APR_HAVE_SYS_UIO_H 0
Those look good to me, thanks for the warning