cvs commit: apache-2.0/src/regex Makefile.am config.m4
manoj 99/11/29 15:47:49
Added: src Makefile.am acconfig.h.in acinclude.m4 buildconf
configure.in modules.c
src/ap Makefile.am
src/helpers build-acconfig-header config-stubs
src/lib Makefile.am
src/main Makefile.am config.h.stub config.m4
src/modules Makefile.am config.m4
src/modules/mpm Makefile.am config.h.stub config.m4
src/modules/mpm/dexter Makefile.am config.m4
src/modules/mpm/mpmt_pthread Makefile.am config.m4
src/modules/mpm/prefork config.m4
src/modules/standard Makefile.am config.m4
src/os Makefile.am config.m4
src/os/unix Makefile.am config.m4
src/regex Makefile.am config.m4
Log:
The second part of the big autoconf patch, which actually adds autoconf
building to the tree.
Revision ChangesPath
1.1 apache-2.0/src/Makefile.am
Index: Makefile.am
===
AUTOMAKE_OPTIONS = foreign
SUBDIRS=ap main modules os $(REGEX_DIR)
bin_PROGRAMS = apache
apache_SOURCES = modules.c buildmark.c
apache_DEPENDENCIES = \
$(MOD_LTLIBS) \
$(MPM_LIB) \
main/libmain.la \
$(OS_DIR)/libos.la \
ap/libap.la \
lib/apr/libapr.a \
$(REGEX_LIB)
apache_LDADD = $(apache_DEPENDENCIES) $(EXTRA_LIBS)
1.1 apache-2.0/src/acconfig.h.in
<>
1.1 apache-2.0/src/acinclude.m4
Index: acinclude.m4
===
dnl
dnl APACHE_MODULE(modname [, shared])
dnl
dnl Includes an extension in the build.
dnl
dnl "modname" is the name of the modules/ subdir where the extension resides
dnl "shared" can be set to "shared" or "yes" to build the extension as
dnl a dynamically loadable library.
dnl
AC_DEFUN(APACHE_MODULE,[
if test -d "$cwd/$srcdir/modules/$1" ; then
MOD_SUBDIRS="$MOD_SUBDIRS $1"
if test "$2" != "shared" -a "$2" != "yes"; then
libname=$(basename $1)
_extlib="lib${libname}.a"
MOD_LTLIBS="$MOD_LTLIBS modules/$1/lib${libname}.la"
MOD_LIBS="$MOD_LIBS $1/$_extlib"
MOD_STATIC="$MOD_STATIC $1"
else
MOD_SHARED="$MOD_SHARED $1"
fi
APACHE_OUTPUT(modules/$1/Makefile)
fi
])
AC_SUBST(MOD_LTLIBS)
dnl ## APACHE_OUTPUT(file)
dnl ## adds "file" to the list of files generated by AC_OUTPUT
dnl ## This macro can be used several times.
AC_DEFUN(APACHE_OUTPUT, [
APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1"
])
dnl
dnl AC_ADD_LIBRARY(library)
dnl
dnl add a library to the link line
dnl
AC_DEFUN(AC_ADD_LIBRARY,[
APACHE_ONCE(LIBRARY, $1, [
EXTRA_LIBS="$EXTRA_LIBS -l$1"
])
])
dnl
dnl APACHE_ONCE(namespace, variable, code)
dnl
dnl execute code, if variable is not set in namespace
dnl
AC_DEFUN(APACHE_ONCE,[
unique=`echo $ac_n "$2$ac_c" | tr -c -d a-zA-Z0-9`
cmd="echo $ac_n \"\$$1$unique$ac_c\""
if test -n "$unique" && test "`eval $cmd`" = "" ; then
eval "$1$unique=set"
$3
fi
])
1.1 apache-2.0/src/buildconf
Index: buildconf
===
#!/bin/sh
# TODO - Steal the new PHP buildconf and build.mk.
# This will do for now, though
supplied_flag=$1
# do some version checking for the tools we use
if test "$1" = "--force"; then
shift
# this is a posix correct "test -nt"
elif test "`ls -t buildconf buildconf.stamp 2>/dev/null |head -1`" !=
"buildconf"; then
:
else
echo "buildconf: checking installation..."
# autoconf will check for the version itself
# automake 1.4 or newer
am_version=`automake --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//'
-e 's/[a-z]* *$//'`
if test "$am_version" = ""; then
echo "buildconf: automake not found."
echo " You need automake version 1.4 or newer installed"
echo " to build APACHE from CVS."
exit 1
fi
IFS=.; set $am_version; IFS=' '
if test "$1" = "1" -a "$2" -lt "4" || test "$1" -lt "1"; then
echo "buildconf: automake version $am_version found."
echo " You need automake version 1.4 or newer installed"
echo " to build APACHE from CVS."
exit 1
else
echo "buildconf: automake version $am_version (ok)"
fi
# libtool 1.3.3 or newer
lt_pversion=`libtool --version 2>/dev/null|sed -e 's/^[^0-9]*//' -e 's/[-
].*//'`
if test "$lt_pversion" = ""; then
echo "buildconf: libtool not found."
echo " You need libtool version 1.3 or newer installed"
echo " to build APACHE from CVS."
cvs commit: apache-2.0/src/os/win32 os.h
manoj 99/11/29 15:33:25
Modified:src/include ap_config.h
src/main util.c
src/modules/mpm/dexter dexter.c
src/modules/mpm/mpmt_beos mpmt_beos.c
src/modules/mpm/mpmt_pthread mpmt_pthread.c scoreboard.h
src/modules/mpm/prefork prefork.c scoreboard.h
src/modules/mpm/spmt_os2 scoreboard.h spmt_os2.c
src/modules/standard mod_unique_id.c mod_usertrack.c
src/os/beos beosd.h
src/os/unix unixd.c unixd.h
src/os/win32 os.h
Log:
The first part of the big autoconf patch. This replaces a bunch of
NEED_* macros with HAVE_* macros to be more consistent with autoconf.
Revision ChangesPath
1.10 +59 -8 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.9
retrieving revision 1.10
diff -u -d -u -r1.9 -r1.10
--- ap_config.h 1999/09/13 14:07:19 1.9
+++ ap_config.h 1999/11/29 23:32:37 1.10
@@ -118,7 +118,7 @@
#endif
#if !defined(QNX) && !defined(MPE) && !defined(WIN32) && !defined(TPF)
-#include
+/* #include */
#endif
/* Define one of these according to your system. */
@@ -1352,29 +1352,80 @@
#endif /* SUNOS_LIB_PROTOTYPES */
+/*
+ * Transition macros from old-style configuration to autoconf
+ */
+#ifndef HAVE_CONFIG_H
+
+#if !defined(NO_KILLPG) && !defined(HAVE_KILLPG)
+#define HAVE_KILLPG
+#endif
+
+#if !defined(NEED_STRDUP) && !defined(HAVE_STRDUP)
+#define HAVE_STRDUP
+#endif
+
+#if !defined(NEED_STRCASECMP) && !defined(HAVE_STRCASECMP)
+#define HAVE_STRCASECMP
+#endif
+
+#if !defined(NEED_STRNCASECMP) && !defined(HAVE_STRNCASECMP)
+#define HAVE_STRNCASECMP
+#endif
+
+#if !defined(NEED_STRSTR) && !defined(HAVE_STRSTR)
+#define HAVE_STRSTR
+#endif
+
+#if !defined(NEED_INITGROUPS) && !defined(HAVE_INITGROUPS)
+#define HAVE_INITGROUPS
+#endif
+
+#if !defined(NEED_WAITPID) && !defined(HAVE_WAITPID)
+#define HAVE_WAITPID
+#endif
+
+#if !defined(NEED_STRERROR) && !defined(HAVE_STRERROR)
+#define HAVE_STRERROR
+#endif
+
+#if !defined(NEED_DIFFTIME) && !defined(HAVE_DIFFTIME)
+#define HAVE_DIFFTIME
+#endif
+
+#if !defined(NEED_GETTIMEOFDAY) && !defined(HAVE_GETTIMEOFDAY)
+#define HAVE_GETTIMEOFDAY
+#endif
+
+#if !defined(NEED_SETSID) && !defined(HAVE_SETSID)
+#define HAVE_SETSID
+#endif
+
+#endif /* HAVE_CONFIG_H */
+
/* The assumption is that when the functions are missing,
* then there's no matching prototype available either.
* Declare what is needed exactly as the replacement routines implement it.
*/
-#ifdef NEED_STRDUP
+#ifndef HAVE_STRDUP
extern char *strdup (const char *str);
#endif
-#ifdef NEED_STRCASECMP
+#ifndef HAVE_STRCASECMP
extern int strcasecmp (const char *a, const char *b);
#endif
-#ifdef NEED_STRNCASECMP
+#ifndef HAVE_STRNCASECMP
extern int strncasecmp (const char *a, const char *b, int n);
#endif
-#ifdef NEED_INITGROUPS
+#ifndef HAVE_INITGROUPS
extern int initgroups(const char *name, gid_t basegid);
#endif
-#ifdef NEED_WAITPID
+#ifndef HAVE_WAITPID
extern int waitpid(pid_t pid, int *statusp, int options);
#endif
-#ifdef NEED_STRERROR
+#ifndef HAVE_STRERROR
extern char *strerror (int err);
#endif
-#ifdef NEED_DIFFTIME
+#ifndef HAVE_DIFFTIME
extern double difftime(time_t time1, time_t time0);
#endif
1.19 +8 -8 apache-2.0/src/main/util.c
Index: util.c
===
RCS file: /home/cvs/apache-2.0/src/main/util.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -u -r1.18 -r1.19
--- util.c1999/11/18 23:07:24 1.18
+++ util.c1999/11/29 23:32:38 1.19
@@ -1700,7 +1700,7 @@
return (x ? 1 : 0); /* If the first character is ':', it's
broken, too */
}
-#ifdef NEED_STRDUP
+#ifndef HAVE_STRDUP
char *strdup(const char *str)
{
char *sdup;
@@ -1716,7 +1716,7 @@
#endif
/* The following two routines were donated for SVR4 by Andreas Vogel */
-#ifdef NEED_STRCASECMP
+#ifndef HAVE_STRCASECMP
int strcasecmp(const char *a, const char *b)
{
const char *p = a;
@@ -1735,7 +1735,7 @@
#endif
-#ifdef NEED_STRNCASECMP
+#ifndef HAVE_STRNCASECMP
int strncasecmp(const char *a, const char *b, int n)
{
const char *p = a;
@@ -1756,7 +1756,7 @@
#endif
/* The following routine was donated for UTS21 by [EMAIL PROTECTED] */
-#ifdef NEED_STRSTR
+#ifndef HAVE_STRSTR
char *strstr(char *s1, char *s2)
{
char *p1, *p2;
@@ -1785,7 +1785,7 @@
}
#endif
-#ifdef NEED_INITGROUPS
+#ifndef HAVE_INITGRO
cvs commit: apache-2.0/src/main gen_test_char.mak gen_uri_delims.mak
stoddard99/11/29 15:29:37
Modified:src/ap ap.mak
src/lib/apr aprlib.def aprlib.dsp aprlib.mak
src/lib/apr/misc/win32 misc.h start.c
src/main gen_test_char.mak gen_uri_delims.mak
Log:
Fix some Windows compile breaks
Revision ChangesPath
1.7 +28 -54apache-2.0/src/ap/ap.mak
Index: ap.mak
===
RCS file: /home/cvs/apache-2.0/src/ap/ap.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ap.mak1999/10/07 14:08:27 1.6
+++ ap.mak1999/11/29 23:28:50 1.7
@@ -25,6 +25,8 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+
!IF "$(CFG)" == "ap - Win32 Release"
OUTDIR=.\Release
@@ -53,43 +55,11 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D\
"WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ap.pch" /YX
/Fo"$(INTDIR)\\"\
/Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Release/
CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc"
BSC32_SBRS= \
@@ -134,13 +104,29 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "../include" /I
"../lib/apr/include"\
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ap.pch" /YX
/Fo"$(INTDIR)\\"\
/Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc"
+BSC32_SBRS= \
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ap.lib"
+LIB32_OBJS= \
+ "$(INTDIR)\ap_base64.obj" \
+ "$(INTDIR)\ap_hooks.obj" \
+ "$(INTDIR)\ap_sha1.obj"
+
+"$(OUTDIR)\ap.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+$(LIB32) @<<
+ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+!ENDIF
+
.c{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
@@ -171,24 +157,6 @@
$(CPP_PROJ) $<
<<
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc"
-BSC32_SBRS= \
-
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ap.lib"
-LIB32_OBJS= \
- "$(INTDIR)\ap_base64.obj" \
- "$(INTDIR)\ap_hooks.obj" \
- "$(INTDIR)\ap_sha1.obj"
-
-"$(OUTDIR)\ap.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-$(LIB32) @<<
- $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(CFG)" == "ap - Win32 Release" || "$(CFG)" == "ap - Win32 Debug"
SOURCE=.\ap_base64.c
@@ -197,10 +165,12 @@
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
"..\include\ap_mmn.h"\
- "..\include\apr.h"\
"..\include\hsregex.h"\
"..\os\win32\os.h"\
+NODEP_CPP_AP_BA=\
+ "..\include\apr.h"\
+
"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
@@ -213,7 +183,6 @@
"..\include\ap_hooks.h"\
"..\include\ap_iol.h"\
"..\include\ap_mmn.h"\
- "..\include\apr.h"\
"..\include\buff.h"\
"..\include\hsregex.h"\
"..\include\httpd.h"\
@@ -226,6 +195,9 @@
"..\lib\apr\include\apr_win.h"\
"..\os\win32\os.h"\
+NODEP_CPP_AP_HO=\
+ "..\include\apr.h"\
+
"$(INTDIR)\ap_hooks.obj" : $(SOURCE) $(DEP_CPP_AP_HO) "$(INTDIR)"
@@ -238,7 +210,6 @@
"..\include\ap_iol.h"\
"..\include\ap_mmn.h"\
"..\include\ap_sha1.h"\
- "..\include\apr.h"\
"..\include\buff.h"\
"..\include\hsregex.h"\
"..\include\httpd.h"\
@@ -250,6 +221,9 @@
"..\lib\apr\include\apr_lib.h"\
"..\lib\apr\include\apr_win.h"\
"..\os\win32\os.h"\
+
+NODEP_CPP_AP_SH=\
+ "..\include\apr.h"\
"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
1.6 +10 -10apache-2.0/src/lib/apr/aprlib.def
Index: aprlib.def
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.def,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aprlib.def1999/10/25 23:55:43 1.5
+++ aprlib.def1999/11/29 23:29:11 1.6
@@ -80,11 +80,11 @@
ap_clear_poll_sockets @72
;ap_setipaddr @73
;ap_getipaddr @74
- ap_create_signal @75
- ap_set
cvs commit: apache-2.0/src/modules/mpm/winnt winnt.c
stoddard99/11/29 13:14:16
Modified:src/modules/mpm/winnt winnt.c
Log:
First cut at getting graceful restart working with the AcceptEx completion
port
Revision ChangesPath
1.32 +321 -289 apache-2.0/src/modules/mpm/winnt/winnt.c
Index: winnt.c
===
RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- winnt.c 1999/11/19 18:47:29 1.31
+++ winnt.c 1999/11/29 21:14:06 1.32
@@ -75,7 +75,7 @@
* Definitions of WINNT MPM specific config globals
*/
-static char *mpm_pid_fname=NULL;
+char *ap_pid_fname=NULL;
static int ap_threads_per_child = 0;
static int workers_may_exit = 0;
static int max_requests_per_child = 0;
@@ -89,7 +89,7 @@
static char ap_coredump_dir[MAX_STRING_LEN];
static server_rec *server_conf;
-HANDLE AcceptExCompPort = NULL;
+static HANDLE AcceptExCompPort = NULL;
static int one_process = 0;
@@ -195,6 +195,45 @@
CloseHandle(event_id);
}
+/* To share the semaphores with other processes, we need a NULL ACL
+ * Code from MS KB Q106387
+ */
+static PSECURITY_ATTRIBUTES GetNullACL()
+{
+PSECURITY_DESCRIPTOR pSD;
+PSECURITY_ATTRIBUTES sa;
+
+sa = (PSECURITY_ATTRIBUTES) LocalAlloc(LPTR,
sizeof(SECURITY_ATTRIBUTES));
+pSD = (PSECURITY_DESCRIPTOR) LocalAlloc(LPTR,
+ SECURITY_DESCRIPTOR_MIN_LENGTH);
+if (pSD == NULL || sa == NULL) {
+return NULL;
+}
+if (!InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION)
+ || GetLastError()) {
+LocalFree( pSD );
+LocalFree( sa );
+return NULL;
+}
+if (!SetSecurityDescriptorDacl(pSD, TRUE, (PACL) NULL, FALSE)
+ || GetLastError()) {
+LocalFree( pSD );
+LocalFree( sa );
+return NULL;
+}
+sa->nLength = sizeof(sa);
+sa->lpSecurityDescriptor = pSD;
+sa->bInheritHandle = TRUE;
+return sa;
+}
+
+static void CleanNullACL( void *sa ) {
+if( sa ) {
+LocalFree( ((PSECURITY_ATTRIBUTES)sa)->lpSecurityDescriptor);
+LocalFree( sa );
+}
+}
+
/*
* The Win32 call WaitForMultipleObjects will only allow you to wait for
* a maximum of MAXIMUM_WAIT_OBJECTS (current 64). Since the threading
@@ -203,7 +242,7 @@
* routine that will increase this size.
*/
static DWORD wait_for_many_objects(DWORD nCount, CONST HANDLE *lpHandles,
-DWORD dwSeconds)
+ DWORD dwSeconds)
{
time_t tStopTime;
DWORD dwRet = WAIT_TIMEOUT;
@@ -219,11 +258,10 @@
bFirst = FALSE;
for (dwIndex = 0; dwIndex * MAXIMUM_WAIT_OBJECTS < nCount;
dwIndex++) {
-dwRet = WaitForMultipleObjects(
-min(MAXIMUM_WAIT_OBJECTS,
-nCount - (dwIndex * MAXIMUM_WAIT_OBJECTS)),
-lpHandles + (dwIndex * MAXIMUM_WAIT_OBJECTS),
-0, 0);
+dwRet = WaitForMultipleObjects(
+min(MAXIMUM_WAIT_OBJECTS, nCount - (dwIndex *
MAXIMUM_WAIT_OBJECTS)),
+lpHandles + (dwIndex * MAXIMUM_WAIT_OBJECTS),
+0, 0);
if (dwRet != WAIT_TIMEOUT) {
break;
@@ -262,7 +300,6 @@
* On entry, type gives the event to signal. 0 means shutdown, 1 means
* graceful restart.
*/
-
static void signal_parent(int type)
{
HANDLE e;
@@ -285,38 +322,41 @@
case 1: signal_name = signal_restart_name; break;
default: return;
}
-
e = OpenEvent(EVENT_ALL_ACCESS, FALSE, signal_name);
if (!e) {
/* Um, problem, can't signal the parent, which means we can't
* signal ourselves to die. Ignore for now...
*/
ap_log_error(APLOG_MARK, APLOG_EMERG, GetLastError(), server_conf,
- "OpenEvent on %s event", signal_name);
+ "OpenEvent on %s event", signal_name);
return;
}
if (SetEvent(e) == 0) {
/* Same problem as above */
ap_log_error(APLOG_MARK, APLOG_EMERG, GetLastError(), server_conf,
- "SetEvent on %s event", signal_name);
+ "SetEvent on %s event", signal_name);
CloseHandle(e);
return;
}
CloseHandle(e);
}
-void ap_start_shutdown(void)
-{
-signal_parent(0);
-}
-void ap_start_restart(int graceful)
-{
-signal_parent(1);
-}
-static int volatile is_graceful = 0;
-API_EXPORT(int) ap_graceful_stop_signalled(void)
+/*
+ * Initialise the signal names, in t
cvs commit: /foundation members.txt
andi99/11/29 03:57:35 Modified:foundation members.txt Log: Add my contact information Revision ChangesPath 1.42 +9 -0 /foundation/members.txt Index: members.txt === RCS file: /home/apcore/moot//foundation/members.txt,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- members.txt 1999/11/29 07:02:03 1.41 +++ members.txt 1999/11/29 11:57:31 1.42 @@ -79,6 +79,15 @@ Email: [EMAIL PROTECTED] Cell: (415) 609-7159 + *) Andi Gutmans +Haim Lebanon 86/3 +Tel-Aviv 69345 +Israel +Email: [EMAIL PROTECTED] +URL: http://www.zend.com/ +Tel: +972-3-6428686 +Cell: +972-53-742088 + *) Ben Hyde 25 Bartlett Av Arlington, MA 02174
