cvs commit: apache-1.3 configure
wsanchez99/12/03 16:59:57
Modified:.configure
Log:
Try to keep the platform overrides in one place for sanity.
Revision ChangesPath
1.111 +4 -6 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- configure 1999/11/28 14:15:35 1.110
+++ configure 1999/12/04 00:59:52 1.111
@@ -236,12 +236,6 @@
iflags_dso=-m 755
iflags_script=-m 755
iflags_data=-m 644
-case $PLATFORM in
-*OS/2* )
-iflags_program=$iflags_program -e .exe
-iflags_core=$iflags_core -e .exe
-;;
-esac
# various other flags
support=1
@@ -327,6 +321,10 @@
iflags_core=${iflags_core} -S \-S\
iflags_dso=${iflags_dso} -S \-S\
;;
+*OS/2* )
+iflags_program=${iflags_program} -e .exe
+iflags_core=${iflags_core} -e .exe
+;;
*)
default_layout=Apache
;;
cvs commit: apache-2.0 configure
wsanchez99/12/03 17:01:12
Modified:.configure
Log:
Try to keep the platform overrides in one place.
Revision ChangesPath
1.6 +4 -6 apache-2.0/configure
Index: configure
===
RCS file: /home/cvs/apache-2.0/configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure 1999/10/05 14:46:06 1.5
+++ configure 1999/12/04 01:01:03 1.6
@@ -237,12 +237,6 @@
iflags_dso=-m 755
iflags_script=-m 755
iflags_data=-m 644
-case $PLATFORM in
-*OS/2* )
-iflags_program=$iflags_program -e .exe
-iflags_core=$iflags_core -e .exe
-;;
-esac
# various other flags
support=1
@@ -328,6 +322,10 @@
iflags_core=${iflags_core} -S \-S\
iflags_dso=${iflags_dso} -S \-S\
;;
+*OS/2* )
+iflags_program=$iflags_program -e .exe
+iflags_core=$iflags_core -e .exe
+;;
*)
default_layout=Apache
;;
cvs commit: apache-1.3/src/include ap_config.h
wsanchez99/12/03 18:50:47 Modified:src/include ap_config.h Log: Disable the DYLD_CANT_UNLOAD workaround for Mac OS X Server, since the current version (and the patched older version) doesn't need this any more. We don't want to delete the code from unix/os.c, however, because OpenStep's dyld needs it. Revision ChangesPath 1.275 +0 -3 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.274 retrieving revision 1.275 diff -u -r1.274 -r1.275 --- ap_config.h 1999/11/28 13:28:07 1.274 +++ ap_config.h 1999/12/04 02:50:43 1.275 @@ -422,9 +422,6 @@ #define PLATFORM Mac OS #endif #define HAVE_DYLD -#ifdef MAC_OS_X_SERVER -#define DYLD_CANT_UNLOAD -#endif /* MAC_OS_X_SERVER */ #define HAVE_GMTOFF #define HAVE_MMAP #define USE_MMAP_FILES
cvs commit: apache-2.0/src/include ap_config.h
wsanchez99/12/03 18:56:19 Modified:src/include ap_config.h Log: Disable the DYLD_CANT_UNLOAD workaround for Mac OS X Server, since the current version (and the patched older version) doesn't need this any more. We don't want to delete the code from unix/os.c, however, because OpenStep's dyld needs it. Revision ChangesPath 1.13 +0 -3 apache-2.0/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ap_config.h 1999/12/01 01:16:05 1.12 +++ ap_config.h 1999/12/04 02:56:18 1.13 @@ -432,9 +432,6 @@ #define PLATFORM Mac OS #endif #define HAVE_DYLD -#ifdef MAC_OS_X_SERVER -#define DYLD_CANT_UNLOAD -#endif /* MAC_OS_X_SERVER */ #define HAVE_GMTOFF #define HAVE_MMAP #define USE_MMAP_FILES
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
rse 99/12/04 03:43:19
Modified:src CHANGES
src/modules/standard mod_rewrite.c
Log:
Fixed a recently introduced off-by-one-character bug in
mod_rewrite's expansion of expression back-references.
Submitted by: Cliff Woolley [EMAIL PROTECTED]
Reviewed by: Ralf S. Engelschall
PR: 4766, 5389
Revision ChangesPath
1.1469+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1468
retrieving revision 1.1469
diff -u -r1.1468 -r1.1469
--- CHANGES 1999/12/01 22:10:39 1.1468
+++ CHANGES 1999/12/04 11:43:12 1.1469
@@ -1,5 +1,9 @@
Changes with Apache 1.3.10
+ *) Fixed a recently introduced off-by-one-character bug in
+ mod_rewrite's expansion of expression back-references.
+ [Cliff Woolley [EMAIL PROTECTED]] PR#4766 PR#5389
+
*) Add IndexOptions DescriptionWidth so that the width of the
description field in fancy-indexed directory listings can
be specified.
1.153 +1 -1 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- mod_rewrite.c 1999/11/26 19:43:50 1.152
+++ mod_rewrite.c 1999/12/04 11:43:17 1.153
@@ -2513,7 +2513,7 @@
/* now apply the standard regex substitution function */
ap_cpystrn(buf, ap_pregsub(p, buf, bri-source,
- bri-nsub+0, bri-regmatch), nbuf);
+ bri-nsub+1, bri-regmatch), nbuf);
/* restore the original $N and backrefs */
for (i = 0; buf[i] != '\0' i nbuf; i++) {
cvs commit: apache-1.3 STATUS
jim 99/12/04 07:38:20 Modified:.STATUS Log: Try to release on the 19th?? Revision ChangesPath 1.759 +4 -4 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.758 retrieving revision 1.759 diff -u -r1.758 -r1.759 --- STATUS1999/11/05 14:53:32 1.758 +++ STATUS1999/12/04 15:38:19 1.759 @@ -1,10 +1,10 @@ 1.3 STATUS: - Last modified at [$Date: 1999/11/05 14:53:32 $] + Last modified at [$Date: 1999/12/04 15:38:19 $] Release: -1.3.10-dev: Current - +1.3.10-dev: Current. Proposal open to try to release on + Dec 19th, 1999. Jim offers to be RM. 1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th. 1.3.8: Not released. 1.3.7: Not released. @@ -16,7 +16,7 @@ 1.3.1: Tagged and rolled on July 19. Announced and released. 1.3.0: Tagged and rolled on June 1. Announced and released on the 6th. -2.0 : In pre-alpha development, see apache-2.0 and apache-apr repository +2.0 : In pre-alpha development, see apache-2.0 repository RELEASE SHOWSTOPPERS:
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 CHANGES
rbb 99/12/04 14:17:49 Modified:src CHANGES Log: Update the CHANGES file with some of the bigger changes I have made recently both for myself and others. I proise I'll try to stay on top of this file from now on. :-) Revision ChangesPath 1.17 +20 -0 apache-2.0/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-2.0/src/CHANGES,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- CHANGES 1999/10/31 09:13:20 1.16 +++ CHANGES 1999/12/04 22:17:48 1.17 @@ -1,4 +1,24 @@ Changes with Apache 2.0-dev + + *) Added APLOG_STARTUP log type. This allows us to write an error + message without any of the date and time information. As a part + of this change, I also removed all of the calls to fprintf(stderr + and replaced them with calls to ap_log_error using APLOG_STARTUP + writing to stderr is no longer portable, because we don't direct + stderr to the error log on all platforms. + [Ryan Bloom] + + *) Convert error logging functions to take errno as an argument. + This makes our error logs more portable, because some Windows API's + don't set errno. This change allows us to still output a valid + message on all of our platforms. + [Ryan Bloom] + + *) mod_mime_magic runs in 2.0-dev now. + [Paul Reder [EMAIL PROTECTED]] + + *) sendfile has been added to APR. + [John Zedlewski [EMAIL PROTECTED]] *) buff.c has been converted to no longer use errno. [Manoj Kasichainula]
