cvs commit: apache-site/contributors index.html
marc99/10/10 16:45:41 Modified:contributors index.html Log: Minor update. The things I thought would be wrong were old enough to be right. Revision ChangesPath 1.76 +1 -1 apache-site/contributors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/contributors/index.html,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- index.html1999/10/09 02:50:05 1.75 +++ index.html1999/10/10 23:45:40 1.76 @@ -480,7 +480,7 @@ Location: Edmonton, Alberta, Canada Contributions: Security patches, bug hunting and debugging of networking issues. -OS Expertise: *BSD +OS Expertise:Linux, *BSD, Solaris
cvs commit: apache-2.0/src/modules/mpm/winnt winnt.c
rbb 99/10/10 13:35:07 Modified:src/lib/apr Makefile.in src/lib/apr/include apr_network_io.h apr_portable.h src/lib/apr/network_io/beos poll.c sockets.c sockopt.c src/lib/apr/network_io/os2 poll.c sockopt.c src/lib/apr/network_io/unix poll.c sockets.c sockopt.c src/lib/apr/network_io/win32 poll.c sockets.c sockopt.c src/lib/apr/test ab_apr.c server.c src/main listen.c rfc1413.c src/modules/mpm/dexter dexter.c src/modules/mpm/mpmt_pthread mpmt_pthread.c src/modules/mpm/prefork prefork.c src/modules/mpm/winnt winnt.c Log: Bring network code to the parameter order spec. This means contexts go last, and result parameters go first. Also fixed a small bug in the Makefile. We should be removing the libs dir when we do a distclean, we are now. Revision ChangesPath 1.11 +1 -0 apache-2.0/src/lib/apr/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-2.0/src/lib/apr/Makefile.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile.in 1999/10/08 16:10:38 1.10 +++ Makefile.in 1999/10/10 20:34:52 1.11 @@ -52,6 +52,7 @@ -$(RM) -f *.o *.a *.so -$(RM) -f config.cache config.status config.log -$(RM) -f Makefile + -$(RM) -Rf libs subdirs: @for i in $(SUBDIRS); do \ 1.10 +7 -10 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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- apr_network_io.h 1999/10/10 17:07:59 1.9 +++ apr_network_io.h 1999/10/10 20:34:54 1.10 @@ -114,8 +114,8 @@ ap_status_t ap_connect(ap_socket_t *, char *); ap_status_t ap_get_remote_hostname(char **, ap_socket_t *); -ap_status_t ap_gethostname(ap_context_t *, char *, int); -ap_status_t ap_get_socketdata(ap_socket_t *, char *, void *); +ap_status_t ap_gethostname(char *, int, ap_context_t *); +ap_status_t ap_get_socketdata(void *, char *, ap_socket_t *); ap_status_t ap_set_socketdata(ap_socket_t *, void *, char *, ap_status_t (*cleanup) (void*)); @@ -125,18 +125,15 @@ ap_status_t ap_setsocketopt(ap_socket_t *, ap_int32_t, ap_int32_t); ap_status_t ap_setport(ap_socket_t *, ap_uint32_t); ap_status_t ap_setipaddr(ap_socket_t *, const char *); -ap_status_t ap_getport(ap_socket_t *, ap_uint32_t *); +ap_status_t ap_getport(ap_uint32_t *, ap_socket_t *); ap_status_t ap_getipaddr(char *buf, ap_ssize_t len, const ap_socket_t *sock); -ap_status_t ap_setup_poll(ap_pollfd_t **pollset, ap_context_t *ctx, - ap_int32_t nsocks); -ap_status_t ap_poll(struct pollfd_t *pollset, ap_int32_t *nsocks, - ap_int32_t timeout); -ap_status_t ap_add_poll_socket(ap_pollfd_t *pollset, ap_socket_t *sock, -ap_int16_t events); +ap_status_t ap_setup_poll(ap_pollfd_t **, ap_int32_t, ap_context_t *); +ap_status_t ap_poll(ap_pollfd_t *, ap_int32_t *, ap_int32_t); +ap_status_t ap_add_poll_socket(ap_pollfd_t *, ap_socket_t *, ap_int16_t); ap_status_t ap_remove_poll_socket(ap_pollfd_t *, ap_socket_t *, ap_int16_t); ap_status_t ap_clear_poll_sockets(ap_pollfd_t *, ap_int16_t); -ap_status_t ap_get_revents(ap_pollfd_t *, ap_socket_t *, ap_int16_t *); +ap_status_t ap_get_revents(ap_int16_t *, ap_socket_t *, ap_pollfd_t *); ap_status_t ap_get_polldata(ap_pollfd_t *, char *, void *); ap_status_t ap_set_polldata(ap_pollfd_t *, void *, char *, ap_status_t (*cleanup) (void *)); 1.7 +1 -1 apache-2.0/src/lib/apr/include/apr_portable.h Index: apr_portable.h === RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- apr_portable.h1999/10/06 23:04:01 1.6 +++ apr_portable.h1999/10/10 20:34:54 1.7 @@ -182,7 +182,7 @@ ap_status_t ap_get_os_file(ap_os_file_t *, ap_file_t *); ap_status_t ap_get_os_dir(ap_os_dir_t *, ap_dir_t *); -ap_status_t ap_get_os_sock(ap_socket_t *, ap_os_sock_t *); +ap_status_t ap_get_os_sock(ap_os_sock_t *, ap_socket_t *); ap_status_t ap_get_os_lock(ap_lock_t *, ap_os_lock_t *); ap_status_t ap_get_os_thread(ap_thread_t *, ap_os_thread_t *); ap_status_t ap_get_os_proc(ap_proc_t *, ap_os_proc_t *); 1.5 +2 -2 apache-2.0/src/lib/apr/network_io/beos/poll.c Index: poll.c ===
cvs commit: apache-2.0/src/lib/apr/threadproc/beos apr_proc_stub.c
dreid 99/10/10 10:25:32
Modified:src/lib/apr configure.in
src/lib/apr/network_io/beos sockopt.c
src/lib/apr/threadproc/beos apr_proc_stub.c
Log:
Fixing a couple of small bugs in the beos code.
Adjust the way that the check for OSDIR is done. As beos used to have
a file_io and a time dircetory they still show up in the CVS tarballs and
so the check was failing. Thinking about it it's better to look for the
Makefile.in in a directory anyway so thats what this patch does. With it
everything still works.
Revision ChangesPath
1.17 +1 -1 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- configure.in 1999/10/10 17:07:57 1.16
+++ configure.in 1999/10/10 17:25:29 1.17
@@ -223,7 +223,7 @@
SUBDIRS="lib "
for dir in $MODULES
do
-if test -d $dir/$OSDIR; then
+if test -f $dir/$OSDIR/Makefile.in; then
MAKEFILE2="$MAKEFILE2 $dir/$OSDIR/Makefile "
SUBDIRS="$SUBDIRS $dir/$OSDIR "
else
1.6 +2 -2 apache-2.0/src/lib/apr/network_io/beos/sockopt.c
Index: sockopt.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockopt.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sockopt.c 1999/10/10 13:54:18 1.5
+++ sockopt.c 1999/10/10 17:25:30 1.6
@@ -108,7 +108,7 @@
hptr = gethostbyaddr((char *)&(sock->addr->sin_addr),
sizeof(struct in_addr), AF_INET);
if (hptr != NULL) {
-name = (char**)ap_pstrdup(sock->cntxt, hptr->h_name);
+*name = (char*)ap_pstrdup(sock->cntxt, hptr->h_name);
if (*name) {
return APR_SUCCESS;
}
@@ -116,6 +116,6 @@
}
/* XXX - Is this threadsafe? - manoj */
-/* on BeOS this is a global... */
+/* on BeOS h_errno is a global... */
return h_errno;
}
1.2 +1 -1 apache-2.0/src/lib/apr/threadproc/beos/apr_proc_stub.c
Index: apr_proc_stub.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/apr_proc_stub.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_proc_stub.c 1999/09/10 14:00:46 1.1
+++ apr_proc_stub.c 1999/10/10 17:25:31 1.2
@@ -32,7 +32,7 @@
size_t readbuf = 100;
readbuffer = (char*)malloc(sizeof(char) * readbuf);
- newargs = (char**)malloc(sizeof(char) * (argc - 1));
+ *newargs = (char*)malloc(sizeof(char) * (argc - 1));
buffer = (void*)malloc(sizeof(struct pipefd));
/* this will block until we get the data */
cvs commit: apache-2.0/src/modules/mpm/mpmt_pthread acceptlock.c acceptlock.h mpmt_pthread.c
ben 99/10/10 10:08:10 Modified:src Configure src/lib/apr configure.in src/lib/apr/include apr_network_io.h src/lib/apr/network_io/unix networkio.h poll.c sockets.c src/modules/mpm/mpmt_pthread acceptlock.c acceptlock.h mpmt_pthread.c Log: Attempt to port mpmt_pthreads to APR, but threads seem to be broken on my plaform so it is only partially tested. Revision ChangesPath 1.11 +10 -3 apache-2.0/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-2.0/src/Configure,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Configure 1999/10/10 12:17:42 1.10 +++ Configure 1999/10/10 17:07:53 1.11 @@ -1724,15 +1724,24 @@ ## Add in the APR library. ## +TEXTRA_CFLAGS=`egrep '^EXTRA_CFLAGS=' Makefile.config | tail -1 |\ +sed -e 's;^EXTRA_CFLAGS=;;' -e 's;\`.*\`;;'` + if [ -d ./lib/apr ]; then if helpers/PrintPath -s autoconf; then echo " + bootstrapping Apache Portable Runtime (APR)" (cd lib/apr && autoconf && autoheader) fi echo " + configuring Apache Portable Runtime (APR)" +APR_FLAGS=`egrep ^APR_FLAGS= $file|sed -e 's/APR_FLAGS='//` +if [ "x$APR_FLAGS" != "x" ]; then + echo "o with flags: $APR_FLAGS" +fi cd lib/apr stripped_CFLAGS=`echo "$CFLAGS " | sed -e 's/-DTARGET[^ ]*//'` # FIXME -CC="$CC" CFLAGS="$TEXTRA_CFLAGS $stripped_CFLAGS" OPTIM="$TOPTIM $OPTIM" ./configure >/dev/null +# configure fails with -Werror, because it writes crap C for its tests... +stripped_TEXTRA_CFLAGS=`echo "$TEXTRA_CFLAGS" | sed -e 's/-Werror//'` +CC="$CC" CFLAGS="$stripped_TEXTRA_CFLAGS $stripped_CFLAGS" OPTIM="$TOPTIM $OPTIM" ./configure $APR_FLAGS > /dev/null if [ $? -ne 0 ]; then echo "** FAILED to configure APR" exit 1 @@ -2161,8 +2170,6 @@ ## ap_config_auto.h so they are available to external modules needing to ## include Apache header files. ## -TEXTRA_CFLAGS=`egrep '^EXTRA_CFLAGS=' Makefile.config | tail -1 |\ -sed -e 's;^EXTRA_CFLAGS=;;' -e 's;\`.*\`;;'` tmpstr=`echo $CFLAGS $TEXTRA_CFLAGS |\ sed -e 's;[ ]\([+-]\);!\1;g' -e 's/\([^\\\]\)"/\1/g' -e 's/\\\"/\"/g'` OIFS="$IFS" 1.16 +3 -0 apache-2.0/src/lib/apr/configure.in Index: configure.in === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/configure.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- configure.in 1999/10/08 16:07:38 1.15 +++ configure.in 1999/10/10 17:07:57 1.16 @@ -28,6 +28,9 @@ AC_CHECK_PROG(RM, rm, rm) AC_CHECK_PROG(AR, ar, ar) +AC_ARG_WITH(debug,[ --with-debug Turn on debugging and compile time warnings], + [if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -g -Wall"; else CFLAGS="$CFLAGS -g"; fi]) + dnl # this is the place to put specific options for platform/compiler dnl # combinations case "$OS:$CC" in 1.9 +6 -3 apache-2.0/src/lib/apr/include/apr_network_io.h Index: apr_network_io.h === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/include/apr_network_io.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- apr_network_io.h 1999/10/04 16:36:54 1.8 +++ apr_network_io.h 1999/10/10 17:07:59 1.9 @@ -128,9 +128,12 @@ ap_status_t ap_getport(ap_socket_t *, ap_uint32_t *); ap_status_t ap_getipaddr(char *buf, ap_ssize_t len, const ap_socket_t *sock); -ap_status_t ap_setup_poll(ap_pollfd_t **, ap_context_t *, ap_int32_t); -ap_status_t ap_poll(ap_pollfd_t *, ap_int32_t *, ap_int32_t); -ap_status_t ap_add_poll_socket(ap_pollfd_t *, ap_socket_t *, ap_int16_t); +ap_status_t ap_setup_poll(ap_pollfd_t **pollset, ap_context_t *ctx, + ap_int32_t nsocks); +ap_status_t ap_poll(struct pollfd_t *pollset, ap_int32_t *nsocks, + ap_int32_t timeout); +ap_status_t ap_add_poll_socket(ap_pollfd_t *pollset, ap_socket_t *sock, +ap_int16_t events); ap_status_t ap_remove_poll_socket(ap_pollfd_t *, ap_socket_t *, ap_int16_t); ap_status_t ap_clear_poll_sockets(ap_pollfd_t *, ap_int16_t); ap_status_t ap_get_revents(ap_pollfd_t *, ap_socket_t *, ap_int16_t *); 1.6 +3 -0 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
cvs commit: apache-2.0/src/lib/apr/time/beos Makefile.in
dreid 99/10/10 08:14:11 Removed: src/lib/apr/file_io/beos Makefile.in src/lib/apr/time/beos Makefile.in Log: The beos directories under file_io and time aren't needed any longer after the change to the APR configuration that allows the use of default directories. As the directories aren't needed can they now be removed?
cvs commit: apache-2.0/src/include ap.h
dreid 99/10/10 07:32:28 Modified:src/include ap.h Log: ap_killpg has been moved into the APR headers so isn't needed here anymore. In case there is a need I've overlooked I've only commented it out. This stops another annoying warning when building. Revision ChangesPath 1.4 +2 -1 apache-2.0/src/include/ap.h Index: ap.h === RCS file: /home/cvs/apache-2.0/src/include/ap.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ap.h 1999/08/31 05:32:16 1.3 +++ ap.h 1999/10/10 14:32:28 1.4 @@ -78,6 +78,7 @@ /* small utility macros to make things easier to read */ +/* #ifdef WIN32 #define ap_killpg(x, y) #else @@ -86,7 +87,7 @@ #else #define ap_killpg(x, y) (killpg ((x), (y))) #endif -#endif /* WIN32 */ +#endif */ /* WIN32 */ /* ap_vformatter() is a generic printf-style formatting routine * with some extensions. The extensions are:
cvs commit: apache-2.0/src/lib/apr/network_io/beos sockopt.c
dreid 99/10/10 06:54:18
Modified:src/lib/apr/network_io/beos sockopt.c
Log:
This stops a small moan by the compiler.
h_errno is a global so it'll need to be made threadsafe.
Revision ChangesPath
1.5 +2 -1 apache-2.0/src/lib/apr/network_io/beos/sockopt.c
Index: sockopt.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockopt.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sockopt.c 1999/10/08 21:27:41 1.4
+++ sockopt.c 1999/10/10 13:54:18 1.5
@@ -108,7 +108,7 @@
hptr = gethostbyaddr((char *)&(sock->addr->sin_addr),
sizeof(struct in_addr), AF_INET);
if (hptr != NULL) {
-*name = ap_pstrdup(sock->cntxt, hptr->h_name);
+name = (char**)ap_pstrdup(sock->cntxt, hptr->h_name);
if (*name) {
return APR_SUCCESS;
}
@@ -116,5 +116,6 @@
}
/* XXX - Is this threadsafe? - manoj */
+/* on BeOS this is a global... */
return h_errno;
}
cvs commit: apache-2.0/src/lib/apr/network_io/unix poll.c
ben 99/10/10 06:19:58
Modified:src/lib/apr/network_io/unix poll.c
Log:
Use the correct size everywhere.
Revision ChangesPath
1.11 +1 -1 apache-2.0/src/lib/apr/network_io/unix/poll.c
Index: poll.c
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/network_io/unix/poll.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- poll.c1999/10/10 13:15:58 1.10
+++ poll.c1999/10/10 13:19:57 1.11
@@ -174,7 +174,7 @@
int rv;
pollset = (struct pollfd *)ap_palloc(aprset->cntxt,
- sizeof(struct pollfd) * (*nsds));
+ sizeof(struct pollfd) *
aprset->curpos);
for (i = 0; i < aprset->curpos; i++) {
pollset[i].fd = aprset->sock[i];
cvs commit: apache-2.0/src/lib/apr/network_io/unix poll.c
ben 99/10/10 06:15:58
Modified:src/lib/apr/network_io/unix poll.c
Log:
Use the correct size for the pollset.
Revision ChangesPath
1.10 +3 -3 apache-2.0/src/lib/apr/network_io/unix/poll.c
Index: poll.c
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/network_io/unix/poll.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- poll.c1999/10/08 20:04:17 1.9
+++ poll.c1999/10/10 13:15:58 1.10
@@ -176,7 +176,7 @@
pollset = (struct pollfd *)ap_palloc(aprset->cntxt,
sizeof(struct pollfd) * (*nsds));
-for (i = 0; i < (*nsds); i++) {
+for (i = 0; i < aprset->curpos; i++) {
pollset[i].fd = aprset->sock[i];
pollset[i].events = aprset->events[i];
}
@@ -185,10 +185,10 @@
timeout *= 1000;
}
-rv = poll(pollset, (*nsds), timeout);
+rv = poll(pollset, aprset->curpos, timeout);
(*nsds) = rv;
-for (i = 0; i < (*nsds); i++) {
+for (i = 0; i < aprset->curpos; i++) {
aprset->revents[i] = get_revent(pollset[i].revents);
}
cvs commit: apache-2.0/src/lib/apr/include .cvsignore
ben 99/10/10 05:19:59 Modified:src/lib/apr/include .cvsignore Log: Ingore autoheader output. Revision ChangesPath 1.2 +1 -0 apache-2.0/src/lib/apr/include/.cvsignore Index: .cvsignore === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/include/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1999/09/10 16:06:59 1.1 +++ .cvsignore1999/10/10 12:19:58 1.2 @@ -1 +1,2 @@ apr_config.h +apr_config.h.in
cvs commit: apache-2.0/src Configure
ben 99/10/10 05:17:42 Modified:src Configure Log: Always use autoconf if available. Revision ChangesPath 1.10 +1 -1 apache-2.0/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-2.0/src/Configure,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Configure 1999/10/09 20:28:40 1.9 +++ Configure 1999/10/10 12:17:42 1.10 @@ -1725,7 +1725,7 @@ ## Add in the APR library. ## if [ -d ./lib/apr ]; then -if [ ! -f ./lib/apr/configure ]; then +if helpers/PrintPath -s autoconf; then echo " + bootstrapping Apache Portable Runtime (APR)" (cd lib/apr && autoconf && autoheader) fi
