cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h sockaddr.c
stoddard00/01/20 17:25:43 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: Back out most of the last commit. Keep APR macros seperate from Apache macros. Revision ChangesPath 1.19 +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.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- acinclude.m4 2000/01/20 22:14:05 1.18 +++ acinclude.m4 2000/01/21 01:25:20 1.19 @@ -157,7 +157,7 @@ #ifdef HAVE_SYS_SOCKET_H #include sys/socket.h #endif -#if APR_HAVE_NETINET_IN_H +#ifdef HAVE_NETINET_IN_H #include netinet/in.h #endif #ifdef HAVE_ARPA_INET_H 1.7 +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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ap_ac_config.h2000/01/20 22:14:12 1.6 +++ ap_ac_config.h2000/01/21 01:25:24 1.7 @@ -105,7 +105,7 @@ #include sys/socket.h #endif -#if APR_HAVE_NETINET_IN_H +#ifdef HAVE_NETINET_IN_H #include netinet/in.h #endif 1.22 +1 -1 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.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- httpd.h 2000/01/20 22:14:15 1.21 +++ httpd.h 2000/01/21 01:25:25 1.22 @@ -81,7 +81,7 @@ #include ap.h #include ap_mmn.h -#if APR_HAVE_NETINET_IN_H +#ifdef HAVE_NETINET_IN_H #include netinet/in.h #endif 1.9 +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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- apr_snprintf.c2000/01/20 22:14:23 1.8 +++ apr_snprintf.c2000/01/21 01:25:30 1.9 @@ -70,7 +70,7 @@ #ifdef HAVE_CTYPE_H #include ctype.h #endif -#if APR_HAVE_NETINET_IN_H +#ifdef HAVE_NETINET_IN_H #include netinet/in.h #endif #ifdef HAVE_SYS_SOCKET_H 1.15 +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.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- networkio.h 2000/01/20 22:14:30 1.14 +++ networkio.h 2000/01/21 01:25:34 1.15 @@ -86,7 +86,7 @@ #if HAVE_NETINET_TCP_H #include netinet/tcp.h #endif -#if APR_HAVE_NETINET_IN_H +#if HAVE_NETINET_IN_H #include netinet/in.h #endif #if HAVE_ARPA_INET_H 1.4 +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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sockaddr.c2000/01/20 22:14:33 1.3 +++ sockaddr.c2000/01/21 01:25:36 1.4 @@ -203,7 +203,7 @@ -#if APR_HAVE_NETINET_IN_H +#if 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/lib/apr/network_io/unix networkio.h sockaddr.c
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 sys/socket.h #endif -#ifdef HAVE_NETINET_IN_H +#if APR_HAVE_NETINET_IN_H #include netinet/in.h #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 sys/socket.h #endif -#ifdef HAVE_NETINET_IN_H +#if APR_HAVE_NETINET_IN_H #include netinet/in.h #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 netinet/in.h +#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 ctype.h #endif -#ifdef HAVE_NETINET_IN_H +#if APR_HAVE_NETINET_IN_H #include netinet/in.h #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 netinet/tcp.h #endif -#if HAVE_NETINET_IN_H +#if APR_HAVE_NETINET_IN_H #include netinet/in.h #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.
Re: cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h sockaddr.c
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
sascha 99/12/29 15:56:25 Modified:src/lib/apr/network_io/unix networkio.h Log: Use correct data type for socket address length. Revision ChangesPath 1.13 +1 -1 apache-2.0/src/lib/apr/network_io/unix/networkio.h Index: networkio.h === RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/networkio.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -u -r1.12 -r1.13 --- networkio.h 1999/12/14 18:11:08 1.12 +++ networkio.h 1999/12/29 23:56:24 1.13 @@ -111,7 +111,7 @@ int socketdes; struct sockaddr_in *local_addr; struct sockaddr_in *remote_addr; -size_t addr_len; +socklen_t addr_len; int timeout; #ifndef HAVE_POLL int connected;
cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h
rbb 99/12/14 10:11:09
Modified:src/lib/apr configure.in
src/lib/apr/network_io/unix networkio.h
Log:
Fix some warnings when compiling with -Wall
Revision ChangesPath
1.35 +1 -0 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- configure.in 1999/12/06 18:58:18 1.34
+++ configure.in 1999/12/14 18:11:06 1.35
@@ -256,6 +256,7 @@
AC_CHECK_HEADERS(sys/param.h)
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/socket.h)
AC_CHECK_HEADERS(sys/stat.h)
1.12 +3 -0 apache-2.0/src/lib/apr/network_io/unix/networkio.h
Index: networkio.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/networkio.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- networkio.h 1999/12/04 21:48:34 1.11
+++ networkio.h 1999/12/14 18:11:08 1.12
@@ -101,6 +101,9 @@
#if HAVE_FCNTL_H
#include fcntl.h
#endif
+#if HAVE_SYS_SENDFILE_H
+#include sys/sendfile.h
+#endif
/* End System Headers */
struct socket_t {
cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h sendrecv.c
rbb 99/12/04 13:48:35
Modified:src/lib/apr acconfig.h configure.in
src/lib/apr/include apr.h.in apr_network_io.h
src/lib/apr/network_io/unix networkio.h sendrecv.c
Log:
Add Sendfile to APR. This is not well tested, and a test case is needed.
I did some minor cleanup work, mainly to integrate sendfile into the APR
autoconf stuff.
Submitted by: John Zedlewski
Reviewed by:Ryan Bloom
Revision ChangesPath
1.15 +1 -0 apache-2.0/src/lib/apr/acconfig.h
Index: acconfig.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/acconfig.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- acconfig.h1999/12/01 18:38:55 1.14
+++ acconfig.h1999/12/04 21:48:30 1.15
@@ -46,6 +46,7 @@
#undef SIZEOF_SSIZE_T
#undef APR_HAS_THREADS
+#undef APR_HAS_SENDFILE
@BOTTOM@
1.31 +3 -0 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- configure.in 1999/12/01 20:35:16 1.30
+++ configure.in 1999/12/04 21:48:31 1.31
@@ -215,6 +215,7 @@
AC_CHECK_HEADERS(arpa/inet.h)
AC_CHECK_HEADERS(netinet/in.h, netinet_inh=1, netinet_inh=0)
+AC_CHECK_HEADERS(netinet/tcp.h)
AC_CHECK_HEADERS(sys/file.h)
AC_CHECK_HEADERS(sys/ioctl.h)
@@ -261,8 +262,10 @@
AC_CHECK_FUNCS(pthread_sigmask)
AC_CHECK_FUNCS(strcasecmp stricmp poll setsid)
AC_CHECK_FUNCS(sigaction writev)
+AC_CHECK_FUNCS(sendfile, [ sendfile=#define APR_HAS_SENDFILE 1 ], [
sendfile=APR_HAS_SENDFILE 0 ])
AC_CHECK_FUNCS(getpass)
AC_CHECK_FUNC(_getch)
+AC_SUBST(sendfile)
AC_CHECK_FUNCS(gmtime_r localtime_r)
1.4 +1 -0 apache-2.0/src/lib/apr/include/apr.h.in
Index: apr.h.in
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.h.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apr.h.in 1999/12/01 20:35:20 1.3
+++ apr.h.in 1999/12/04 21:48:33 1.4
@@ -18,6 +18,7 @@
/* APR Feature Macros */
@threads@
[EMAIL PROTECTED]@
@mmap@
/* Typedefs that APR needs. */
1.18 +16 -0 apache-2.0/src/lib/apr/include/apr_network_io.h
Index: apr_network_io.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_network_io.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- apr_network_io.h 1999/12/01 20:35:37 1.17
+++ apr_network_io.h 1999/12/04 21:48:33 1.18
@@ -61,6 +61,7 @@
#endif
#include apr_general.h
+#include apr_file_io.h
#include apr_errno.h
#if APR_HAVE_NETINET_IN_H
#include netinet/in.h
@@ -103,7 +104,18 @@
typedef struct socket_t ap_socket_t;
typedef struct pollfd_tap_pollfd_t;
+typedef struct hdtr_tap_hdtr_t;
+#ifdef APR_HAS_SENDFILE
+/* A structure to encapsulate headers and trailers for ap_sendfile */
+struct hdtr_t {
+struct iovec* headers;
+int numheaders;
+struct iovec* trailers;
+int numtrailers;
+};
+#endif
+
/* function definitions */
ap_status_t ap_create_tcp_socket(ap_socket_t **, ap_context_t *);
@@ -123,6 +135,10 @@
ap_status_t ap_send(ap_socket_t *, const char *, ap_ssize_t *);
ap_status_t ap_sendv(ap_socket_t *sock, const struct iovec *vec, ap_int32_t
nvec, ap_int32_t *nbytes);
+#ifdef HAVE_SENDFILE
+ap_status_t ap_sendfile(ap_socket_t *sock, ap_file_t *file, ap_hdtr_t *hdtr,
ap_off_t *offset,
+ ap_size_t *len, ap_int32_t flags);
+#endif
ap_status_t ap_recv(ap_socket_t *, char *, ap_ssize_t *);
ap_status_t ap_setsocketopt(ap_socket_t *, ap_int32_t, ap_int32_t);
1.11 +6 -0 apache-2.0/src/lib/apr/network_io/unix/networkio.h
Index: networkio.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/networkio.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- networkio.h 1999/12/03 15:18:33 1.10
+++ networkio.h 1999/12/04 21:48:34 1.11
@@ -62,6 +62,12 @@
#include apr_lib.h
/* System headers the network I/O library needs */
+#if HAVE_SYS_TYPES_H
+#include sys/types.h
+#endif
+#if HAVE_SYS_UIO_H
+#include sys/uio.h
+#endif
#if HAVE_POLL_H
#include poll.h
#endif
1.8 +380 -0apache-2.0/src/lib/apr/network_io/unix/sendrecv.c
Index: sendrecv.c
cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h poll.c
rbb 99/12/01 10:39:45 Modified:src/lib/apr acconfig.h configure.in src/lib/apr/file_io/unix fileio.h readwrite.c src/lib/apr/include apr.h.in apr_errno.h apr_file_io.h apr_fnmatch.h apr_general.h apr_lib.h apr_md5.h apr_network_io.h apr_pools.h apr_portable.h apr_thread_proc.h src/lib/apr/lib apr_cpystrn.c apr_getpass.c apr_pools.c apr_signal.c apr_snprintf.c src/lib/apr/locks/unix locks.c src/lib/apr/network_io/unix networkio.h poll.c Log: The next step in removing the APR HAVE_*_H leak. This removes all of those checks from the public include files, and removes all unnecessary #include of system headers from public APR headers. The final step will add back in the checks once I can protect the namespace. Revision ChangesPath 1.14 +0 -3 apache-2.0/src/lib/apr/acconfig.h Index: acconfig.h === RCS file: /home/cvs/apache-2.0/src/lib/apr/acconfig.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- acconfig.h1999/11/17 18:09:55 1.13 +++ acconfig.h1999/12/01 18:38:55 1.14 @@ -48,9 +48,6 @@ #undef APR_HAS_THREADS @BOTTOM@ -#define API_EXPORT(type) type -#define API_EXPORT_NONSTD(type) type -#define API_VAR_IMPORT extern /* Make sure we have ssize_t defined to be somethine */ #undef ssize_t 1.29 +38 -5 apache-2.0/src/lib/apr/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- configure.in 1999/11/30 18:45:50 1.28 +++ configure.in 1999/12/01 18:39:02 1.29 @@ -79,6 +79,26 @@ AC_SUBST(int_value) AC_SUBST(long_value) +if test $ac_cv_type_off_t = yes; then +off_t_value=off_t +else +off_t_value=ap_int32_t +fi +if test $ac_cv_type_size_t = yes; then +size_t_value=size_t +else +size_t_value=ap_int32_t +fi +if test $ac_cv_type_ssize_t = yes; then +ssize_t_value=ssize_t +else +ssize_t_value=ap_int32_t +fi + +AC_SUBST(off_t_value) +AC_SUBST(size_t_value) +AC_SUBST(ssize_t_value) + AC_CHECK_SIZEOF_EXTENDED([#include sys/types.h], ssize_t, 8) # Use /bin/sh if it exists, otherwise go looking for sh in the path @@ -216,6 +236,14 @@ AC_FUNC_MMAP AC_FUNC_SETPGRP +if test $ac_cv_func_mmap_fixed_mapped = yes; then +mmap=#define APR_HAS_MMAP 1 +AC_SUBST(mmap) +else +mmap=#define APR_HAS_MMAP 0 +AC_SUBST(mmap) +fi + AC_MSG_CHECKING(looking for union semun in sys/sem.h) AC_TRY_COMPILE([ #include sys/types.h @@ -243,13 +271,16 @@ [ --enable-threads Enable threading support in APR.], [ if test $enableval = no; then -AC_DEFINE(APR_HAS_THREADS, 0) +threads=#define APR_HAS_THREADS 0 +AC_SUBST(threads) AC_MSG_RESULT(no) else if test $enableval = pthread; then AC_CHECK_HEADERS(pthread.h, [ - AC_DEFINE(APR_HAS_THREADS, 1) ], [ - AC_DEFINE(APR_HAS_THREADS, 0) ] ) + threads=#define APR_HAS_THREADS 1 + AC_SUBST(threads) ], [ + threads=#define APR_HAS_THREADS 0 + AC_SUBST(threads) ] ) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -258,8 +289,10 @@ ], [ AC_CHECK_HEADERS(pthread.h, [ - AC_DEFINE(APR_HAS_THREADS, 1) ], [ - AC_DEFINE(APR_HAS_THREADS, 0) ] ) + threads=#define APR_HAS_THREADS 1 + AC_SUBST(threads) ], [ + threads=#define APR_HAS_THREADS 0 + AC_SUBST(threads) ] ) ]) 1.5 +1 -0 apache-2.0/src/lib/apr/file_io/unix/fileio.h Index: fileio.h === RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileio.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fileio.h 1999/11/10 15:49:53 1.4 +++ fileio.h 1999/12/01 18:39:08 1.5 @@ -62,6 +62,7 @@ #include time.h #include dirent.h #include sys/uio.h +#include stdio.h #include apr_general.h #include apr_file_io.h #include apr_errno.h 1.17 +1 -0 apache-2.0/src/lib/apr/file_io/unix/readwrite.c Index: readwrite.c === RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- readwrite.c 1999/11/10 15:49:53 1.16 +++ readwrite.c 1999/12/01 18:39:09
