cvs commit: apache-2.0/src buildconf
manoj 99/12/19 17:45:00 Modified:src buildconf Log: We need to run autoheader to compile APR. Revision ChangesPath 1.3 +1 -0 apache-2.0/src/buildconf Index: buildconf === RCS file: /home/cvs/apache-2.0/src/buildconf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -u -r1.2 -r1.3 --- buildconf 1999/12/19 16:36:19 1.2 +++ buildconf 1999/12/20 01:44:59 1.3 @@ -112,6 +112,7 @@ cd lib/apr mv configure configure.old 2/dev/null +autoheader autoconf if cmp configure.old configure /dev/null 21; then echo buildconf: keeping configure
cvs commit: apache-2.0/src buildconf configure.in
manoj 99/12/19 17:54:40 Modified:src buildconf configure.in Log: Make Apache's configure script run APR's. Revision ChangesPath 1.4 +0 -3 apache-2.0/src/buildconf Index: buildconf === RCS file: /home/cvs/apache-2.0/src/buildconf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -u -r1.3 -r1.4 --- buildconf 1999/12/20 01:44:59 1.3 +++ buildconf 1999/12/20 01:54:38 1.4 @@ -128,6 +128,3 @@ rm config.cache ./configure -cd lib/apr -rm config.cache -./configure 1.10 +3 -0 apache-2.0/src/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/configure.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -u -r1.9 -r1.10 --- configure.in 1999/12/05 10:33:40 1.9 +++ configure.in 1999/12/20 01:54:39 1.10 @@ -21,6 +21,9 @@ dnl Needed for APACHE_MODULE() to work cwd=`pwd` +dnl ## Run configure for packages Apache uses +AC_CONFIG_SUBDIRS(lib/apr) + dnl ## Check for programs AC_PROG_AWK
cvs commit: apache-2.0/src/modules/standard Makefile.am config.m4
manoj 99/12/19 18:01:34 Modified:src/modules/standard Makefile.am config.m4 Log: mmap_static isn't in the standard directory yet; this directory shouldn't try to configure it. Revision ChangesPath 1.5 +0 -2 apache-2.0/src/modules/standard/Makefile.am Index: Makefile.am === RCS file: /home/cvs/apache-2.0/src/modules/standard/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -u -r1.4 -r1.5 --- Makefile.am 1999/12/06 04:44:06 1.4 +++ Makefile.am 1999/12/20 02:01:31 1.5 @@ -1,6 +1,5 @@ noinst_LTLIBRARIES = @STANDARD_LIBS@ EXTRA_LTLIBRARIES = \ -libapachemod_mmap_static.la \ libapachemod_vhost_alias.la \ libapachemod_env.la \ libapachemod_log_config.la \ @@ -33,7 +32,6 @@ libapachemod_setenvif.la \ libapachemod_echo.la -libapachemod_mmap_static_la_SOURCES = mod_mmap_static.c libapachemod_vhost_alias_la_SOURCES = mod_vhost_alias.c libapachemod_env_la_SOURCES = mod_env.c libapachemod_log_config_la_SOURCES = mod_log_config.c 1.10 +0 -1 apache-2.0/src/modules/standard/config.m4 Index: config.m4 === RCS file: /home/cvs/apache-2.0/src/modules/standard/config.m4,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -u -r1.9 -r1.10 --- config.m4 1999/12/06 05:01:32 1.9 +++ config.m4 1999/12/20 02:01:31 1.10 @@ -21,7 +21,6 @@ fi ]) -APACHE_CHECK_STANDARD_MODULE(mmap_static, , no) APACHE_CHECK_STANDARD_MODULE(vhost_alias, , no) APACHE_CHECK_STANDARD_MODULE(env, , yes) APACHE_CHECK_STANDARD_MODULE(log_config, config_log, yes)
cvs commit: apache-1.3 STATUS
lars99/12/19 18:11:17 Modified:.STATUS Log: Add entry regarding the mod_vhost_alias Host: header problem. Revision ChangesPath 1.772 +5 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.771 retrieving revision 1.772 diff -u -r1.771 -r1.772 --- STATUS1999/12/17 14:03:21 1.771 +++ STATUS1999/12/20 02:11:15 1.772 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/17 14:03:21 $] + Last modified at [$Date: 1999/12/20 02:11:15 $] Release: @@ -19,6 +19,10 @@ 2.0 : In pre-alpha development, see apache-2.0 repository RELEASE SHOWSTOPPERS: + +* mod_vhost_alias Host: header check + Message-ID: [EMAIL PROTECTED] + RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
Re: cvs commit: apache-2.0/src buildconf configure.in
[EMAIL PROTECTED] wrote: manoj 99/12/19 17:54:40 Modified:src buildconf configure.in Log: Make Apache's configure script run APR's. OK, but the config.cache should still be removed, surely? Also, BTW, the current version completely fails to build for me (lots of unresolved externals) - what's the current recommended build path? I'm slightly puzzled by what's going on with APR - it seems to build a dozen different libraries, but Apache only seems to use one. What am I missing? Cheers, Ben. -- SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm 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 buildconf
manoj 99/12/19 18:36:13 Modified:src buildconf Log: Put back the removing of config.cache. Also add a -f flag to the rm to eliminate a warning. Revision ChangesPath 1.5 +2 -1 apache-2.0/src/buildconf Index: buildconf === RCS file: /home/cvs/apache-2.0/src/buildconf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -u -r1.4 -r1.5 --- buildconf 1999/12/20 01:54:38 1.4 +++ buildconf 1999/12/20 02:36:13 1.5 @@ -110,6 +110,7 @@ echo buildconf: setting up APR cd lib/apr +rm -f config.cache mv configure configure.old 2/dev/null autoheader @@ -125,6 +126,6 @@ # Now run the configs... -rm config.cache +rm -f config.cache ./configure
cvs commit: apache-2.0/src/regex config.m4 config.h.stub
manoj 99/12/19 19:09:51 Modified:src acconfig.h.in acinclude.m4 configure.in src/main config.m4 src/modules/mpm config.m4 src/regex config.m4 Removed: src/main config.h.stub src/modules/mpm config.h.stub src/regex config.h.stub Log: Eliminate the .h.stub files; AC_DEFINE can generate the necessary #defines in the config header for us. Revision ChangesPath 1.4 +0 -5 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.3 retrieving revision 1.4 diff -u -d -u -r1.3 -r1.4 --- acconfig.h.in 1999/12/01 01:16:00 1.3 +++ acconfig.h.in 1999/12/20 03:09:43 1.4 @@ -1,8 +1,3 @@ /* symbols defined by autoconf's configure script that aren't taken care * of by autoheader */ -/* Define if EAGAIN is present on this system */ -#undef HAVE_EAGAIN - -/* Define if arguments to select() aren't what we expect */ -#undef SELECT_NEEDS_CAST 1.7 +4 -2 apache-2.0/src/acinclude.m4 Index: acinclude.m4 === RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -u -r1.6 -r1.7 --- acinclude.m4 1999/12/09 01:13:08 1.6 +++ acinclude.m4 1999/12/20 03:09:43 1.7 @@ -58,7 +58,8 @@ #endif ], ac_cv_define_$1=yes, ac_cv_define_$1=no)) if test $ac_cv_define_$1 = yes ; then - AC_DEFINE(HAVE_$1) + AC_DEFINE(HAVE_$1,, + [Define if the macro $1 is defined on this system]) fi ]) @@ -75,7 +76,8 @@ ]) ]) if test $ac_ac_type_rlim_t = no ; then - AC_DEFINE(rlim_t, int) + AC_DEFINE(rlim_t, int, + [Define to 'int' if sys/resource.h doesn't define it for us]) fi ]) 1.11 +2 -1 apache-2.0/src/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/configure.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -u -r1.10 -r1.11 --- configure.in 1999/12/20 01:54:39 1.10 +++ configure.in 1999/12/20 03:09:43 1.11 @@ -100,7 +100,8 @@ -o $ac_cv_func_select_arg234 != fd_set * \ -o $ac_cv_func_select_arg5 != struct timeval * ; then -AC_DEFINE(SELECT_NEEDS_CAST) +AC_DEFINE(SELECT_NEEDS_CAST,, +[Define if arguments to select() aren't what we expect]) fi AM_PROG_LIBTOOL 1.4 +12 -5 apache-2.0/src/main/config.m4 Index: config.m4 === RCS file: /home/cvs/apache-2.0/src/main/config.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -u -r1.3 -r1.4 --- config.m4 1999/12/10 20:22:07 1.3 +++ config.m4 1999/12/20 03:09:48 1.4 @@ -1,5 +1,7 @@ dnl ## Check for libraries +AC_DEFUN(APACHE_DEFINE_HAVE_CRYPT, [ +]) AC_CHECK_LIB(nsl, gethostname, [ AC_ADD_LIBRARY(nsl) ], []) @@ -11,10 +13,14 @@ AC_CHECK_LIB(crypt, crypt, [ AC_ADD_LIBRARY(crypt) - AC_DEFINE(HAVE_CRYPT)], []) - -AC_CHECK_LIB(c, crypt, [ - AC_DEFINE(HAVE_CRYPT)], []) + apache_have_crypt=1 +], [ + AC_CHECK_LIB(c, crypt, [ + apache_have_crypt=1], []) +]) +if test $apache_have_crypt = 1 ; then +AC_DEFINE(HAVE_CRYPT,,[Define if this platform has crypt()]) +fi dnl ## Check for header files @@ -37,7 +43,8 @@ ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)]) if test $ac_cv_struct_tm_gmtoff = yes; then -AC_DEFINE(HAVE_GMTOFF) +AC_DEFINE(HAVE_GMTOFF,, +[Define if struct tm has a tm_gmtoff member]) fi dnl ## Check for library functions 1.4 +6 -3 apache-2.0/src/modules/mpm/config.m4 Index: config.m4 === RCS file: /home/cvs/apache-2.0/src/modules/mpm/config.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -u -r1.3 -r1.4 --- config.m4 1999/12/05 19:36:42 1.3 +++ config.m4 1999/12/20 03:09:50 1.4 @@ -29,10 +29,12 @@ AC_MSG_CHECKING(which shared memory mechanism to use) if test $ac_cv_func_shmget = yes ; then -AC_DEFINE(USE_SHMGET_SCOREBOARD) +AC_DEFINE(USE_SHMGET_SCOREBOARD,, +[Define if MPMs should use shmget to implement their shared memory]) AC_MSG_RESULT(shmget) elif test $ac_cv_func_mmap = yes ; then -AC_DEFINE(USE_MMAP_SCOREBOARD) +AC_DEFINE(USE_MMAP_SCOREBOARD,, +[Define if MPMs should use mmap to implement their shared memory])
cvs commit: apache-2.0/src Makefile.am configure.in
manoj 99/12/19 20:15:10 Modified:src Makefile.am configure.in Log: Make building a little easier by not requiring a separate make of APR. Revision ChangesPath 1.3 +1 -1 apache-2.0/src/Makefile.am Index: Makefile.am === RCS file: /home/cvs/apache-2.0/src/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -u -r1.2 -r1.3 --- Makefile.am 1999/12/01 05:39:16 1.2 +++ Makefile.am 1999/12/20 04:15:07 1.3 @@ -1,5 +1,5 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS=ap main modules os $(REGEX_DIR) +SUBDIRS=ap lib main modules os $(REGEX_DIR) bin_PROGRAMS = apache apache_SOURCES = modules.c 1.12 +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.11 retrieving revision 1.12 diff -u -d -u -r1.11 -r1.12 --- configure.in 1999/12/20 03:09:43 1.11 +++ configure.in 1999/12/20 04:15:08 1.12 @@ -127,5 +127,5 @@ dnl ## Build modules.c rm -f $srcdir/modules.c echo $MODLIST | $AWK -f $srcdir/helpers/build-modules-c.awk $srcdir/modules.c -AC_OUTPUT([Makefile ap/Makefile main/Makefile modules/Makefile +AC_OUTPUT([Makefile ap/Makefile lib/Makefile main/Makefile modules/Makefile modules/standard/Makefile os/Makefile $APACHE_OUTPUT_FILES])
cvs commit: apache-2.0/src buildconf
manoj 99/12/19 20:34:45 Modified:src buildconf Log: We actually don't have to remove config.cache, because AC_CONFIG_SUBDIRS redirects APR's config.cache to point to Apache's. Revision ChangesPath 1.6 +0 -1 apache-2.0/src/buildconf Index: buildconf === RCS file: /home/cvs/apache-2.0/src/buildconf,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -u -r1.5 -r1.6 --- buildconf 1999/12/20 02:36:13 1.5 +++ buildconf 1999/12/20 04:34:45 1.6 @@ -110,7 +110,6 @@ echo buildconf: setting up APR cd lib/apr -rm -f config.cache mv configure configure.old 2/dev/null autoheader
cvs commit: apache-2.0/src buildconf
manoj 99/12/19 20:38:27 Modified:src buildconf Log: Don't actually run ./configure in buildconf, it wastes lots of time if we want to use ./configure's flags, among other things. Revision ChangesPath 1.7 +1 -3 apache-2.0/src/buildconf Index: buildconf === RCS file: /home/cvs/apache-2.0/src/buildconf,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -u -r1.6 -r1.7 --- buildconf 1999/12/20 04:34:45 1.6 +++ buildconf 1999/12/20 04:38:26 1.7 @@ -123,8 +123,6 @@ cd ../.. -# Now run the configs... - +# Remove cached config data rm -f config.cache -./configure
cvs commit: apache-2.0/src Makefile.am
manoj 99/12/19 20:43:29 Modified:src Makefile.am Log: buildmark.o was getting built twice; I used the wrong solution for forcing it to be built for every compile. This works better. Revision ChangesPath 1.4 +2 -4 apache-2.0/src/Makefile.am Index: Makefile.am === RCS file: /home/cvs/apache-2.0/src/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -u -r1.3 -r1.4 --- Makefile.am 1999/12/20 04:15:07 1.3 +++ Makefile.am 1999/12/20 04:43:28 1.4 @@ -2,7 +2,7 @@ SUBDIRS=ap lib main modules os $(REGEX_DIR) bin_PROGRAMS = apache -apache_SOURCES = modules.c +apache_SOURCES = modules.c buildmark.c apache_DEPENDENCIES = \ $(MOD_LTLIBS) \ $(MPM_LIB) \ @@ -10,12 +10,10 @@ $(OS_DIR)/libos.la \ ap/libap.la \ lib/apr/libapr.a \ - $(REGEX_LIB) \ - buildmark.o + $(REGEX_LIB) apache_LDADD = $(apache_DEPENDENCIES) $(EXTRA_LIBS) buildmark.o: build-buildmark build-buildmark: - $(COMPILE) -c buildmark.c
cvs commit: apache-2.0/src configure.in
manoj 99/12/19 21:03:03 Modified:src configure.in Log: Speed up building, by making --disable-shared the default until we put proper DSO support into the autoconf configuration scripts. Revision ChangesPath 1.13 +1 -0 apache-2.0/src/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/configure.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -u -r1.12 -r1.13 --- configure.in 1999/12/20 04:15:08 1.12 +++ configure.in 1999/12/20 05:03:01 1.13 @@ -104,6 +104,7 @@ [Define if arguments to select() aren't what we expect]) fi +AM_DISABLE_SHARED AM_PROG_LIBTOOL dnl ## Checking command-line options
cvs commit: apache-1.3/src/modules/standard mod_vhost_alias.c
fanf99/12/19 21:24:28
Modified:src/modules/standard mod_vhost_alias.c
Log:
Fix for the security problem spotted by Lars Eilebrecht [EMAIL PROTECTED]
Revision ChangesPath
1.3 +9 -4 apache-1.3/src/modules/standard/mod_vhost_alias.c
Index: mod_vhost_alias.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_vhost_alias.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_vhost_alias.c 1999/06/22 15:33:17 1.2
+++ mod_vhost_alias.c 1999/12/20 05:24:22 1.3
@@ -278,8 +278,8 @@
}
}
-static void vhost_alias_interpolate(request_rec *r, const char *name,
- const char *map, const char *uri)
+static int vhost_alias_interpolate(request_rec *r, const char *name,
+const char *map, const char *uri)
{
/* 0..9 9..0 */
enum { MAXDOTS = 19 };
@@ -391,6 +391,8 @@
}
vhost_alias_checkspace(r, buf, dest, end - start);
for (p = start; p end; ++p) {
+ if (!isalnum(*p) *p != '-' *p != '.')
+ return HTTP_BAD_REQUEST;
*dest++ = ap_tolower(*p);
}
}
@@ -405,6 +407,7 @@
else {
r-filename = ap_pstrcat(r-pool, buf, uri, NULL);
}
+return OK;
}
static int mva_translate(request_rec *r)
@@ -412,7 +415,7 @@
mva_sconf_t *conf;
const char *name, *map, *uri;
mva_mode_e mode;
-int cgi;
+int cgi, bad;
conf = (mva_sconf_t *) ap_get_module_config(r-server-module_config,
vhost_alias_module);
@@ -446,7 +449,9 @@
return DECLINED;
}
-vhost_alias_interpolate(r, name, map, uri);
+bad = vhost_alias_interpolate(r, name, map, uri);
+if (bad != OK)
+ return bad;
if (cgi) {
/* see is_scriptaliased() in mod_cgi */
cvs commit: apache-1.3 STATUS
fanf99/12/19 21:27:31 Modified:.STATUS Log: too cold to be hacking this late at night, but the Host: header problem is gone Revision ChangesPath 1.773 +1 -4 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.772 retrieving revision 1.773 diff -u -r1.772 -r1.773 --- STATUS1999/12/20 02:11:15 1.772 +++ STATUS1999/12/20 05:27:25 1.773 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/20 02:11:15 $] + Last modified at [$Date: 1999/12/20 05:27:25 $] Release: @@ -19,9 +19,6 @@ 2.0 : In pre-alpha development, see apache-2.0 repository RELEASE SHOWSTOPPERS: - -* mod_vhost_alias Host: header check - Message-ID: [EMAIL PROTECTED] RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
cvs commit: apache-2.0/src Makefile.am
manoj 99/12/19 21:54:35 Modified:src Makefile.am Log: Add a comment to explain what the build-buildmark target is all about. Revision ChangesPath 1.5 +1 -1 apache-2.0/src/Makefile.am Index: Makefile.am === RCS file: /home/cvs/apache-2.0/src/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -u -r1.4 -r1.5 --- Makefile.am 1999/12/20 04:43:28 1.4 +++ Makefile.am 1999/12/20 05:54:35 1.5 @@ -14,6 +14,6 @@ apache_LDADD = $(apache_DEPENDENCIES) $(EXTRA_LIBS) +# Force buildmark to be rebuilt for every compile buildmark.o: build-buildmark - build-buildmark:
Re: cvs commit: apache-2.0/src buildconf configure.in
OK, but the config.cache should still be removed, surely? Also, BTW, the current version completely fails to build for me (lots of unresolved externals) - what's the current recommended build path? I'm slightly puzzled by what's going on with APR - it seems to build a dozen different libraries, but Apache only seems to use one. What am I missing? APR hasn't built a dozen different libraries for a long time. We are only building the one libapr.a. What platform are you on? I have the code working just fine on Linux and Windows. If you are using the prefork MPM, you have to specify LIBS=-lpthread. If you are on any other platform, you are on your own. The configure script has basically been written on Linux, and it is assumed it will be modified as we port 2.0. Ryan ___ Ryan Bloom [EMAIL PROTECTED] 4205 S Miami Blvd RTP, NC 27709 It's a beautiful sight to see good dancers doing simple steps. It's a painful sight to see beginners doing complicated patterns.
cvs commit: apache-1.3 README.configure
rasmus 99/12/20 06:27:12 Modified:.README.configure Log: --with-shared-apache has been deprecated Revision ChangesPath 1.20 +6 -23 apache-1.3/README.configure Index: README.configure === RCS file: /home/cvs/apache-1.3/README.configure,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- README.configure 1999/12/17 22:25:17 1.19 +++ README.configure 1999/12/20 14:27:10 1.20 @@ -263,29 +263,8 @@ $ make $ make install - 2. How you can install Apache with a dynamically linked PHP: + 2. You can also use APXS: -$ gunzip apache_1.3.X.tar.gz | tar xvf - -$ gunzip php-3.0.tar.gz | tar xvf - -$ cd apache_1.3.X -$ ./configure --prefix=/path/to/apache -$ cd ../php-3.0 -$ ./configure --with-shared-apache=../apache_1.3.X -$ make -$ make install - -[optionally you now have the chance to prepare or add more - third-party modules to the Apache source tree] - -$ cd ../apache_1.3.X -$ ./configure --prefix=/path/to/apache \ - --activate-module=src/modules/php3/libphp3.a \ - --enable-shared=php3 -$ make -$ make install - - 3. You can also use APXS: - $ cd apache-1.3.X $ ./configure --prefix=/path/to/apache --enable-shared=max $ make @@ -298,8 +277,12 @@ $ make install At this point don't forget to edit your conf/httpd.conf file and - make sure the file contains the line: + make sure the file contains the line for PHP 3: AddType application/x-httpd-php3 .php3 + + Or this line for PHP 4: + +AddType application/x-httpd-php .php Then restart your server.
cvs commit: apache-1.3/src Configure
martin 99/12/20 06:50:57 Modified:src Configure Log: Add a default compiler switch Revision ChangesPath 1.383 +2 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.382 retrieving revision 1.383 diff -u -r1.382 -r1.383 --- Configure 1999/12/15 21:45:17 1.382 +++ Configure 1999/12/20 14:50:55 1.383 @@ -627,7 +627,8 @@ BS2000*-siemens-sysv4*) OS='BS2000' OSDIR='os/bs2000' - CC='c89 -XLLML -XLLMK -XL' + # If you are using a CPP before V3.0, delete the -Kno_integer_overflow flag + CC='c89 -XLLML -XLLMK -XL -Kno_integer_overflow' CFLAGS=$CFLAGS -DCHARSET_EBCDIC -DSVR4 -D_XPG_IV DEF_WANTHSREGEX=yes DBM_LIB=
cvs commit: apache-2.0/src/lib/apr/locks/beos Makefile.in
dreid 99/12/20 08:04:16 Modified:src/lib/apr/locks/beos Makefile.in Log: Missed this one when I did the others. As there isn't an inc directory I guess the other platforms should do this as well? Revision ChangesPath 1.4 +3 -4 apache-2.0/src/lib/apr/locks/beos/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.in 1999/11/02 11:30:36 1.3 +++ Makefile.in 1999/12/20 16:04:15 1.4 @@ -8,10 +8,9 @@ [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) -INCDIR=../../inc -INCDIR1=../../include -INCDIR2=../../file_io/unix -INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I. +INCDIR=../../include +INCDIR1=../../file_io/unix +INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I. LIB=liblock.a
Re: cvs commit: apache-2.0/src/lib/apr/locks/beos Makefile.in
Modified:src/lib/apr/locks/beos Makefile.in Log: Missed this one when I did the others. As there isn't an inc directory I guess the other platforms should do this as well? Good point. We need to clean things up a bit. I have been busy doing other stuff recently, but hopefully this week I'll get a chance to clean APR a bit. Unless somebody else wants to beat me to it. Ryan ___ Ryan Bloom [EMAIL PROTECTED] 4205 S Miami Blvd RTP, NC 27709 Come to the first official Apache Software Foundation Conference! http://ApacheCon.Com/
cvs commit: apache-2.0/src/lib/apr/time/unix timestr.c Makefile.in access.c atime.h time.c
rbb 99/12/20 08:10:19 Modified:src/lib/apr/include apr.h.in apr_errno.h apr_time.h src/lib/apr/time/unix Makefile.in access.c atime.h time.c Added: src/lib/apr/time/unix timestr.c Log: A bunch more time functions for use in Apache. This is really the first cut at making the time library usable in an actual program. Revision ChangesPath 1.7 +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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- apr.h.in 1999/12/06 18:19:33 1.6 +++ apr.h.in 1999/12/20 16:10:10 1.7 @@ -70,6 +70,7 @@ #define API_EXPORT(type) type #define API_EXPORT_NONSTD(type) type #define API_VAR_IMPORT extern +#define API_VAR_EXPORT #endif /* APR_H */ 1.12 +3 -0 apache-2.0/src/lib/apr/include/apr_errno.h Index: apr_errno.h === RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_errno.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- apr_errno.h 1999/12/09 21:00:20 1.11 +++ apr_errno.h 1999/12/20 16:10:11 1.12 @@ -124,6 +124,9 @@ #define APR_BADARG (APR_OS_START_STATUS + 13) #define APR_EOF(APR_OS_START_STATUS + 14) #define APR_NOTFOUND (APR_OS_START_STATUS + 15) +#define APR_LESS (APR_OS_START_STATUS + 16) +#define APR_EQUAL (APR_OS_START_STATUS + 17) +#define APR_MORE (APR_OS_START_STATUS + 18) /* A simple value to be used to initialze a status variable. */ #define APR_EINIT (APR_OS_START_STATUS + 16) 1.4 +8 -0 apache-2.0/src/lib/apr/include/apr_time.h Index: apr_time.h === RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_time.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- apr_time.h1999/10/04 16:36:55 1.3 +++ apr_time.h1999/12/20 16:10:11 1.4 @@ -67,12 +67,18 @@ typedef struct atime_t ap_time_t; +API_VAR_IMPORT const char ap_month_snames[12][4]; +API_VAR_IMPORT const char ap_day_snames[7][4]; + /* Function Definitions */ ap_status_t ap_make_time(ap_time_t **, ap_context_t *); ap_status_t ap_current_time(ap_time_t *); ap_status_t ap_explode_time(ap_time_t *, ap_timetype_e); ap_status_t ap_implode_time(ap_time_t *); +ap_status_t ap_gm_timestr_822(char **date_str, struct atime_t *t, ap_context_t *p); +ap_status_t ap_strftime(char *s, ap_size_t max, const char *format, ap_time_t *tm); + /* accessor functions */ ap_status_t ap_get_curtime(ap_time_t *, ap_int64_t *); ap_status_t ap_timediff(ap_time_t *, ap_time_t *, ap_int32_t *); @@ -85,6 +91,7 @@ ap_status_t ap_get_year(ap_time_t *, ap_int32_t *); ap_status_t ap_get_wday(ap_time_t *, ap_int32_t *); +ap_status_t ap_set_curtime(ap_time_t *, ap_int64_t); ap_status_t ap_set_sec(ap_time_t *, ap_int32_t); ap_status_t ap_set_min(ap_time_t *, ap_int32_t); ap_status_t ap_set_hour(ap_time_t *, ap_int32_t); @@ -92,6 +99,7 @@ ap_status_t ap_set_mon(ap_time_t *, ap_int32_t); ap_status_t ap_set_year(ap_time_t *, ap_int32_t); ap_status_t ap_set_wday(ap_time_t *, ap_int32_t); +ap_status_t ap_timecmp(ap_time_t *a, ap_time_t *b); ap_status_t ap_get_timedata(ap_time_t *, char *, void *); ap_status_t ap_set_timedata(ap_time_t *, void *, char *, 1.8 +11 -4 apache-2.0/src/lib/apr/time/unix/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile.in 1999/12/19 18:10:05 1.7 +++ Makefile.in 1999/12/20 16:10:15 1.8 @@ -15,7 +15,8 @@ LIB=libtime.a OBJS=time.o \ - access.o + access.o \ + timestr.o .c.o: $(CC) $(CFLAGS) -c $(INCLUDES) $ @@ -53,10 +54,16 @@ access.o: access.c atime.h ../../include/apr_config.h \ ../../include/apr_time.h ../../include/apr_general.h \ ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \ - ../../include/apr_file_io.h + ../../include/apr_file_io.h ../../include/apr_thread_proc.h time.o: time.c atime.h ../../include/apr_config.h \ ../../include/apr_time.h ../../include/apr_general.h \ ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \ - ../../include/apr_file_io.h ../../include/apr_portable.h \ - ../../include/apr_thread_proc.h ../../include/apr_network_io.h \ +
cvs commit: apache-2.0/src/modules/standard mod_include.c mod_log_config.c mod_negotiation.c
rbb 99/12/20 08:38:41 Modified:src/include http_protocol.h http_request.h httpd.h util_date.h src/main http_core.c http_protocol.c http_request.c util.c util_date.c util_script.c src/modules/standard mod_include.c mod_log_config.c mod_negotiation.c Log: First step in getting Apache to use APR's time libraries. This gets a good number of them, but I think there are more time values still in the Apache code. This works under Linux, but has not been tested anywhere else. Revision ChangesPath 1.9 +1 -1 apache-2.0/src/include/http_protocol.h Index: http_protocol.h === RCS file: /home/cvs/apache-2.0/src/include/http_protocol.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- http_protocol.h 1999/11/20 11:56:11 1.8 +++ http_protocol.h 1999/12/20 16:38:31 1.9 @@ -118,7 +118,7 @@ API_EXPORT(int) ap_set_content_length(request_rec *r, long length); API_EXPORT(int) ap_set_keepalive(request_rec *r); -API_EXPORT(time_t) ap_rationalize_mtime(request_rec *r, time_t mtime); +API_EXPORT(ap_time_t *) ap_rationalize_mtime(request_rec *r, ap_time_t *mtime); API_EXPORT(char *) ap_make_etag(request_rec *r, int force_weak); API_EXPORT(void) ap_set_etag(request_rec *r); API_EXPORT(void) ap_set_last_modified(request_rec *r); 1.4 +1 -1 apache-2.0/src/include/http_request.h Index: http_request.h === RCS file: /home/cvs/apache-2.0/src/include/http_request.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- http_request.h1999/08/31 05:32:19 1.3 +++ http_request.h1999/12/20 16:38:31 1.4 @@ -104,7 +104,7 @@ API_EXPORT(void) ap_internal_redirect_handler(const char *new_uri, request_rec *); API_EXPORT(int) ap_some_auth_required(request_rec *r); API_EXPORT(int) ap_is_initial_req(request_rec *r); -API_EXPORT(time_t) ap_update_mtime(request_rec *r, time_t dependency_mtime); +API_EXPORT(ap_time_t *) ap_update_mtime(request_rec *r, ap_time_t *dependency_mtime); #ifdef CORE_PRIVATE /* Function called by main.c to handle first-level request */ 1.15 +4 -7 apache-2.0/src/include/httpd.h Index: httpd.h === RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- httpd.h 1999/12/08 00:14:03 1.14 +++ httpd.h 1999/12/20 16:38:32 1.15 @@ -71,6 +71,7 @@ #include ap_config.h #include apr_general.h #include apr_lib.h +#include apr_time.h #include buff.h #include ap.h @@ -667,7 +668,7 @@ int proto_num; /* Number version of protocol; 1.1 = 1001 */ const char *hostname;/* Host, as set by full URI or Host: */ -time_t request_time; /* When the request started */ +ap_time_t *request_time; /* When the request started */ const char *status_line; /* Status line, if set by script */ int status; /* In any case */ @@ -703,7 +704,7 @@ int sent_bodyct; /* byte count in stream is for body */ long bytes_sent; /* body byte count, for easy access */ -time_t mtime;/* Time the resource was last modified */ +ap_time_t *mtime;/* Time the resource was last modified */ /* HTTP/1.1 connection-level features */ @@ -913,14 +914,10 @@ */ /* Time */ -extern API_VAR_EXPORT const char ap_month_snames[12][4]; -extern API_VAR_EXPORT const char ap_day_snames[7][4]; - API_EXPORT(struct tm *) ap_get_gmtoff(int *tz); API_EXPORT(char *) ap_get_time(void); API_EXPORT(char *) ap_field_noparam(ap_context_t *p, const char *intype); -API_EXPORT(char *) ap_ht_time(ap_context_t *p, time_t t, const char *fmt, int gmt); -API_EXPORT(char *) ap_gm_timestr_822(ap_context_t *p, time_t t); +API_EXPORT(char *) ap_ht_time(ap_context_t *p, ap_time_t *t, const char *fmt, int gmt); /* String handling. The *_nc variants allow you to use non-const char **s as arguments (unfortunately C won't automatically convert a char ** to a const 1.4 +2 -1 apache-2.0/src/include/util_date.h Index: util_date.h === RCS file: /home/cvs/apache-2.0/src/include/util_date.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- util_date.h 1999/08/27 22:18:45 1.3 +++ util_date.h 1999/12/20 16:38:33 1.4 @@ -71,12 +71,13 @@ #include sys/types.h #endif #include time.h +#include apr_time.h
cvs commit: apache-1.3/src/modules/standard mod_vhost_alias.c
fanf99/12/20 09:43:41
Modified:src CHANGES
src/main http_protocol.c http_vhost.c
src/modules/standard mod_vhost_alias.c
Log:
A better fix for the mass virtual hosting security problem spotted by Lars.
This solves the problem for mod_rewrite setups as well as mod_vhost_alias.
Submitted by: Ben Hyde
Reviewed by: Tony Finch
Revision ChangesPath
1.1484+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1483
retrieving revision 1.1484
diff -u -r1.1483 -r1.1484
--- CHANGES 1999/12/17 22:25:11 1.1483
+++ CHANGES 1999/12/20 17:43:25 1.1484
@@ -1,5 +1,10 @@
Changes with Apache 1.3.10
+ *) More rigorous checking of Host: headers to fix security problems
+ with mass name-based virtual hosting (whether using mod_rewrite
+ or mod_vhost_alias).
+ [Ben Hyde, Tony Finch]
+
*) Updated README.config to reflect current APACI state.
[Brian Slesinsky [EMAIL PROTECTED]] PR#5397
1.284 +3 -1 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- http_protocol.c 1999/12/09 12:05:03 1.283
+++ http_protocol.c 1999/12/20 17:43:35 1.284
@@ -1045,7 +1045,7 @@
r-status = HTTP_OK; /* Until further notice. */
/* update what we think the virtual host is based on the headers we've
- * now read
+ * now read. may update status.
*/
ap_update_vhost_from_headers(r);
@@ -1068,6 +1068,8 @@
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
client sent HTTP/1.1 request without hostname
(see RFC2068 section 9, and 14.23): %s, r-uri);
+}
+if (r-status != HTTP_OK) {
ap_send_error_response(r, 0);
ap_log_transaction(r);
return r;
1.16 +41 -10apache-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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- http_vhost.c 1999/01/01 19:04:51 1.15
+++ http_vhost.c 1999/12/20 17:43:37 1.16
@@ -657,22 +657,51 @@
* run-time vhost matching functions
*/
-/* Remove :port and optionally a single trailing . from the hostname, this
- * canonicalizes it somewhat.
+/* Lowercase and remove any trailing dot and/or :port from the hostname,
+ * and check that it is sane.
*/
static void fix_hostname(request_rec *r)
{
-const char *hostname = r-hostname;
-char *host = ap_getword(r-pool, hostname, ':');/* get rid of
port */
-size_t l;
-
-/* trim a trailing . */
-l = strlen(host);
-if (l 0 host[l-1] == '.') {
-host[l-1] = '\0';
+char *host = ap_palloc(r-pool, strlen(r-hostname) + 1);
+const char *src;
+char *dst;
+
+/* check and copy the host part */
+src = r-hostname;
+dst = host;
+while (*src) {
+ if (!isalnum(*src) *src != '.' *src != '-') {
+ if (*src == ':')
+ break;
+ else
+ goto bad;
+ } else {
+ *dst++ = tolower(*src++);
+ }
+}
+/* check the port part */
+if (*src++ == ':') {
+ while (*src) {
+ if (!isdigit(*src++)) {
+ goto bad;
+ }
+ }
+}
+/* strip trailing gubbins */
+if (dst host dst[-1] == '.') {
+ dst[-1] = '\0';
+} else {
+ dst[0] = '\0';
}
r-hostname = host;
+return;
+
+bad:
+r-status = HTTP_BAD_REQUEST;
+ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
+ Client sent malformed Host header);
+return;
}
@@ -874,6 +903,8 @@
/* must set this for HTTP/1.1 support */
if (r-hostname || (r-hostname = ap_table_get(r-headers_in, Host))) {
fix_hostname(r);
+ if (r-status != HTTP_OK)
+ return;
}
/* check if we tucked away a name_chain */
if (r-connection-vhost_lookup_data) {
1.4 +6 -12 apache-1.3/src/modules/standard/mod_vhost_alias.c
Index: mod_vhost_alias.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_vhost_alias.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_vhost_alias.c 1999/12/20 05:24:22 1.3
+++
cvs commit: apache-1.3/src/modules/standard mod_vhost_alias.c
fanf99/12/20 10:16:55
Modified:src/main http_vhost.c
src/modules/standard mod_vhost_alias.c
Log:
Leave the case-insensitivity stuff as it was before.
Revision ChangesPath
1.17 +1 -1 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- http_vhost.c 1999/12/20 17:43:37 1.16
+++ http_vhost.c 1999/12/20 18:16:50 1.17
@@ -676,7 +676,7 @@
else
goto bad;
} else {
- *dst++ = tolower(*src++);
+ *dst++ = *src++;
}
}
/* check the port part */
1.5 +3 -2 apache-1.3/src/modules/standard/mod_vhost_alias.c
Index: mod_vhost_alias.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_vhost_alias.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_vhost_alias.c 1999/12/20 17:43:40 1.4
+++ mod_vhost_alias.c 1999/12/20 18:16:54 1.5
@@ -390,8 +390,9 @@
}
}
vhost_alias_checkspace(r, buf, dest, end - start);
- memcpy(dest, start, end-start);
- dest += end-start;
+ for (p = start; p end; ++p) {
+ *dest++ = ap_tolower(*p);
+ }
}
*dest = '\0';
/* no double slashes */
Re: cvs commit: apache-2.0/src buildconf configure.in
Ryan Bloom wrote: OK, but the config.cache should still be removed, surely? Also, BTW, the current version completely fails to build for me (lots of unresolved externals) - what's the current recommended build path? I'm slightly puzzled by what's going on with APR - it seems to build a dozen different libraries, but Apache only seems to use one. What am I missing? APR hasn't built a dozen different libraries for a long time. We are only building the one libapr.a. Should I send a log? Perhaps there's a step missing in the build? I dunno. I'm confused. What platform are you on? FreeBSD. I have the code working just fine on Linux and Windows. If you are using the prefork MPM, you have to specify LIBS=-lpthread. I let it choose (it chose threaded). If you are on any other platform, you are on your own. I'm _always_ on my own :-) The configure script has basically been written on Linux, and it is assumed it will be modified as we port 2.0. Consider me porting and modifying! Cheers, Ben. -- SECURE HOSTING AT THE BUNKER! http://www.thebunker.net/hosting.htm 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
Re: cvs commit: apache-2.0/src buildconf configure.in
APR hasn't built a dozen different libraries for a long time. We are only building the one libapr.a. Should I send a log? Perhaps there's a step missing in the build? I dunno. I'm confused. I don't know either. I'll look into it. It's possible that we are actually building all of the libraries and then merging them all together into one big one. We shouldn't be, but I never checked the commit that got us to build one library. I have the code working just fine on Linux and Windows. If you are using the prefork MPM, you have to specify LIBS=-lpthread. I let it choose (it chose threaded). I may be wrong, but I am reasonably sure that the configure script doesn't get the correct CFLAGS or LIBS for pthreads on FreeBSD. This is a known issue, and it needs to be fixed. :) Consider me porting and modifying! Cool. Ryan ___ Ryan Bloom [EMAIL PROTECTED] 4205 S Miami Blvd RTP, NC 27709 Come to the first official Apache Software Foundation Conference! http://ApacheCon.Com/
cvs commit: apache-2.0/src/modules/mpm/winnt winnt.c
stoddard99/12/20 11:07:36
Modified:src/main http_main.c
src/include ap_mpm.h
src/os/win32 main_win32.c
src/modules/mpm/winnt winnt.c
Log:
Handle -k restart|shutdown command line option from http_main.c
Revision ChangesPath
1.24 +31 -2 apache-2.0/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- http_main.c 1999/12/01 01:16:11 1.23
+++ http_main.c 1999/12/20 19:07:22 1.24
@@ -66,7 +66,8 @@
const char *ap_server_argv0;
-API_VAR_EXPORT const char *ap_server_root;
+//API_VAR_IMPORT const char *ap_server_root;
+const char *ap_server_root;
ap_array_header_t *ap_server_pre_read_config;
ap_array_header_t *ap_server_post_read_config;
@@ -236,6 +237,11 @@
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, Usage:
%s [-D name] [-d directory] [-f file], bin);
#endif
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
%s [-C \directive\] [-c \directive\], pad);
+#ifdef WIN32
+ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
%s [-k restart|shutdown|start], pad);
+ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
%s [-n service_name], pad);
+ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
%s [-i] [-u], pad);
+#endif
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
%s [-v] [-V] [-h] [-l] [-L] [-S] [-t] [-T], pad);
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
Options:);
#ifdef SHARED_CORE
@@ -246,6 +252,14 @@
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, -f
file : specify an alternate ServerConfigFile);
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, -C
\directive\ : process directive before reading config files);
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, -c
\directive\ : process directive after reading config files);
+#ifdef WIN32
+ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, -n
name : set service name and use its ServerConfigFile);
+ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, -k
shutdown : tell running Apache to shutdown);
+ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, -k
restart : tell running Apache to do a graceful restart);
+ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, -k
start : tell Apache to start);
+ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, -i
: install an Apache service);
+ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, -u
: uninstall an Apache service);
+#endif
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, -v
: show version number);
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, -V
: show compile settings);
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, -h
: list available command line options (this page));
@@ -283,6 +297,10 @@
ap_context_t *ptemp; /* Pool for temporary config stuff, reset often */
ap_context_t *pcommands; /* Pool for -C and -c switches */
+#ifdef WIN32
+char *signal = NULL;
+#endif
+
ap_server_argv0 = process-short_name;
ap_util_uri_init();
@@ -296,7 +314,7 @@
ap_server_post_read_config = ap_make_array(pcommands, 1, sizeof(char *));
ap_server_config_defines = ap_make_array(pcommands, 1, sizeof(char *));
-while (ap_getopt(pcommands, argc, argv, C:c:d:f:vVlLth, c) ==
APR_SUCCESS) {
+while (ap_getopt(pcommands, argc, argv, C:c:d:f:k:vVlLth, c) ==
APR_SUCCESS) {
char **new;
switch (c) {
case 'c':
@@ -313,6 +331,11 @@
case 'f':
confname = ap_optarg;
break;
+#ifdef WIN32
+case 'k':
+ signal = ap_optarg;
+break;
+#endif
case 'v':
printf(Server version: %s\n, ap_get_server_version());
printf(Server built: %s\n, ap_get_server_built());
@@ -351,6 +374,12 @@
ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
Syntax OK\n);
destroy_and_exit_process(process, 0);
}
+#ifdef WIN32
+if (signal) {
+ap_signal_parent(pconf, signal, ap_server_root);
+destroy_and_exit_process(process, 0);
+}
+#endif
ap_clear_pool(plog);
ap_run_open_logs(pconf, plog, ptemp, server_conf);
ap_post_config_hook(pconf, plog,
Re: cvs commit: apache-2.0/src/modules/mpm/winnt winnt.c
-API_VAR_EXPORT const char *ap_server_root; +//API_VAR_IMPORT const char *ap_server_root; +const char *ap_server_root; Please don't use C++ comments in the base code. I didn't check to see if this is the only place it is being done, but it really messes up some compilers. Ryan ___ Ryan Bloom [EMAIL PROTECTED] 4205 S Miami Blvd RTP, NC 27709 Come to the first official Apache Software Foundation Conference! http://ApacheCon.Com/
cvs commit: apache-2.0/src/main http_main.c
stoddard99/12/20 11:16:36 Modified:src/main http_main.c Log: Get rid of the C++ style comment. Revision ChangesPath 1.25 +0 -1 apache-2.0/src/main/http_main.c Index: http_main.c === RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- http_main.c 1999/12/20 19:07:22 1.24 +++ http_main.c 1999/12/20 19:16:34 1.25 @@ -66,7 +66,6 @@ const char *ap_server_argv0; -//API_VAR_IMPORT const char *ap_server_root; const char *ap_server_root; ap_array_header_t *ap_server_pre_read_config;
cvs commit: apache-2.0/src/lib/apr/test htdigest.c
rbb 99/12/20 11:44:48 Modified:src/lib/apr/test htdigest.c Log: Remove the apr_config.h include line and the ifdefs that require it. This file will need to be updated when it is moved back into the Apache tree to check for system headers again, but right now, it can't check because we don't have a header file for it to use. Revision ChangesPath 1.11 +0 -9 apache-2.0/src/lib/apr/test/htdigest.c Index: htdigest.c === RCS file: /home/cvs/apache-2.0/src/lib/apr/test/htdigest.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- htdigest.c1999/12/15 12:20:40 1.10 +++ htdigest.c1999/12/20 19:44:42 1.11 @@ -66,21 +66,12 @@ * by Alexei Kosut, based on htpasswd.c, by Rob McCool */ -#include apr_config.h #include apr_lib.h #include apr_md5.h -#ifdef HAVE_SYS_TYPES_H #include sys/types.h -#endif -#ifdef HAVE_SYS_SIGNAL_H #include sys/signal.h -#endif -#ifdef HAVE_SIGNAL_H #include signal.h -#endif -#ifdef HAVE_STDLIB_H #include stdlib.h -#endif #ifdef WIN32 #include conio.h
cvs commit: apache-2.0/src/modules/mpm/winnt winnt.c
stoddard99/12/20 11:52:53 Modified:src ApacheCore.def Apache.dsp Apache.mak ApacheCore.dsp ApacheCore.mak src/modules/mpm/winnt winnt.c Log: Windows: Can now install/uninstall Apache as a service and start/stop apache via net start and net stop commands. Not extensively tested, so there may be bugs in this still. Revision ChangesPath 1.9 +13 -6 apache-2.0/src/ApacheCore.def Index: ApacheCore.def === RCS file: /home/cvs/apache-2.0/src/ApacheCore.def,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ApacheCore.def1999/12/08 22:33:24 1.8 +++ ApacheCore.def1999/12/20 19:52:44 1.9 @@ -369,9 +369,16 @@ regerror @364 ap_send_error_response @365 ap_start_shutdown @366 -;ap_send_signal @367 -ap_pid_fname @368 -ap_read_config @369 - ap_server_pre_read_config @370 - ap_server_post_read_config @371 - ap_setup_prelinked_modules @372 +send_signal_to_service @367 +ap_read_config @368 + ap_server_pre_read_config @369 + ap_server_post_read_config @370 + ap_setup_prelinked_modules @371 + RemoveService @372 + InstallService @373 + isValidService @374 + service_main @375 + isProcessService @376 + ap_registry_get_server_root @377 + ap_registry_get_service_conf @378 + 1.3 +2 -18 apache-2.0/src/Apache.dsp Index: Apache.dsp === RCS file: /home/cvs/apache-2.0/src/Apache.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Apache.dsp1999/12/08 22:32:46 1.2 +++ Apache.dsp1999/12/20 19:52:45 1.3 @@ -49,7 +49,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 lib\apr\Release\aprlib.lib CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 lib\apr\Release\aprlib.lib CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /machine:I386 !ELSEIF $(CFG) == Apache - Win32 Debug @@ -73,7 +73,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 lib\apr\debug\aprlib.lib CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /debug /machine:I386 +# ADD LINK32 lib\apr\debug\aprlib.lib CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /debug /machine:I386 !ENDIF @@ -88,26 +88,10 @@ SOURCE=.\os\win32\main_win32.c # End Source File -# Begin Source File - -SOURCE=.\os\win32\registry.c -# End Source File -# Begin Source File - -SOURCE=.\os\win32\service.c -# End Source File # End Group # Begin Group Header Files # PROP Default_Filter h;hpp;hxx;hm;inl;fi;fd -# Begin Source File - -SOURCE=.\os\win32\registry.h -# End Source File -# Begin Source File - -SOURCE=.\os\win32\service.h -# End Source File # End Group # Begin Group Resource Files 1.3 +9 -80 apache-2.0/src/Apache.mak Index: Apache.mak === RCS file: /home/cvs/apache-2.0/src/Apache.mak,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Apache.mak1999/12/08 22:32:50 1.2 +++ Apache.mak1999/12/20 19:52:46 1.3 @@ -49,8 +49,6 @@ CLEAN : [EMAIL PROTECTED] $(INTDIR)\apache.res [EMAIL PROTECTED] $(INTDIR)\main_win32.obj - [EMAIL PROTECTED] $(INTDIR)\registry.obj - [EMAIL PROTECTED] $(INTDIR)\service.obj [EMAIL PROTECTED] $(INTDIR)\vc50.idb [EMAIL PROTECTED] $(OUTDIR)\Apache.exe @@ -74,9 +72,7 @@ /out:$(OUTDIR)\Apache.exe LINK32_OBJS= \ $(INTDIR)\apache.res \ - $(INTDIR)\main_win32.obj \ - $(INTDIR)\registry.obj \ - $(INTDIR)\service.obj + $(INTDIR)\main_win32.obj $(OUTDIR)\Apache.exe : $(OUTDIR) $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @ @@ -104,8 +100,6 @@ CLEAN : [EMAIL PROTECTED] $(INTDIR)\apache.res [EMAIL PROTECTED]
