cvs commit: apache-2.0/src/lib/apr/include apr.h.in
rbb 00/02/03 17:07:04 Modified:src/lib/apr configure.in src/lib/apr/include apr.h.in Log: Cleanup the code to determine what kind of shared memory we are using. This is still not great, but at least we are trying now. Revision ChangesPath 1.51 +34 -3 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.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- configure.in 2000/01/28 17:42:45 1.50 +++ configure.in 2000/02/04 01:06:46 1.51 @@ -359,9 +359,40 @@ # Shared memory support. Until I figure out how to do this well, we are hard # coding this. I am hoping to do this more generally ASAP. -anonymous_shm=1 -filebased_shm=0 -keybased_shm=0 + AC_ARG_ENABLE(shmem, +[ --enable-shmem Enable shared memory support in APR. ], +[ ], +ac_cv_enable_shmem=mm ) + +if test $ac_cv_enable_shmem = no; then + sharedmem=0 + anonymous_shm=0 + filebased_shm=0 + keybased_shm=0 +else + if test $ac_cv_enable_shmem = mm; then +sharedmem=1 +anonymous_shm=1 +filebased_shm=0 +keybased_shm=0 + else +if test $ac_cv_enable_shmem = file; then + sharedmem=1 + anonymous_shm=0 + filebased_shm=1 + keybased_shm=0 +else + if test $ac_cv_enable_shmem = key; then +sharedmem=1 +anonymous_shm=0 +filebased_shm=0 +keybased_shm=1 + fi +fi + fi +fi + +AC_SUBST(sharedmem) AC_SUBST(anonymous_shm) AC_SUBST(filebased_shm) AC_SUBST(keybased_shm) 1.14 +5 -4 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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- apr.h.in 2000/01/28 17:42:51 1.13 +++ apr.h.in 2000/02/04 01:06:57 1.14 @@ -56,10 +56,11 @@ #endif /* APR Feature Macros */ -#define APR_HAS_THREADS @threads@ -#define APR_HAS_SENDFILE @sendfile@ -#define APR_HAS_MMAP @mmap@ -#define APR_HAS_FORK @fork@ +#define APR_HAS_SHARED_MEMORY @sharedmem@ +#define APR_HAS_THREADS @threads@ +#define APR_HAS_SENDFILE @sendfile@ +#define APR_HAS_MMAP @mmap@ +#define APR_HAS_FORK @fork@ /* Typedefs that APR needs. */
cvs commit: apache-2.0/src/lib/apr/network_io/win32 sendrecv.c
stoddard00/02/04 11:05:24 Modified:src/lib/apr/network_io/win32 sendrecv.c Log: Fix segfault. We were clobbering the stack with this memcpy :-) Revision ChangesPath 1.8 +2 -2 apache-2.0/src/lib/apr/network_io/win32/sendrecv.c Index: sendrecv.c === RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sendrecv.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sendrecv.c2000/01/31 19:21:41 1.7 +++ sendrecv.c2000/02/04 19:05:22 1.8 @@ -190,7 +190,7 @@ tfb.Head = ap_palloc(sock-cntxt, tfb.HeadLength); /* Should this be a malloc? */ for (i = 0; i hdtr-numheaders; i++) { -memcpy(tfb.Head + ptr, hdtr-headers[i].iov_base, +memcpy((char*)tfb.Head + ptr, hdtr-headers[i].iov_base, hdtr-headers[i].iov_len); ptr += hdtr-headers[i].iov_len; } @@ -204,7 +204,7 @@ tfb.Tail = ap_palloc(sock-cntxt, tfb.TailLength); /* Should this be a malloc? */ for (i = 0; i hdtr-numtrailers; i++) { -memcpy(tfb.Tail + ptr, hdtr-trailers[i].iov_base, +memcpy((char*)tfb.Tail + ptr, hdtr-trailers[i].iov_base, hdtr-trailers[i].iov_len); ptr += hdtr-trailers[i].iov_len; }
cvs commit: apache-2.0/src/lib/apr/network_io/win32 sendrecv.c
stoddard00/02/04 11:22:57 Modified:src/lib/apr/network_io/win32 sendrecv.c Log: Very minor performance tweak. Do not copy header/trailer buffer if there is just one. Revision ChangesPath 1.9 +28 -15apache-2.0/src/lib/apr/network_io/win32/sendrecv.c Index: sendrecv.c === RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sendrecv.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sendrecv.c2000/02/04 19:05:22 1.8 +++ sendrecv.c2000/02/04 19:22:55 1.9 @@ -183,30 +183,43 @@ memset(tfb, '\0', sizeof (tfb)); if (hdtr hdtr-numheaders) { ptfb = tfb; -for (i = 0; i hdtr-numheaders; i++) { -tfb.HeadLength += hdtr-headers[i].iov_len; +if (hdtr-numheaders == 1) { +ptfb-Head = hdtr-headers[0].iov_base; +ptfb-HeadLength = hdtr-headers[0].iov_len; } +else { +/* Need to collapse all the header fragments into one buffer */ +for (i = 0; i hdtr-numheaders; i++) { +ptfb-HeadLength += hdtr-headers[i].iov_len; +} +ptfb-Head = ap_palloc(sock-cntxt, ptfb-HeadLength); /* Should this be a malloc? */ -tfb.Head = ap_palloc(sock-cntxt, tfb.HeadLength); /* Should this be a malloc? */ - -for (i = 0; i hdtr-numheaders; i++) { -memcpy((char*)tfb.Head + ptr, hdtr-headers[i].iov_base, - hdtr-headers[i].iov_len); -ptr += hdtr-headers[i].iov_len; +for (i = 0; i hdtr-numheaders; i++) { +memcpy((char*)ptfb-Head + ptr, hdtr-headers[i].iov_base, + hdtr-headers[i].iov_len); +ptr += hdtr-headers[i].iov_len; +} } } if (hdtr hdtr-numtrailers) { ptfb = tfb; -for (i = 0; i hdtr-numtrailers; i++) { -tfb.TailLength += hdtr-headers[i].iov_len; +if (hdtr-numtrailers == 1) { +ptfb-Tail = hdtr-trailers[0].iov_base; +ptfb-TailLength = hdtr-trailers[0].iov_len; } +else { +/* Need to collapse all the trailer fragments into one buffer */ +for (i = 0; i hdtr-numtrailers; i++) { +ptfb-TailLength += hdtr-headers[i].iov_len; +} -tfb.Tail = ap_palloc(sock-cntxt, tfb.TailLength); /* Should this be a malloc? */ +ptfb-Tail = ap_palloc(sock-cntxt, ptfb-TailLength); /* Should this be a malloc? */ -for (i = 0; i hdtr-numtrailers; i++) { -memcpy((char*)tfb.Tail + ptr, hdtr-trailers[i].iov_base, - hdtr-trailers[i].iov_len); -ptr += hdtr-trailers[i].iov_len; +for (i = 0; i hdtr-numtrailers; i++) { +memcpy((char*)ptfb-Tail + ptr, hdtr-trailers[i].iov_base, + hdtr-trailers[i].iov_len); +ptr += hdtr-trailers[i].iov_len; +} } } /* Initialize the overlapped structure */
cvs commit: apache-2.0/src/lib/apr configure.in
rbb 00/02/04 13:14:10 Modified:src/lib/apr configure.in Log: Re-structure APR's configure.in file. This should make adding functions to APR easier. Basically, I just moved things around a bit to make them easier to find, and I added some output. Revision ChangesPath 1.52 +286 -272 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.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- configure.in 2000/02/04 01:06:46 1.51 +++ configure.in 2000/02/04 21:14:09 1.52 @@ -1,28 +1,30 @@ +dnl ## +dnl ## Autoconf configuration file for APR +dnl ## +echo Configuring APR library +echo Platform: ${OS} +echo (Default will be ${DEFAULT_OSDIR}) + AC_CONFIG_AUX_DIR(./helpers) OS=`./config.guess` -OS=`./config.sub $OS` +OS=`./config.sub $OS` + +dnl # Some initial steps for configuration. We setup the default directory +dnl # and which files are to be configured. # These added to allow default directories to be used... DEFAULT_OSDIR=unix -MODULES=file_io network_io threadproc misc locks time mmap shmem - -echo Configuring APR library -echo Platform: ${OS} -echo (Default will be ${DEFAULT_OSDIR}) +MODULES=file_io network_io threadproc misc locks time mmap shmem dnl Process this file with autoconf to produce a configure script. AC_INIT(configure.in) - AC_CONFIG_HEADER(include/apr_config.h) -AC_ARG_WITH(optim,[ --with-optim=FLAGS compiler optimisation flags], - [OPTIM=$withval]) - # Most platforms use a prefix of 'lib' on their library files. LIBPREFIX='lib' -dnl Checks for programs. +dnl # Checks for programs. AC_PROG_CC AC_PROG_RANLIB AC_PROG_MAKE_SET @@ -32,53 +34,21 @@ # This macro needs to be here in case we are on an AIX box. AC_AIX -REENTRANCY_FLAGS -PTHREADS_CHECK - -AC_CACHE_CHECK([for threads], ac_cv_enable_threads, - [ AC_ARG_ENABLE(threads, -[ --enable-threads Enable threading support in APR.], -[ ] , -[ AC_CHECK_HEADERS(pthread.h, - [ ac_cv_enable_threads=pthread ] , - [ ac_cv_enable_threads=no ] ) ] ) ] ) - -if test $ac_cv_enable_threads = no; then -threads=0 -pthreadh=0 -else -if test $ac_cv_enable_threads = pthread; then -# We have specified pthreads for our threading library, just make sure -# that we have everything we need - AC_CHECK_HEADERS(pthread.h, [ - threads=1 - pthreadh=1 - AC_DEFINE(USE_THREADS) ], [ - threads=0 - pthreadh=0 ] ) -else -# We basically specified that we wanted threads, but not how to implement -# them. In this case, just look for pthreads. In the future, we can check -# for other threading libraries as well. - AC_CHECK_HEADERS(pthread.h, [ - threads=1 - pthreadh=1 - AC_DEFINE(USE_THREADS) ], [ - threads=0 - pthreadh=0 ] ) -fi +# Use /bin/sh if it exists, otherwise go looking for sh in the path +if test .$SH = . -a -f /bin/sh; then + SH=/bin/sh fi +AC_CHECK_PROG(SH, sh, sh) -pthreadser=0 -if test $threads = 1; then -AC_CHECK_DEFINE(PTHREAD_PROCESS_SHARED, pthread.h) -AC_CHECK_FUNC(pthread_mutex_init, [ -AC_DEFINE(USE_PTHREAD_SERIALIZE) -pthreadser=1 ]) -fi +dnl #- Checks for compiler flags +echo -e \nCheck for compiler flags. +AC_ARG_WITH(optim,[ --with-optim=FLAGS compiler optimisation flags], +[OPTIM=$withval]) -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]) +AC_ARG_WITH(debug,[ --with-debug Turn on debugging and compile tim +e warnings], +[if test $GCC = yes; then CFLAGS=$CFLAGS -g -Wall; else CFLAGS=$C +FLAGS -g; fi]) dnl # this is the place to put specific options for platform/compiler dnl # combinations @@ -91,79 +61,6 @@ ;; esac -dnl Checks for standard typedefs -AC_TYPE_OFF_T -AC_TYPE_PID_T -AC_TYPE_SIZE_T -AC_TYPE_UID_T -AC_CHECK_TYPE(ssize_t, int) -AC_C_INLINE - -dnl Checks for integer size -AC_CHECK_SIZEOF(char, 1) -AC_CHECK_SIZEOF(int, 4) -AC_CHECK_SIZEOF(long, 4) -AC_CHECK_SIZEOF(short, 2) -AC_CHECK_SIZEOF(long double, 12) -AC_CHECK_SIZEOF(long long, 8) - -if test $ac_cv_sizeof_short = 2; then -short_value=short -fi -if test $ac_cv_sizeof_int = 4; then -int_value=int -fi -if test $ac_cv_sizeof_long = 8; then -long_value=long -fi -if test $ac_cv_sizeof_long_double = 8; then -long_value=long double
cvs commit: apache-1.3/src CHANGES
lars00/02/04 15:05:39 Modified:src CHANGES Log: Typo... Revision ChangesPath 1.1506+1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1505 retrieving revision 1.1506 diff -u -r1.1505 -r1.1506 --- CHANGES 2000/02/03 14:22:28 1.1505 +++ CHANGES 2000/02/04 23:05:28 1.1506 @@ -293,7 +293,7 @@ *) Added a CLF '-' respecting %B to the log format. Suggested by Ragnar Kjørstad [dirkx] - *) Added protocol(%m)/method(%H) logging to the log format. + *) Added protocol(%H)/method(%m) logging to the log format. Suggested by Peter W [EMAIL PROTECTED] [dirkx] *) Added a HEAD method to 'ab'. [dirkx]
cvs commit: apache-1.3 configure
lars00/02/04 15:09:54 Modified:.configure Log: add --iconsdir, --htdocsdir and --cgidir to Usage output Revision ChangesPath 1.117 +4 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- configure 2000/01/17 22:53:17 1.116 +++ configure 2000/02/04 23:09:52 1.117 @@ -416,7 +416,10 @@ echo --libexecdir=DIR install program executables in DIR echo --mandir=DIR install manual pages in DIR echo --sysconfdir=DIR install configuration files in DIR -echo --datadir=DIR install read-only data files in DIR +echo --datadir=DIR install read-only data files in DIR +echo --iconsdir=DIR install read-only icon files in DIR +echo --htdocsdir=DIRinstall read-only document files in DIR +echo --cgidir=DIR install read-only cgi files in DIR echo --includedir=DIR install includes files in DIR echo --localstatedir=DIRinstall modifiable data files in DIR echo --runtimedir=DIR install runtime data in DIR