cvs commit: apache-1.3/src CHANGES
wsanchez99/11/16 18:25:08 Modified:.configure src CHANGES Log: Add --with-port option. Submitted by: Ian Kallen [EMAIL PROTECTED] Revision ChangesPath 1.105 +11 -2 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- configure 1999/10/05 14:46:02 1.104 +++ configure 1999/11/17 02:24:55 1.105 @@ -414,6 +414,7 @@ echo --enable-shared=NAME enable build of Module named 'NAME' as a DSO echo --disable-shared=NAME disable build of Module named 'NAME' as a DSO echo --with-perl=FILE path to the optional Perl interpreter +echo --with-port=PORT set the port number for httpd.conf echo --without-support disable the build and installation of support tools echo --without-confadjust disable the user/situation adjustments in config echo --without-execstripdisable the stripping of executables on installation @@ -902,6 +903,10 @@ --with-perl=*) PERL=$apc_optarg ;; +--with-port=*) +echo Using port $apc_optarg +port=$apc_optarg +;; --without-support) support=0 ;; @@ -1085,7 +1090,11 @@ ## conf_user=nobody conf_group=#-1 -conf_port=80 +if [ x$port != x ]; then +conf_port=$port +else +conf_port=80 +fi conf_serveradmin=[EMAIL PROTECTED] conf_servername=new.host.name if [ x$confadjust = x1 ]; then @@ -1103,7 +1112,7 @@ fi done fi -if [ x`$aux/getuid.sh` != x0 ]; then +if [ x`$aux/getuid.sh` != x0 -a x$port = x ]; then conf_port=8080 fi conf_serveradmin=`$aux/buildinfo.sh -n [EMAIL PROTECTED] 1.1444+2 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1443 retrieving revision 1.1444 diff -u -r1.1443 -r1.1444 --- CHANGES 1999/10/27 09:13:09 1.1443 +++ CHANGES 1999/11/17 02:24:59 1.1444 @@ -1,5 +1,7 @@ Changes with Apache 1.3.10 + *) Add --with-port option to APACI. [Ian Kallen [EMAIL PROTECTED]] + *) Fixed QUERY_STRING handling for `RewriteRule ... [P]' in per-directory context. [Martin Zeh [EMAIL PROTECTED]] PR#5073
cvs commit: apache-2.0/src/lib/apr/signal/win32 signal.c signal.def signal.dsp
rbb 99/11/17 07:01:16 Removed: src/lib/apr/signal/beos Makefile.in signal.c src/lib/apr/signal/os2 .cvsignore makefile.in signal.c src/lib/apr/signal/unix .cvsignore Makefile.in signal.c src/lib/apr/signal/win32 signal.c signal.def signal.dsp Log: I am removing signal'ing logic from APR. Apache doesn't need the features it is providing. It is a really dumbed down version of signal'ing, because it had to be portable. Maybe in the future, we will try to get signal'ing working across platform again.
cvs commit: apache-2.0/src/lib/apr acconfig.h configure.in
rbb 99/11/17 10:09:56
Modified:src/lib/apr acconfig.h configure.in
Log:
Some more cleanup. Stop trying to compile signals.
Revision ChangesPath
1.13 +5 -2 apache-2.0/src/lib/apr/acconfig.h
Index: acconfig.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/acconfig.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- acconfig.h1999/11/13 14:39:51 1.12
+++ acconfig.h1999/11/17 18:09:55 1.13
@@ -62,13 +62,16 @@
#ifdef HAVE_SIGACTION
typedef void Sigfunc(int);
+#define signal(s,f)ap_signal(s, f)
+Sigfunc *signal(int signo, Sigfunc * func);
#if defined(SIG_ING) !defined(SIG_ERR)
#define SIG_ERR ((Sigfunc *)-1)
#endif
+#endif
-#define signal(s,f)ap_signal(s, f)
-Sigfunc *signal(int signo, Sigfunc * func);
+#if !defined(HAVE_PTHREAD_SIGMASK) defined(_AIX)
+#define pthread_sigmask sigprocmask
#endif
#if !defined(HAVE_STRCASECMP) defined(HAVE_STRICMP)
1.27 +1 -1 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- configure.in 1999/11/13 14:39:52 1.26
+++ configure.in 1999/11/17 18:09:55 1.27
@@ -4,7 +4,7 @@
# These added to allow default directories to be used...
DEFAULT_OSDIR=unix
-MODULES=file_io network_io threadproc misc signal locks time mmap
+MODULES=file_io network_io threadproc misc locks time mmap
echo Configuring APR library
echo Platform: ${OS}
cvs commit: apache-1.3 configure
wsanchez99/11/17 11:12:54 Modified:.configure Log: Remove gratuitous print od --with-port setting. Revision ChangesPath 1.106 +0 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- configure 1999/11/17 02:24:55 1.105 +++ configure 1999/11/17 19:12:45 1.106 @@ -904,7 +904,6 @@ PERL=$apc_optarg ;; --with-port=*) -echo Using port $apc_optarg port=$apc_optarg ;; --without-support)
cvs commit: apache-2.0/src/os/unix Makefile.tmpl
rbb 99/11/17 13:39:48 Modified:.STATUS src Makefile.tmpl src/ap Makefile.tmpl src/include ap.h httpd.h src/lib/apr/mmap/unix Makefile.in src/main Makefile.tmpl http_vhost.c src/modules/experimental Makefile.tmpl src/modules/mpm/prefork Makefile.tmpl src/modules/standard Makefile.tmpl mod_auth.c src/os/unix Makefile.tmpl Removed: src/include apr.h Log: Cleaned up the APRFile uses in Apache. Also removed the apr.h header file because it is no longer used. Finally, I updated the dependancies to compile cleanly. Revision ChangesPath 1.16 +1 -3 apache-2.0/STATUS Index: STATUS === RCS file: /home/cvs/apache-2.0/STATUS,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- STATUS1999/11/16 18:30:18 1.15 +++ STATUS1999/11/17 21:39:16 1.16 @@ -1,5 +1,5 @@ Apache 2.0 STATUS: -Last modified at [$Date: 1999/11/16 18:30:18 $] +Last modified at [$Date: 1999/11/17 21:39:16 $] Release: @@ -104,8 +104,6 @@ Status: No one has come up with an efficient way to fix this behavior. Dean has suggested getting rid of regex containers completely. - -* Areas where APRFile is being used need to be cleaned-up * SIGSEGV on Linux seems to only kill a thread, not a whole process; we need to work around this, probably by bouncing the signal to 1.11 +2 -2 apache-2.0/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/src/Makefile.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile.tmpl 1999/10/30 05:59:19 1.10 +++ Makefile.tmpl 1999/11/17 21:39:17 1.11 @@ -127,12 +127,12 @@ lib/apr/include/apr_general.h lib/apr/include/apr_config.h \ lib/apr/include/apr_errno.h lib/apr/include/apr_lib.h \ lib/apr/include/apr_file_io.h include/buff.h include/ap_iol.h \ - include/ap.h include/apr.h include/util_uri.h + include/ap.h include/util_uri.h modules.o: modules.c include/httpd.h include/ap_config.h \ include/ap_mmn.h include/ap_config_auto.h os/unix/os.h \ os/unix/os-inline.c include/ap_ctype.h include/hsregex.h \ lib/apr/include/apr_general.h lib/apr/include/apr_config.h \ lib/apr/include/apr_errno.h lib/apr/include/apr_lib.h \ lib/apr/include/apr_file_io.h include/buff.h include/ap_iol.h \ - include/ap.h include/apr.h include/util_uri.h include/http_config.h \ + include/ap.h include/util_uri.h include/http_config.h \ include/ap_hooks.h 1.9 +5 -62 apache-2.0/src/ap/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/src/ap/Makefile.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.tmpl 1999/10/30 05:59:20 1.8 +++ Makefile.tmpl 1999/11/17 21:39:19 1.9 @@ -40,78 +40,21 @@ # DO NOT REMOVE ap_base64.o: ap_base64.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap.h ap_buf.o: ap_buf.c -ap_checkpass.o: ap_checkpass.c $(INCDIR)/ap_config.h \ - $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - $(INCDIR)/ap_md5.h $(INCDIR)/ap_sha1.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h -ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ - $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ - ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ - ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \ - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ - $(INCDIR)/util_uri.h -ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ - $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ - ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ - ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \ - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ - $(INCDIR)/util_uri.h -ap_fnmatch.o: ap_fnmatch.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ -
