cvs commit: apache-2.0/src/main http_log.c
manoj 99/11/30 15:27:39
Modified:src/include http_log.h
src/main http_log.c
Log:
Some compile fixes for the piped log code. It doesn't completely
completely compile, but it looks a little better.
Revision ChangesPath
1.9 +1 -1 apache-2.0/src/include/http_log.h
Index: http_log.h
===
RCS file: /home/cvs/apache-2.0/src/include/http_log.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -u -r1.8 -r1.9
--- http_log.h1999/11/30 21:57:37 1.8
+++ http_log.h1999/11/30 23:27:18 1.9
@@ -146,7 +146,7 @@
#ifndef NO_RELIABLE_PIPED_LOGS
char *program;
ap_proc_t *pid;
-ap_file_t fds[2];
+ap_file_t *fds[2];
#else
ap_file_t *write_f;
#endif
1.18 +7 -5 apache-2.0/src/main/http_log.c
Index: http_log.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_log.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -u -r1.17 -r1.18
--- http_log.c1999/11/18 23:07:18 1.17
+++ http_log.c1999/11/30 23:27:29 1.18
@@ -637,7 +637,7 @@
#ifdef SIGHUP
signal(SIGHUP, SIG_IGN);
#endif
-if ((ap_createprocattr_init(pl->p, &procattr) != APR_SUCCESS) ||
+if ((ap_createprocattr_init(&procattr, pl->p) != APR_SUCCESS) ||
(ap_setprocattr_dir(procattr, pl->program)!= APR_SUCCESS) ||
(ap_set_childin(procattr, pl->fds[0], pl->fds[1]) != APR_SUCCESS)) {
/* Something bad happened, give up and go away. */
@@ -653,7 +653,7 @@
RAISE_SIGSTOP(PIPED_LOG_SPAWN); /* I am assuming that if
ap_create_process was */
/* successful that the child
is running.*/
pl->pid = procnew;
-ap_get_os_proc(&pid, &procnew);
+ap_get_os_proc(&pid, procnew);
ap_register_other_child(pid, piped_log_maintenance, pl,
pl->fds[1]);
}
}
@@ -705,7 +705,7 @@
}
-static void piped_log_cleanup(void *data)
+static ap_status_t piped_log_cleanup(void *data)
{
piped_log *pl = data;
@@ -715,15 +715,17 @@
ap_unregister_other_child(pl);
ap_close(pl->fds[0]);
ap_close(pl->fds[1]);
+return APR_SUCCESS;
}
-static void piped_log_cleanup_for_exec(void *data)
+static ap_status_t piped_log_cleanup_for_exec(void *data)
{
piped_log *pl = data;
ap_close(pl->fds[0]);
ap_close(pl->fds[1]);
+return APR_SUCCESS;
}
@@ -735,7 +737,7 @@
pl->p = p;
pl->program = ap_pstrdup(p, program);
pl->pid = NULL;
-if (ap_create_pipe(p, &pl->fds[0], &pl->fds[1]) != APR_SUCCESS) {
+if (ap_create_pipe(&pl->fds[0], &pl->fds[1], p) != APR_SUCCESS) {
int save_errno = errno;
errno = save_errno;
return NULL;
cvs commit: apache-2.0/src/include http_log.h
manoj 99/11/30 13:57:45
Modified:src/include http_log.h
Log:
Add apr_thread_proc.h so it can find ap_proc_t.
Revision ChangesPath
1.8 +2 -0 apache-2.0/src/include/http_log.h
Index: http_log.h
===
RCS file: /home/cvs/apache-2.0/src/include/http_log.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -u -r1.7 -r1.8
--- http_log.h1999/11/18 23:06:59 1.7
+++ http_log.h1999/11/30 21:57:37 1.8
@@ -62,6 +62,8 @@
extern "C" {
#endif
+#include "apr_thread_proc.h"
+
#ifdef HAVE_SYSLOG
#include
Re: cvs commit: apache-1.3/cgi-bin printenv
Marc Slemko wrote: > > 5. surround values with quotes to allow one to better recognize newlines > > (as > > in SERVER_SIGNATURE) and whitespaces and also print newlines > > as \n and " as \" for a more Shell- and C-style syntax. > > Is it really standard to not display "'s normally, but to stick a \ in > front of them? I don't see that much. Standard or not, if you are going to do it, you really ought to replace \ with \\, too. Cheers, Ben. -- http://www.apache-ssl.org/ben.html "My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there." - Indira Gandhi
cvs commit: apache-2.0/src/lib/apr/include apr.h.in
rbb 99/11/30 10:48:05 Added: src/lib/apr/include apr.h.in Log: New file which will include all of the APR defines that programs using APR must have, but without any of the autoconf #defines. Revision ChangesPath 1.1 apache-2.0/src/lib/apr/include/apr.h.in Index: apr.h.in === /* APR Feature Macros */ @apr_has_threads@ @apr_has_mmap@ /* Typedefs that APR needs. */ typedef @short_value@ ap_int16_t typedef unsigned @short_value@ ap_uint16_t typedef @int_value@ ap_int32_t typedef unsigned @int_value@ap_uint32_t typedef @long_value@ap_int64_t typedef unsigned @long_value@ ap_uint64_t /* Definitions that APR programs need to work properly. */ #undef API_THREAD_FUNC #undef API_EXPORT(type) #undef API_VAR_IMPORT
cvs commit: apache-2.0/src/lib/apr configure.in
rbb 99/11/30 10:45:52 Modified:src/lib/apr configure.in Log: First step in removing all needs to include apr_config.h in public apr header files. Plus some cleanup. Revision ChangesPath 1.28 +30 -4 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.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- configure.in 1999/11/17 18:09:55 1.27 +++ configure.in 1999/11/30 18:45:50 1.28 @@ -57,6 +57,28 @@ 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" +fi +if test "$ac_cv_sizeof_long_long" = "8"; then +long_value="long long" +fi +if test "$ac_cv_sizeof_longlong" = "8"; then +long_value="__int64" +fi +AC_SUBST(short_value) +AC_SUBST(int_value) +AC_SUBST(long_value) + AC_CHECK_SIZEOF_EXTENDED([#include ], ssize_t, 8) # Use /bin/sh if it exists, otherwise go looking for sh in the path @@ -225,7 +247,9 @@ 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) ] ) + AC_CHECK_HEADERS(pthread.h, [ + AC_DEFINE(APR_HAS_THREADS, 1) ], [ + AC_DEFINE(APR_HAS_THREADS, 0) ] ) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -233,8 +257,9 @@ fi ], [ - AC_CHECK_HEADERS(pthread.h, [ AC_DEFINE(APR_HAS_THREADS, 1) ], [ AC_DEFINE(APR_HAS_THREADS, 0) ] ) - + AC_CHECK_HEADERS(pthread.h, [ + AC_DEFINE(APR_HAS_THREADS, 1) ], [ + AC_DEFINE(APR_HAS_THREADS, 0) ] ) ]) @@ -261,7 +286,8 @@ SUBDIRS="$SUBDIRS $dir/$DEFAULT_OSDIR " fi done + MAKEFILE3="test/Makefile" AC_SUBST(SUBDIRS) AC_SUBST(MODULES) -AC_OUTPUT($MAKEFILE1 $MAKEFILE2 $MAKEFILE3) +AC_OUTPUT($MAKEFILE1 $MAKEFILE2 $MAKEFILE3 include/apr.h)
cvs commit: apache-2.0/src/lib/apr/include apr_fnmatch.h apr_lib.h apr_portable.h
rbb 99/11/30 07:57:53
Modified:src/lib/apr/include apr_fnmatch.h apr_lib.h apr_portable.h
Log:
Remove some of the includes of apr_config.h from public header files.
Revision ChangesPath
1.4 +0 -1 apache-2.0/src/lib/apr/include/apr_fnmatch.h
Index: apr_fnmatch.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_fnmatch.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apr_fnmatch.h 1999/11/22 18:00:46 1.3
+++ apr_fnmatch.h 1999/11/30 15:57:38 1.4
@@ -35,7 +35,6 @@
/* This file has been modified by the Apache Group. */
#ifndef WIN32
-#include "apr_config.h"
#else
#include "apr_win.h"
#endif
1.18 +0 -1 apache-2.0/src/lib/apr/include/apr_lib.h
Index: apr_lib.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lib.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- apr_lib.h 1999/11/24 22:30:01 1.17
+++ apr_lib.h 1999/11/30 15:57:42 1.18
@@ -71,7 +71,6 @@
#endif
#ifndef WIN32
-#include "apr_config.h"
#else
#include "../file_io/win32/readdir.h" /* definition of DIR for WIN32 */
#include "apr_win.h"
1.14 +0 -6 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- apr_portable.h1999/11/08 15:35:35 1.13
+++ apr_portable.h1999/11/30 15:57:43 1.14
@@ -64,12 +64,6 @@
extern "C" {
#endif /* __cplusplus */
-#ifndef WIN32
-#include "apr_config.h"
-#else
-#include "apr_win.h"
-#endif
-
#include "apr_general.h"
#include "apr_thread_proc.h"
#include "apr_file_io.h"
cvs commit: apache-1.3/src CHANGES Configure
jim 99/11/30 07:52:05 Modified:src CHANGES Configure Log: Force verbose mode during the sanity check if the check fails Revision ChangesPath 1.1463+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1462 retrieving revision 1.1463 diff -u -r1.1462 -r1.1463 --- CHANGES 1999/11/28 15:46:59 1.1462 +++ CHANGES 1999/11/30 15:51:59 1.1463 @@ -1,5 +1,9 @@ Changes with Apache 1.3.10 + *) If the compiler sanity check fails, force the verbose output + for TestCompile so people can have a clue what the problem + is. [Jim Jagielski] + *) Add --iconsdir, --htdocsdir, and --cgidir option to top-level configure script to allow one to override the corresponding variables from config.layout. 1.376 +17 -7 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.375 retrieving revision 1.376 diff -u -r1.375 -r1.376 --- Configure 1999/11/28 13:21:48 1.375 +++ Configure 1999/11/30 15:52:00 1.376 @@ -2150,13 +2150,23 @@ if ./helpers/TestCompile $vflag sanity; then : else - echo "** A test compilation with your Makefile configuration" - echo "** failed. Re-run your configure script with --verbose" - echo "** to get a better idea of what is failing. Note that" - echo "** Apache requires an ANSI C Compiler, such as gcc. " - echo " Aborting!" - exitcode=1 - exit 1 + if [ "x$vflag" = "x-v" ] ; then + WHEREERR="above" + else + WHEREERR="below" + fi + echo "** A test compilation with your Makefile configuration" + echo "** failed. The $WHEREERR error output from the compilation" + echo "** test will give you an idea what is failing. Note that" + echo "** Apache requires an ANSI C Compiler, such as gcc. " + echo "" + echo " Error Output for sanity check " + (./helpers/TestCompile -v sanity) + echo "= End of Error Report =" + echo "" + echo " Aborting!" + exitcode=1 + exit 1 fi fi
cvs commit: /foundation members.txt
pier99/11/30 04:53:15 Modified:foundation members.txt Log: Added my infos... Revision ChangesPath 1.48 +10 -0 /foundation/members.txt Index: members.txt === RCS file: /home/apcore/moot//foundation/members.txt,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- members.txt 1999/11/30 10:49:07 1.47 +++ members.txt 1999/11/30 12:53:15 1.48 @@ -79,6 +79,16 @@ Fax: +44 870 164 0678 URL: http://www.inch.demon.co.uk (unmaintained) + *) Pierpaolo Fumagalli +655 South Fair Oaks Avenue +Sunnyvale, CA 94086 +U.S.A. +Email: [EMAIL PROTECTED] + Tel: +1 408 393 5741 (cell) + +1 408 730 5741 (home) + +39 031 673 0111 (italy) + URL: http://www.betaversion.org/~pier/ + *) Dean Gaudet 422B Bosworth St. San Francisco CA 94112
cvs commit: apache-2.0/src acconfig.h.in
manoj 99/11/29 23:54:08 Modified:src acconfig.h.in Log: Add a little explanatory comment note. This is also to test whether this file is still tagged as binary. Revision ChangesPath 1.2 +2 -0 apache-2.0/src/acconfig.h.in Index: acconfig.h.in === RCS file: /home/cvs/apache-2.0/src/acconfig.h.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -u -r1.1 -r1.2 --- acconfig.h.in 1999/11/29 23:44:40 1.1 +++ acconfig.h.in 1999/11/30 07:54:07 1.2 @@ -0,0 +1,2 @@ +/* symbols defined by autoconf's configure script that aren't taken care + * of by autoheader */
cvs commit: apache-2.0/src/support httpd.exp
manoj 99/11/29 21:56:18 Modified:src/os/beos os.h src/os/unix os.h src/os/win32 os.h src/support httpd.exp Log: Delete remnants of ap_spawnvp that got missed earlier. Revision ChangesPath 1.4 +0 -1 apache-2.0/src/os/beos/os.h Index: os.h === RCS file: /home/cvs/apache-2.0/src/os/beos/os.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -u -r1.3 -r1.4 --- os.h 1999/08/31 12:33:04 1.3 +++ os.h 1999/11/30 05:56:03 1.4 @@ -72,7 +72,6 @@ */ extern int ap_os_is_path_absolute(const char *file); -extern int ap_spawnvp(const char *file, char *const argv[]); #define ap_os_is_filename_valid(f) (1) #define ap_os_kill(pid, sig)kill(pid, sig) 1.5 +0 -3 apache-2.0/src/os/unix/os.h Index: os.h === RCS file: /home/cvs/apache-2.0/src/os/unix/os.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -u -r1.4 -r1.5 --- os.h 1999/08/31 12:33:08 1.4 +++ os.h 1999/11/30 05:56:11 1.5 @@ -77,8 +77,6 @@ #define INLINE extern ap_inline INLINE int ap_os_is_path_absolute(const char *file); -/* spawn = fork + exec on unix */ -INLINE int ap_spawnvp(const char *file, char *const argv[]); #include "os-inline.c" @@ -88,7 +86,6 @@ * as normal */ extern int ap_os_is_path_absolute(const char *file); -extern int ap_spawnvp(const char *file, char *const argv[]); #endif /* Other ap_os_ routines not used by this platform */ 1.11 +0 -3 apache-2.0/src/os/win32/os.h Index: os.h === RCS file: /home/cvs/apache-2.0/src/os/win32/os.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -u -r1.10 -r1.11 --- os.h 1999/11/30 03:52:57 1.10 +++ os.h 1999/11/30 05:56:14 1.11 @@ -85,9 +85,6 @@ /* char *crypt(const char *pw, const char *salt); */ #define crypt(buf,salt) (buf) -/* Use the Windows built ap_context_t n spawnvp */ -#define ap_spawnvp(file, argv) (spawnvp(file, argv)) - /* Although DIR_TYPE is dirent (see nt/readdir.h) we need direct.h for chdir() */ #include 1.3 +0 -1 apache-2.0/src/support/httpd.exp Index: httpd.exp === RCS file: /home/cvs/apache-2.0/src/support/httpd.exp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -u -r1.2 -r1.3 --- httpd.exp 1999/08/26 18:27:57 1.2 +++ httpd.exp 1999/11/30 05:56:17 1.3 @@ -331,7 +331,6 @@ ap_soft_timeout ap_some_auth_required ap_spawn_child -ap_spawnvp ap_sync_scoreboard_image ap_srm_command_loop ap_standalone
cvs commit: apache-2.0/src/os/win32 os.h
manoj 99/11/29 19:52:58
Modified:src configure.in
src/include ap_config.h
src/modules/mpm/mpmt_pthread config.m4 scoreboard.c
scoreboard.h
src/modules/mpm/prefork config.m4 prefork.c scoreboard.h
src/modules/mpm/spmt_os2 scoreboard.h spmt_os2.c
src/modules/standard config.m4 mod_usertrack.c
src/os/win32 os.h
Log:
Deal with times() properly in autoconf. This also changes NO_TIMES to
!HAVE_TIMES.
Revision ChangesPath
1.4 +0 -1 apache-2.0/src/configure.in
Index: configure.in
===
RCS file: /home/cvs/apache-2.0/src/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -u -r1.3 -r1.4
--- configure.in 1999/11/30 03:07:32 1.3
+++ configure.in 1999/11/30 03:52:36 1.4
@@ -45,7 +45,6 @@
AC_CHECK_HEADERS( \
unistd.h \
-sys/times.h \
sys/time.h \
)
1.11 +5 -0 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.10
retrieving revision 1.11
diff -u -d -u -r1.10 -r1.11
--- ap_config.h 1999/11/29 23:32:37 1.10
+++ ap_config.h 1999/11/30 03:52:39 1.11
@@ -1401,6 +1401,11 @@
#define HAVE_SETSID
#endif
+#if !defined(NO_TIMES) && !defined(HAVE_TIMES)
+#define HAVE_TIMES
+#define HAVE_SYS_TIMES_H
+#endif
+
#endif /* HAVE_CONFIG_H */
/* The assumption is that when the functions are missing,
1.2 +5 -0 apache-2.0/src/modules/mpm/mpmt_pthread/config.m4
Index: config.m4
===
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/config.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -u -r1.1 -r1.2
--- config.m4 1999/11/29 23:46:44 1.1
+++ config.m4 1999/11/30 03:52:41 1.2
@@ -2,6 +2,11 @@
if test "$MPM_NAME" = "mpmt_pthread" ; then
APACHE_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
+
APACHE_MPM_PTHREAD
APACHE_MPM_CHECK_SHMEM
+
+dnl Obsolete scoreboard code uses this.
+AC_CHECK_HEADERS(sys/times.h)
+AC_CHECK_FUNCS(times)
fi
1.12 +1 -1 apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c
Index: scoreboard.c
===
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -u -r1.11 -r1.12
--- scoreboard.c 1999/11/19 18:46:50 1.11
+++ scoreboard.c 1999/11/30 03:52:42 1.12
@@ -560,7 +560,7 @@
if (r->sent_bodyct)
ap_bgetopt(r->connection->client, BO_BYTECT, &bs);
-#ifndef NO_TIMES
+#ifdef HAVE_TIMES
times(&ss->times);
#endif
ss->access_count++;
1.7 +4 -6 apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.h
Index: scoreboard.h
===
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -u -r1.6 -r1.7
--- scoreboard.h 1999/11/29 23:32:54 1.6
+++ scoreboard.h 1999/11/30 03:52:43 1.7
@@ -62,12 +62,10 @@
extern "C" {
#endif
-#ifndef WIN32
-#ifdef TPF
-#include
-#else
+#ifdef HAVE_SYS_TIMES_H
#include
-#endif /* TPF */
+#elif defined(TPF)
+#include
#endif
#include "mpm_default.h" /* For HARD_.*_LIMIT */
@@ -154,7 +152,7 @@
struct timeval start_time;
struct timeval stop_time;
#endif
-#ifndef NO_TIMES
+#ifdef HAVE_TIMES
struct tms times;
#endif
#ifndef OPTIMIZE_TIMEOUTS
1.2 +4 -0 apache-2.0/src/modules/mpm/prefork/config.m4
Index: config.m4
===
RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/config.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -u -r1.1 -r1.2
--- config.m4 1999/11/29 23:46:50 1.1
+++ config.m4 1999/11/30 03:52:45 1.2
@@ -2,4 +2,8 @@
APACHE_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
APACHE_MPM_CHECK_SHMEM
+
+dnl Obsolete scoreboard code uses this.
+AC_CHECK_HEADERS(sys/times.h)
+AC_CHECK_FUNCS(times)
fi
1.56 +5 -5 apache-2.0/src/modules/mpm/prefork/prefork.c
Index: prefork.c
===
RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -u -r1.55 -r1.56
--- prefork.c 19
cvs commit: apache-2.0/src/main http_protocol.c
manoj 99/11/29 19:36:35
Modified:src/main http_protocol.c
Log:
The extra (n < 1) check is redundant, leftover from pre-APR code.
Revision ChangesPath
1.39 +1 -2 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -u -r1.38 -r1.39
--- http_protocol.c 1999/11/20 11:56:13 1.38
+++ http_protocol.c 1999/11/30 03:36:33 1.39
@@ -2045,8 +2045,7 @@
n = o;
do {
rv = ap_read(fd, buf, &n);
-} while (rv == APR_EINTR && !ap_is_aborted(r->connection) &&
- (n < 1));
+} while (rv == APR_EINTR && !ap_is_aborted(r->connection));
if (n < 1) {
break;
cvs commit: apache-2.0/src configure.in
manoj 99/11/29 19:07:34 Modified:src configure.in Log: Some extra autoconf macros that might help us compile on "a POSIXized ISC UNIX" or MINIX if someone ever tries to do it. Revision ChangesPath 1.3 +3 -1 apache-2.0/src/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -u -r1.2 -r1.3 --- configure.in 1999/11/30 02:40:56 1.2 +++ configure.in 1999/11/30 03:07:32 1.3 @@ -30,8 +30,10 @@ dnl AC_PROG_RANLIB dnl AC_PATH_PROG(PERL_PATH, perl) -dnl info autoconf says AIX needs this. Okay. +dnl various OS checks that apparently set required flags AC_AIX +AC_ISC_POSIX +AC_MINIX dnl ## Check for libraries
cvs commit: apache-2.0/src/os/unix iol_socket.c
manoj 99/11/29 18:53:14
Modified:src/os/unix iol_socket.c
Log:
Eliminate some warnings.
Revision ChangesPath
1.12 +3 -5 apache-2.0/src/os/unix/iol_socket.c
Index: iol_socket.c
===
RCS file: /home/cvs/apache-2.0/src/os/unix/iol_socket.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -u -r1.11 -r1.12
--- iol_socket.c 1999/11/15 19:50:31 1.11
+++ iol_socket.c 1999/11/30 02:53:12 1.12
@@ -86,8 +86,6 @@
static ap_status_t unix_getopt(ap_iol *viol, ap_iol_option opt, void *value)
{
-iol_socket *iol = (iol_socket *)viol;
-
switch (opt) {
case AP_IOL_TIMEOUT:
/* no-op */
@@ -99,21 +97,21 @@
}
-ap_status_t unix_write(ap_iol *viol, const char* buf, ap_size_t size,
+static ap_status_t unix_write(ap_iol *viol, const char* buf, ap_size_t size,
ap_ssize_t *nbytes)
{
*nbytes = size;
return ap_send(((iol_socket *)viol)->sock, buf, nbytes);
}
-ap_status_t unix_writev(ap_iol *viol, const struct iovec *vec, int nvec,
+static ap_status_t unix_writev(ap_iol *viol, const struct iovec *vec, int
nvec,
ap_ssize_t *nbytes)
{
*nbytes = vec[0].iov_len;
return ap_send(((iol_socket *)viol)->sock, vec[0].iov_base, nbytes);
}
-ap_status_t unix_read(ap_iol *viol, char* buf, ap_size_t size,
+static ap_status_t unix_read(ap_iol *viol, char* buf, ap_size_t size,
ap_ssize_t *nbytes)
{
*nbytes = size;
cvs commit: apache-2.0/src configure.in
manoj 99/11/29 18:40:57 Modified:src configure.in Log: Fix a thinko. Apache's configure.in shouldn't attempt to create APR's Makefile. Revision ChangesPath 1.2 +1 -1 apache-2.0/src/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/configure.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -u -r1.1 -r1.2 --- configure.in 1999/11/29 23:44:54 1.1 +++ configure.in 1999/11/30 02:40:56 1.2 @@ -88,5 +88,5 @@ AC_SUBST(OS) AC_SUBST(OS_DIR) -AC_OUTPUT([Makefile ap/Makefile main/Makefile lib/apr/Makefile os/Makefile +AC_OUTPUT([Makefile ap/Makefile main/Makefile os/Makefile $APACHE_OUTPUT_FILES])
cvs commit: apache-2.0 STATUS
dgaudet 99/11/29 16:52:32 Modified:.STATUS Log: more accurate reflection of reality Revision ChangesPath 1.20 +4 -2 apache-2.0/STATUS Index: STATUS === RCS file: /home/cvs/apache-2.0/STATUS,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- STATUS1999/11/30 00:10:23 1.19 +++ STATUS1999/11/30 00:52:30 1.20 @@ -1,5 +1,5 @@ Apache 2.0 STATUS: -Last modified at [$Date: 1999/11/30 00:10:23 $] +Last modified at [$Date: 1999/11/30 00:52:30 $] Release: @@ -125,7 +125,9 @@ * Work on other MPMs. Possible MPMs discussed or in progress include: - Dean Gaudet's async MPM - Status: ? + Status: dean is unlikely to begin work on this any time soon... + has lots of ideas he'll share with folks willing to begin + tackling the issues. this is apache 2.1 material. - Zach Brown's <[EMAIL PROTECTED]> Linux siginfo MPM Status: ?
cvs commit: apache-2.0 STATUS
manoj 99/11/29 16:10:24 Modified:.STATUS Log: Autoconf can heal your family strife. And it's also a floor wax! Revision ChangesPath 1.19 +12 -1 apache-2.0/STATUS Index: STATUS === RCS file: /home/cvs/apache-2.0/STATUS,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -u -r1.18 -r1.19 --- STATUS1999/11/23 08:30:21 1.18 +++ STATUS1999/11/30 00:10:23 1.19 @@ -1,5 +1,5 @@ Apache 2.0 STATUS: -Last modified at [$Date: 1999/11/23 08:30:21 $] +Last modified at [$Date: 1999/11/30 00:10:23 $] Release: @@ -81,6 +81,17 @@ Should be much cleaner with APR in 2.0. * Switch to autoconf, et al. for configuration. +Status: Manoj has placed an initial version into the 2.0 +repository. Todos include: + + - Support selection of modules (including MPMs; only Dexter +works right now). Probably involved creating a directory for +each module + - "make install" and "make depend" should work + - a tool to simplfy third-party module building should be +written. Something like apxs + - Add a lot more checks to satisfy the various platforms, e.g. +for threading * Use APR to get rid of more platform dependancies. Status: Ryan Bloom <[EMAIL PROTECTED]> is working on this.
