cvs commit: apache-2.0/src/build build.mk build2.mk
sascha 00/01/16 09:18:14 Modified:src/build build.mk build2.mk Log: Remove dependency on automake's aclocal. We continue to use acinclude.m4, because aclocal.m4 needs to contain libtool's m4 macros. Revision ChangesPath 1.3 +2 -1 apache-2.0/src/build/build.mk Index: build.mk === RCS file: /home/cvs/apache-2.0/src/build/build.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -u -r1.2 -r1.3 --- build.mk 2000/01/12 16:55:58 1.2 +++ build.mk 2000/01/16 17:18:13 1.3 @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ## -# $Id: build.mk,v 1.2 2000/01/12 16:55:58 sascha Exp $ +# $Id: build.mk,v 1.3 2000/01/16 17:18:13 sascha Exp $ # # Makefile to generate build tools # @@ -33,6 +33,7 @@ generated_lists: @echo config_m4_files = `find . -name config.m4` $@ + @n=`which libtool`; echo libtool_prefix = `dirname $$n`/.. $@ $(STAMP): build/buildcheck.sh @build/buildcheck.sh touch $(STAMP) 1.2 +7 -5 apache-2.0/src/build/build2.mk Index: build2.mk === RCS file: /home/cvs/apache-2.0/src/build/build2.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -u -u -r1.1 -r1.2 --- build2.mk 2000/01/11 13:10:58 1.1 +++ build2.mk 2000/01/16 17:18:13 1.2 @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ## -# $Id: build2.mk,v 1.1 2000/01/11 13:10:58 sascha Exp $ +# $Id: build2.mk,v 1.2 2000/01/16 17:18:13 sascha Exp $ include generated_lists @@ -37,17 +37,19 @@ APR_TARGETS = $(apr_configure) $(apr_config_h_in) -targets = .deps $(APACHE_TARGETS) $(APR_TARGETS) +targets = .deps aclocal.m4 $(APACHE_TARGETS) $(APR_TARGETS) all: $(targets) .deps: touch $@ -aclocal.m4: configure.in acinclude.m4 +libtool_m4 = $(libtool_prefix)/share/aclocal/libtool.m4 + +aclocal.m4: acinclude.m4 $(libtool_m4) @echo rebuilding $@ - aclocal - + @cat acinclude.m4 $(libtool_m4) $@ + $(LT_TARGETS): libtoolize $(AMFLAGS) --force
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
mjc 00/01/16 10:06:33 Modified:src CHANGES src/modules/standard mod_rewrite.c Log: The recent fix to allow ProxyPass directories to be protected with user authentication did not work when using mod_rewrite to do the mirror proxying. This fixes it. Revision ChangesPath 1.1500+2 -2 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1499 retrieving revision 1.1500 diff -u -r1.1499 -r1.1500 --- CHANGES 2000/01/15 16:40:40 1.1499 +++ CHANGES 2000/01/16 18:06:25 1.1500 @@ -23,8 +23,8 @@ work. Fixed. [Manoj Kasichainula, Ben Laurie] - *) ProxyPass erroneously converted authentication requests to proxy - authentication requests. Fixed. + *) ProxyPass and mod_rewrite's proxy mode erroneously converted + authentication requests to proxy authentication requests. [Ben Laurie] *) Reverse a patch which broke HPUX shared builds. Basically 1.155 +2 -2 apache-1.3/src/modules/standard/mod_rewrite.c Index: mod_rewrite.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- mod_rewrite.c 2000/01/12 15:23:25 1.154 +++ mod_rewrite.c 2000/01/16 18:06:30 1.155 @@ -1123,7 +1123,7 @@ } /* now make sure the request gets handled by the proxy handler */ -r-proxyreq = STD_PROXY; +r-proxyreq = PROXY_PASS; r-handler = proxy-server; rewritelog(r, 1, go-ahead with proxy request %s [OK], @@ -1387,7 +1387,7 @@ } /* now make sure the request gets handled by the proxy handler */ -r-proxyreq = STD_PROXY; +r-proxyreq = PROXY_PASS; r-handler = proxy-server; rewritelog(r, 1, [per-dir %s] go-ahead with proxy request
cvs commit: apache-2.0/src/build build2.mk
sascha 00/01/16 10:20:18 Modified:src/build build2.mk Log: Remove config.cache, if configure is rebuilt Revision ChangesPath 1.3 +2 -1 apache-2.0/src/build/build2.mk Index: build2.mk === RCS file: /home/cvs/apache-2.0/src/build/build2.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -u -r1.2 -r1.3 --- build2.mk 2000/01/16 17:18:13 1.2 +++ build2.mk 2000/01/16 18:20:17 1.3 @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ## -# $Id: build2.mk,v 1.2 2000/01/16 17:18:13 sascha Exp $ +# $Id: build2.mk,v 1.3 2000/01/16 18:20:17 sascha Exp $ include generated_lists @@ -65,6 +65,7 @@ configure: aclocal.m4 configure.in $(config_m4_files) @echo rebuilding $@ + rm -f config.cache autoconf $(apr_config_h_in): $(apr_configure) lib/apr/acconfig.h
cvs commit: apache-2.0/src/lib/apr configure.in
sascha 00/01/16 10:20:57 Modified:src/lib/apr configure.in Log: Inherit thread flags from Apache Revision ChangesPath 1.43 +8 -10 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.42 retrieving revision 1.43 diff -u -u -r1.42 -r1.43 --- configure.in 2000/01/11 12:59:34 1.42 +++ configure.in 2000/01/16 18:20:57 1.43 @@ -32,6 +32,13 @@ # This macro needs to be here in case we are on an AIX box. AC_AIX +dnl inherit REENTRANCY_FLAGS +test -n $ac_cv_pass_REENTRANCY_CFLAGS \ +CFLAGS=$CFLAGS $ac_cv_pass_REENTRANCY_CFLAGS + +test -n $ac_cv_pass_REENTRANCY_LDFLAGS \ +LDFLAGS=$LDFLAGS $ac_cv_pass_REENTRANCY_LDFLAGS + AC_CACHE_CHECK([for threads], ac_cv_enable_threads, [ AC_ARG_ENABLE(threads, [ --enable-threads Enable threading support in APR.], @@ -69,21 +76,14 @@ pthreadser=0 if test $threads = 1; then AC_CHECK_DEFINE(PTHREAD_PROCESS_SHARED, pthread.h) -AC_CHECK_LIB(pthread, pthread_mutex_init, [ +AC_CHECK_FUNC(pthread_mutex_init, [ AC_DEFINE(USE_PTHREAD_SERIALIZE) pthreadser=1 ]) -AC_CHECK_LIB(c_r, pthread_mutex_init, [ -AC_DEFINE(USE_PTHREAD_SERIALIZE) -pthreadser=1]) fi 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 inherit REENTRANCY_FLAGS -test -n $ac_cv_pass_REENTRANCY_FLAGS \ -CFLAGS=$CFLAGS $ac_cv_pass_REENTRANCY_FLAGS - dnl # this is the place to put specific options for platform/compiler dnl # combinations case $OS:$CC in @@ -221,8 +221,6 @@ esac AC_CHECK_LIB(dl, dlopen) -AC_CHECK_LIB(pthread, pthread_mutex_init) -AC_CHECK_LIB(c_r, pthread_mutex_init) AC_CHECK_LIB(socket,socket) AC_CHECK_LIB(crypt,crypt) AC_CHECK_LIB(ufc,crypt)
cvs commit: apache-2.0/src acinclude.m4 configure.in
sascha 00/01/16 10:24:40 Modified:src acinclude.m4 configure.in Log: Rewrite pthreads check to be more tool-independent, and propagate flags to APR. Revision ChangesPath 1.16 +25 -38apache-2.0/src/acinclude.m4 Index: acinclude.m4 === RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v retrieving revision 1.15 retrieving revision 1.16 diff -u -u -r1.15 -r1.16 --- acinclude.m4 2000/01/12 20:41:57 1.15 +++ acinclude.m4 2000/01/16 18:24:39 1.16 @@ -141,28 +141,6 @@ fi ]) -dnl APACHE_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) -AC_DEFUN(APACHE_CHECK_GCC_ARG,[ - gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_) - AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [ - echo 'void somefunc() { };' conftest.c - cmd='$CC $1 -c conftest.c' - if eval $cmd 21 | egrep -e $1 /dev/null ; then -ac_result=no - else -ac_result=yes - fi - eval $gcc_arg_name=$ac_result - rm -f conftest.* - ]) - if eval test \$$gcc_arg_name = yes; then -$2 - else -: -$3 - fi -]) - dnl dnl APACHE_CHECK_THREADS() dnl @@ -189,26 +167,35 @@ AC_DEFUN(APACHE_CHECK_THREADS,[ -old_CFLAGS=$CFLAGS +APACHE_THREAD_TEST -if test -n $GCC; then - APACHE_CHECK_GCC_ARG(-pthread, [ -CFLAGS=$CFLAGS -pthread -],[ -APACHE_CHECK_GCC_ARG(-pthreads, [ -CFLAGS=$CFLAGS -pthreads -],[ -APACHE_CHECK_GCC_ARG(-mthreads, [ -CFLAGS=$CFLAGS -mthreads -])])]) +if test $apache_threads_working != yes; then + for flag in -pthreads -pthread -mthreads; do +AC_MSG_CHECKING(whether $flag enables POSIX threads) +ac_save=$CFLAGS +CFLAGS=$CFLAGS $flag +APACHE_THREAD_TEST +if test $apache_threads_working = yes; then + AC_MSG_RESULT(yes) + REENTRANCY_CFLAGS=$REENTRANCY_CFLAGS $flag + break +fi +CFLAGS=$ac_save +AC_MSG_RESULT(no) + done fi -APACHE_THREAD_TEST - if test $apache_threads_working != yes; then - CFLAGS=$old_CFLAGS - AC_CHECK_LIB(pthread, pthread_kill) - APACHE_THREAD_TEST + for lib in pthread pthreads c_r; do +ac_save=$LIBS +LIBS=$LIBS -l$lib +APACHE_THREAD_TEST +if test $apache_threads_working = yes; then + REENTRANCY_LDFLAGS=$REENTRANCY_LDFLAGS -l$lib + break +fi +LIBS=$ac_save + done fi if test $apache_threads_working = yes; then 1.19 +6 -4 apache-2.0/src/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/configure.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -u -r1.18 -r1.19 --- configure.in 2000/01/11 13:10:56 1.18 +++ configure.in 2000/01/16 18:24:39 1.19 @@ -104,11 +104,13 @@ case `uname -sr` in SunOS 5*) - REENTRANCY_FLAGS=$REENTRANCY_FLAGS -D_POSIX_PTHREAD_SEMANTICS;; + REENTRANCY_CFLAGS=$REENTRANCY_CFLAGS -D_POSIX_PTHREAD_SEMANTICS;; esac -REENTRANCY_FLAGS=$REENTRANCY_FLAGS -D_REENTRANT +REENTRANCY_CFLAGS=$REENTRANCY_CFLAGS -D_REENTRANT +CFLAGS=$CFLAGS $REENTRANCY_CFLAGS + AC_FUNC_SELECT_ARGTYPES dnl Check if we'll actually need to cast select args all the time @@ -156,7 +158,6 @@ $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh fi -CPPFLAGS=$CPPFLAGS $REENTRANCY_FLAGS APACHE_FAST_OUTPUT(Makefile ap/Makefile lib/Makefile main/Makefile modules/Makefile os/Makefile) APACHE_FAST_GENERATE @@ -165,6 +166,7 @@ rm -f $srcdir/modules.c echo $MODLIST | $AWK -f $srcdir/helpers/build-modules-c.awk $srcdir/modules.c -APACHE_PASSTHRU(REENTRANCY_FLAGS) +APACHE_PASSTHRU(REENTRANCY_CFLAGS) +APACHE_PASSTHRU(REENTRANCY_LDFLAGS) AC_OUTPUT($APACHE_OUTPUT_FILES)
cvs commit: apache-2.0/src/modules/mpm config.m4
sascha 00/01/16 12:00:52 Modified:src acinclude.m4 configure.in src/build build2.mk src/lib/apr aclocal.m4 configure.in src/modules/mpm config.m4 Added: src/lib/apr threads.m4 Log: Move threads/reentrancy m4 macros into threads.m4. All results are now cached and can be made easily available to Apache and APR. Revision ChangesPath 1.17 +1 -63 apache-2.0/src/acinclude.m4 Index: acinclude.m4 === RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v retrieving revision 1.16 retrieving revision 1.17 diff -u -u -r1.16 -r1.17 --- acinclude.m4 2000/01/16 18:24:39 1.16 +++ acinclude.m4 2000/01/16 20:00:46 1.17 @@ -141,69 +141,7 @@ fi ]) -dnl -dnl APACHE_CHECK_THREADS() -dnl -dnl Determine the best flags for linking against a threading library. -dnl -AC_DEFUN(APACHE_THREAD_TEST, [ -AC_TRY_RUN( [ -#include pthread.h - -void *thread_routine(void *data) { -return data; -} - -int main() { -pthread_t thd; -int data = 1; -return pthread_create(thd, NULL, thread_routine, data); -} ], [ - apache_threads_working=yes - ], [ - apache_threads_working=no - ], apache_threads_working=no ) ] ) - - -AC_DEFUN(APACHE_CHECK_THREADS,[ - -APACHE_THREAD_TEST - -if test $apache_threads_working != yes; then - for flag in -pthreads -pthread -mthreads; do -AC_MSG_CHECKING(whether $flag enables POSIX threads) -ac_save=$CFLAGS -CFLAGS=$CFLAGS $flag -APACHE_THREAD_TEST -if test $apache_threads_working = yes; then - AC_MSG_RESULT(yes) - REENTRANCY_CFLAGS=$REENTRANCY_CFLAGS $flag - break -fi -CFLAGS=$ac_save -AC_MSG_RESULT(no) - done -fi - -if test $apache_threads_working != yes; then - for lib in pthread pthreads c_r; do -ac_save=$LIBS -LIBS=$LIBS -l$lib -APACHE_THREAD_TEST -if test $apache_threads_working = yes; then - REENTRANCY_LDFLAGS=$REENTRANCY_LDFLAGS -l$lib - break -fi -LIBS=$ac_save - done -fi - -if test $apache_threads_working = yes; then - threads_result=POSIX Threads found -else - threads_result=POSIX Threads not found -fi -]) +sinclude(lib/apr/threads.m4) dnl dnl APACHE_INADDR_NONE 1.20 +1 -11 apache-2.0/src/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/configure.in,v retrieving revision 1.19 retrieving revision 1.20 diff -u -u -r1.19 -r1.20 --- configure.in 2000/01/16 18:24:39 1.19 +++ configure.in 2000/01/16 20:00:46 1.20 @@ -102,15 +102,8 @@ APACHE_INADDR_NONE -case `uname -sr` in -SunOS 5*) - REENTRANCY_CFLAGS=$REENTRANCY_CFLAGS -D_POSIX_PTHREAD_SEMANTICS;; -esac +REENTRANCY_FLAGS -REENTRANCY_CFLAGS=$REENTRANCY_CFLAGS -D_REENTRANT - -CFLAGS=$CFLAGS $REENTRANCY_CFLAGS - AC_FUNC_SELECT_ARGTYPES dnl Check if we'll actually need to cast select args all the time @@ -165,8 +158,5 @@ dnl ## Build modules.c rm -f $srcdir/modules.c echo $MODLIST | $AWK -f $srcdir/helpers/build-modules-c.awk $srcdir/modules.c - -APACHE_PASSTHRU(REENTRANCY_CFLAGS) -APACHE_PASSTHRU(REENTRANCY_LDFLAGS) AC_OUTPUT($APACHE_OUTPUT_FILES) 1.4 +2 -2 apache-2.0/src/build/build2.mk Index: build2.mk === RCS file: /home/cvs/apache-2.0/src/build/build2.mk,v retrieving revision 1.3 retrieving revision 1.4 diff -u -u -r1.3 -r1.4 --- build2.mk 2000/01/16 18:20:17 1.3 +++ build2.mk 2000/01/16 20:00:48 1.4 @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ## -# $Id: build2.mk,v 1.3 2000/01/16 18:20:17 sascha Exp $ +# $Id: build2.mk,v 1.4 2000/01/16 20:00:48 sascha Exp $ include generated_lists @@ -73,6 +73,6 @@ @rm -f $@ (cd lib/apr autoheader) -$(apr_configure): lib/apr/aclocal.m4 lib/apr/configure.in +$(apr_configure): lib/apr/aclocal.m4 lib/apr/configure.in lib/apr/threads.m4 @echo rebuilding $@ (cd lib/apr autoconf) 1.10 +2 -0 apache-2.0/src/lib/apr/aclocal.m4 Index: aclocal.m4 === RCS file: /home/cvs/apache-2.0/src/lib/apr/aclocal.m4,v retrieving revision 1.9 retrieving revision 1.10 diff -u -u -r1.9 -r1.10 --- aclocal.m42000/01/11 12:58:46 1.9 +++ aclocal.m42000/01/16 20:00:49 1.10 @@ -187,3 +187,5 @@ AC_DEFINE(HAVE_SOCKLEN_T, 1, [Whether you have socklen_t]) fi ]) + +sinclude(threads.m4)
cvs commit: apache-1.3/htdocs/manual/misc FAQ-I.html
martin 00/01/16 12:52:31 Modified:htdocs/manual/misc FAQ-I.html Log: At least add a pointer to Andrew Ford's cronolog utility, now that it's under the Ap.License Revision ChangesPath 1.4 +24 -1 apache-1.3/htdocs/manual/misc/FAQ-I.html Index: FAQ-I.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/FAQ-I.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- FAQ-I.html1999/07/03 22:12:50 1.3 +++ FAQ-I.html2000/01/16 20:52:30 1.4 @@ -31,7 +31,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.3 $ ($Date: 1999/07/03 22:12:50 $) + $Revision: 1.4 $ ($Date: 2000/01/16 20:52:30 $) /P P The latest version of this FAQ is always available from the main @@ -82,6 +82,8 @@ /LI LIA HREF=#searchDoes Apache include a search engine?/A /LI + LIA HREF=#rotateHow can I rotate my log files?/A + /LI /OL /LI !--#endif -- @@ -202,6 +204,27 @@ Apache include A HREF=http://www.htdig.org/;ht://Dig/A and A HREF=http://sunsite.berkeley.edu/SWISH-E/;SWISH-E/A. /P + HR + /LI + LIA NAME=rotate + STRONGHow can I rotate my log files?/STRONG + /A + PThe simple answer: by piping the transfer log into an appropriate + log file rotation utility./P + PThe longer answer: In the src/support/ directory, you will find a + utility called CODErotatelogs/CODE which can be used like this:PRE + TransferLog |/path/to/rotatelogs /path/to/logs/access_log 86400 + /PRE to enable daily rotation of the log files.BR + A more sophisticated solution of a logfile rotation utility is + available under the name CODEcronolog/CODE from Andrew Ford's site at + A HREF=http://www.ford-mason.co.uk/resources/cronolog/; + http://www.ford-mason.co.uk/resources/cronolog//A. It can automatically + create logfile subdirectories based on time and date, and can have a + constant symlink point to the rotating logfiles. (As of version 1.6.1, + cronolog is available under the A HREF=../LICENSEApache License/A). + Use it like this:PRE + CustomLog |/path/to/cronolog --symlink=/usr/local/apache/logs/access_log /usr/local/apache/logs/%Y/%m/access_log combined + /PRE/P HR /LI /OL
cvs commit: apache-1.3/src/main http_vhost.c
fielding00/01/16 12:59:59 Modified:src/main http_vhost.c Log: Squash warnings by using ap_isalnum and ap_isdigit. Revision ChangesPath 1.18 +2 -2 apache-1.3/src/main/http_vhost.c Index: http_vhost.c === RCS file: /home/cvs/apache-1.3/src/main/http_vhost.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- http_vhost.c 1999/12/20 18:16:50 1.17 +++ http_vhost.c 2000/01/16 20:59:59 1.18 @@ -670,7 +670,7 @@ src = r-hostname; dst = host; while (*src) { - if (!isalnum(*src) *src != '.' *src != '-') { + if (!ap_isalnum(*src) *src != '.' *src != '-') { if (*src == ':') break; else @@ -682,7 +682,7 @@ /* check the port part */ if (*src++ == ':') { while (*src) { - if (!isdigit(*src++)) { + if (!ap_isdigit(*src++)) { goto bad; } }