cvs commit: apache-2.0/src/regex .cvsignore
rasmus 99/12/24 10:35:22 Modified:src .cvsignore src/ap .cvsignore src/include .cvsignore src/lib .cvsignore src/lib/apr/include .cvsignore src/main .cvsignore src/modules .cvsignore src/modules/mpm/dexter .cvsignore src/modules/mpm/mpmt_pthread .cvsignore src/modules/mpm/prefork .cvsignore src/modules/standard .cvsignore src/os/unix .cvsignore src/regex .cvsignore Log: Submitted by: Sascha Schumann [EMAIL PROTECTED] Reviewed by: Rasmus Lerdorf Revision ChangesPath 1.3 +10 -0 apache-2.0/src/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore1999/08/27 10:25:27 1.2 +++ .cvsignore1999/12/24 18:35:03 1.3 @@ -14,6 +14,16 @@ CoreR httpd apache +buildconf.stamp +aclocal.m4 +Makefile.in +configure +config.log +.libs +.deps +libtool +config.cache +config.status libhttpd.* Makefile Makefile.config 1.2 +5 -0 apache-2.0/src/ap/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/ap/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1999/08/24 05:50:29 1.1 +++ .cvsignore1999/12/24 18:35:05 1.2 @@ -1,2 +1,7 @@ +Makefile.in +.deps +*.lo +.libs +*.la Makefile Debug 1.2 +2 -1 apache-2.0/src/include/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/include/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1999/08/24 05:50:42 1.1 +++ .cvsignore1999/12/24 18:35:06 1.2 @@ -1 +1,2 @@ -ap_config_auto.h +stamp-h* +ap_config_auto.h* 1.3 +1 -0 apache-2.0/src/lib/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/lib/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore1999/09/27 07:29:08 1.2 +++ .cvsignore1999/12/24 18:35:07 1.3 @@ -1,2 +1,3 @@ +Makefile.in Makefile pth 1.3 +1 -0 apache-2.0/src/lib/apr/include/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/lib/apr/include/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore1999/10/10 12:19:58 1.2 +++ .cvsignore1999/12/24 18:35:09 1.3 @@ -1,2 +1,3 @@ +apr.h apr_config.h apr_config.h.in 1.2 +5 -0 apache-2.0/src/main/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/main/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1999/08/24 06:45:15 1.1 +++ .cvsignore1999/12/24 18:35:10 1.2 @@ -1,4 +1,9 @@ Makefile +Makefile.in +.deps +.libs +*.lo +*.la uri_delims.h gen_uri_delims test_char.h 1.2 +1 -0 apache-2.0/src/modules/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/modules/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1999/08/24 06:55:05 1.1 +++ .cvsignore1999/12/24 18:35:11 1.2 @@ -1 +1,2 @@ +Makefile.in Makefile 1.2 +3 -0 apache-2.0/src/modules/mpm/dexter/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1999/07/21 19:08:33 1.1 +++ .cvsignore1999/12/24 18:35:12 1.2 @@ -1 +1,4 @@ +Makefile.in +*.lo +*.la Makefile 1.2 +5 -0 apache-2.0/src/modules/mpm/mpmt_pthread/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1999/06/24 12:24:31 1.1 +++ .cvsignore1999/12/24 18:35:14 1.2
cvs commit: apache-2.0/src acinclude.m4
rasmus 99/12/24 11:04:40 Modified:src acinclude.m4 Log: Submitted by: Sascha Schumann [EMAIL PROTECTED] Reviewed by: Rasmus Lerdorf Revision ChangesPath 1.11 +1 -1 apache-2.0/src/acinclude.m4 Index: acinclude.m4 === RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- acinclude.m4 1999/12/24 18:40:26 1.10 +++ acinclude.m4 1999/12/24 19:04:40 1.11 @@ -87,7 +87,7 @@ 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` + unique=`echo $ac_n $2$ac_c | tr -cd a-zA-Z0-9` cmd=echo $ac_n \\$$1$unique$ac_c\ if test -n $unique test `eval $cmd` = ; then eval $1$unique=set
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/support logresolve.c
rasmus 99/12/06 20:54:49 Modified:src/modules/standard mod_info.c src/support logresolve.c Log: Revision ChangesPath 1.47 +1 -1 apache-1.3/src/modules/standard/mod_info.c Index: mod_info.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_info.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- mod_info.c1999/10/21 20:45:32 1.46 +++ mod_info.c1999/12/07 04:54:29 1.47 @@ -68,7 +68,7 @@ * GET /server-info?module_name - Returns configuration for a single module * GET /server-info?list - Returns quick list of included modules * - * Rasmus Lerdorf [EMAIL PROTECTED], May 1996 + * Rasmus Lerdorf [EMAIL PROTECTED], May 1996 * * 05.01.96 Initial Version * 1.17 +1 -1 apache-1.3/src/support/logresolve.c Index: logresolve.c === RCS file: /home/cvs/apache-1.3/src/support/logresolve.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- logresolve.c 1998/07/13 11:32:58 1.16 +++ logresolve.c 1999/12/07 04:54:45 1.17 @@ -1,7 +1,7 @@ /* * logresolve 1.1 * - * Tom Rathborne - [EMAIL PROTECTED] - http://www.uunet.ca/~tomr/ + * Tom Rathborne - [EMAIL PROTECTED] - http://www.aceldama.com/~tomr/ * UUNET Canada, April 16, 1995 * * Rewritten by David Robinson. ([EMAIL PROTECTED])
cvs commit: apache-1.3/htdocs/manual/mod mod_auth_digest.html
rasmus 99/11/22 12:56:55 Modified:htdocs/manual/mod mod_auth_digest.html Log: Fix a spelling mistake and we probably shouldn't put Internet Exploder in any official Apache documentation. Revision ChangesPath 1.2 +2 -2 apache-1.3/htdocs/manual/mod/mod_auth_digest.html Index: mod_auth_digest.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_auth_digest.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_auth_digest.html 1999/08/08 22:37:15 1.1 +++ mod_auth_digest.html 1999/11/22 20:56:53 1.2 @@ -369,7 +369,7 @@ scheme, host, port, etc) or relative URIs. PThis directive emshould/em always be specified and contain at least -the (set of) root URI(s) for this space. Omiting to do so will cause the +the (set of) root URI(s) for this space. Omitting to do so will cause the client to send the Authorization header for emevery request/em sent to this server. Apart from increasing the size of the request, it may also have a detrimental effect on performance if AuthDigestNcCheck is on. @@ -404,7 +404,7 @@ password system than Basic authentication, but only works with supporting browsers. As of this writing (July 1999), the only major browsers which support digest authentication are A -HREF=http://www.microsoft.com/windows/ie/;Internet Exploder 5.0/A and +HREF=http://www.microsoft.com/windows/ie/;Internet Explorer 5.0/A and A HREF=http://www.w3.org/Amaya/;Amaya/A. Therefore, we do not recommend using this feature on a large Internet site. However, for personal and intra-net use, where browser users can be controlled, it is
cvs commit: apache-1.3/src Configure
rasmus 99/09/09 13:14:38
Modified:.configure
src Configure
Log:
A failure here is pretty much never due to the compiler not being ANSI
compliant but nearly always because a required library is missing. Since
this message went in, my support load for PHP has gone way up. Fix it
to be sane and to propogate --verbose through to the TestCompile
correctly.
Revision ChangesPath
1.103 +5 -2 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- configure 1999/08/14 08:29:05 1.102
+++ configure 1999/09/09 20:14:29 1.103
@@ -1469,10 +1469,13 @@
## create all other Makefiles by running the proprietary
## $src/Configure script with our custom Configuration.apaci file
##
+if [ x$verbose = xyes ]; then
+vflag=-v;
+fi
if [ x$quiet = xyes ]; then
-(cd $src; ./Configure -file Configuration.apaci /dev/null);
+(cd $src; ./Configure ${vflag} -file Configuration.apaci /dev/null);
else
-(cd $src; ./Configure -file Configuration.apaci |\
+(cd $src; ./Configure ${vflag} -file Configuration.apaci |\
sed -e '/^Using config file:.*/d' \
-e s:Makefile in :Makefile in $src\\/: \
-e s:Makefile\$:Makefile in $src:)
1.372 +10 -6 apache-1.3/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -r1.371 -r1.372
--- Configure 1999/09/05 18:04:41 1.371
+++ Configure 1999/09/09 20:14:33 1.372
@@ -82,9 +82,14 @@
## Now handle any arguments, which, for now, is -file
-## to select an alternate Configuration file
+## to select an alternate Configuration file and -v
+## to turn on verbose mode
##
while [ x$1 != x ]; do
+ if [ x$1 = x-v ] ; then
+shift 1;
+vflag=-v;
+ fi
if [ x$1 = x-file ] ; then
shift 1; file=$1; shift 1
if [ ! -r $file ]; then
@@ -2138,14 +2143,13 @@
:
else
echo + doing sanity check on compiler and options
- if ./helpers/TestCompile sanity; then
+ if ./helpers/TestCompile $vflag sanity; then
:
else
echo ** A test compilation with your Makefile configuration
- echo ** failed. This is most likely because your C compiler
- echo ** is not ANSI. Apache requires an ANSI C Compiler, such
- echo ** as gcc. The above error message from your compiler
- echo ** will also provide a clue.
+ 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
cvs commit: apache-1.3/htdocs index.html.dk
rasmus 99/08/17 12:41:40 Added: htdocs index.html.dk Log: My written Danish is a little rusty. But this should be close. Revision ChangesPath 1.1 apache-1.3/htdocs/index.html.dk Index: index.html.dk === !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 3.2 Final//EN HTML HEAD TITLETest Side for Apache installationen/TITLE /HEAD !-- Background white, links blue (unvisited), navy (visited), red (active) -- BODY BGCOLOR=#FF TEXT=#00 LINK=#FF VLINK=#80 ALINK=#FF H1 ALIGN=CENTER Det virkede! Apache Web Serveren er installeret på denne maskine! /H1 P Hvis de kan se denne side, så har dem som ejer dette domain lige installeret A HREF=http://www.apache.org/;Apache Web Serveren/A. De må nu placere web sider i dette directory og fjerne denne side, eller peje serveren på et andet directory. /P HR BLOCKQUOTE Hvis de ser denne side isteden for en anden ekspekteret side, STRONGkontakt venligst administrateren for den server de prøver at kontakte./STRONG (Prøv at sende mail til SAMPlt;Webmaster@EMdomain/EMgt;/SAMP.) Apache Gruppen har ikke noget at gøre med denne site, så det vil ikke hjælpe at sende mail to Apache forfatterne omvirkende denne site. /BLOCKQUOTE HR P Apache A HREF=manual/index.html documentationen/A er inluderet med denne distribution. /P P Webmasteren af denne site må gerne bruge den følgende grafik på en Apache-drevet web server. Mange tak for at bruge Apache! /P DIV ALIGN=CENTER IMG SRC=apache_pb.gif ALT= /DIV /BODY /HTML
cvs commit: apache-1.3/src/support httpd.exp
rasmus 99/08/02 10:29:14 Modified:src/support httpd.exp Log: In order for DSO modules to be able to use the bundled XML functions on AIX they need to be listed here. Revision ChangesPath 1.24 +34 -0 apache-1.3/src/support/httpd.exp Index: httpd.exp === RCS file: /home/cvs/apache-1.3/src/support/httpd.exp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- httpd.exp 1999/07/29 17:54:14 1.23 +++ httpd.exp 1999/08/02 17:29:13 1.24 @@ -363,3 +363,37 @@ ap_vsnprintf core_module top_module +XML_DefaultCurrent +XML_ErrorString +XML_ExternalEntityParserCreate +XML_GetBase +XML_GetBuffer +XML_GetCurrentByteCount +XML_GetCurrentByteIndex +XML_GetCurrentColumnNumber +XML_GetCurrentLineNumber +XML_GetErrorCode +XML_GetSpecifiedAttributeCount +XML_Parse +XML_ParseBuffer +XML_ParserCreate +XML_ParserCreateNS +XML_ParserFree +XML_SetBase +XML_SetCdataSectionHandler +XML_SetCharacterDataHandler +XML_SetCommentHandler +XML_SetDefaultHandler +XML_SetDefaultHandlerExpand +XML_SetElementHandler +XML_SetEncoding +XML_SetExternalEntityRefHandler +XML_SetExternalEntityRefHandlerArg +XML_SetNamespaceDeclHandler +XML_SetNotStandaloneHandler +XML_SetNotationDeclHandler +XML_SetProcessingInstructionHandler +XML_SetUnknownEncodingHandler +XML_SetUnparsedEntityDeclHandler +XML_SetUserData +XML_UseParserAsHandlerArg
cvs commit: apache-1.3 Makefile.tmpl
rasmus 99/07/26 11:29:46
Modified:.Makefile.tmpl
Log:
Install expat header files in their own separate directory to mimic
expat package installs
Revision ChangesPath
1.87 +2 -1 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- Makefile.tmpl 1999/07/22 17:47:07 1.86
+++ Makefile.tmpl 1999/07/26 18:29:45 1.87
@@ -259,6 +259,7 @@
$(MKDIR) $(root)$(iconsdir)
$(MKDIR) $(root)$(cgidir)
$(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(includedir)/xml
$(MKDIR) $(root)$(runtimedir)
$(MKDIR) $(root)$(logfiledir)
$(MKDIR) $(root)$(proxycachedir)
@@ -427,7 +428,7 @@
install-include:
@echo === [include: Installing Apache C header files]
$(CP) $(TOP)/$(SRC)/include/*.h $(root)$(includedir)/
- $(CP) $(TOP)/$(SRC)/lib/expat-lite/*.h $(root)$(includedir)/
+ $(CP) $(TOP)/$(SRC)/lib/expat-lite/*.h $(root)$(includedir)/xml/
@osdir=`grep '^OSDIR=' $(TOP)/$(SRC)/Makefile.config | sed -e
's:^OSDIR=.*/os/:os/:'`; \
echo $(CP) $(TOP)/$(SRC)/$${osdir}/os.h
$(root)$(includedir)/; \
$(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(root)$(includedir)/; \
cvs commit: apache-1.3/src/support apxs.pl
rasmus 99/07/24 11:05:03
Modified:src Configure
src/support apxs.pl
Log:
This builds DSO's correctly on linux2 using gcc -shared instead of
ld -Bshareable. It also tweaks apxs to correctly pass -Wl args to
the linker in case the linker is gcc and not ld. Theoretically all
systems that use gcc should be using gcc -shared, but I have only tested
this on linux2 so far and therefore have only turned it on for this
platform. I will test other platforms as well, but could use some
help.
Revision ChangesPath
1.362 +2 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- Configure 1999/07/22 17:41:47 1.361
+++ Configure 1999/07/24 18:05:01 1.362
@@ -957,8 +957,9 @@
LDFLAGS_SHLIB_EXPORT=-rdynamic
;;
*-linux2)
+ LD_SHLIB=gcc
CFLAGS_SHLIB=-fpic
- LDFLAGS_SHLIB=-Bshareable
+ LDFLAGS_SHLIB=-shared
LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT=-rdynamic
SHLIB_SUFFIX_DEPTH=0
1.25 +5 -1 apache-1.3/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /home/cvs/apache-1.3/src/support/apxs.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- apxs.pl 1999/07/09 21:44:32 1.24
+++ apxs.pl 1999/07/24 18:05:02 1.25
@@ -382,7 +382,11 @@
$opt = '';
my ($opt_Wl, $opt_L, $opt_l);
foreach $opt_Wl (@opt_W) {
-$opt .= $1 if ($opt_Wl =~ m|^\s*l,(.*)$|);
+ if($CFG_LD_SHLIB ne gcc) {
+ $opt .= $1 if ($opt_Wl =~ m|^\s*l,(.*)$|);
+ } else {
+ $opt .= -W$opt_Wl;
+ }
}
foreach $opt_L (@opt_L) {
$opt .= -L$opt_L;
cvs commit: apache-1.3/src CHANGES Configure
rasmus 99/07/24 11:48:49 Modified:src CHANGES Configure Log: Move fbsd2,3,4 to gcc -shared as well. Revision ChangesPath 1.1399+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1398 retrieving revision 1.1399 diff -u -r1.1398 -r1.1399 --- CHANGES 1999/07/23 15:31:21 1.1398 +++ CHANGES 1999/07/24 18:48:20 1.1399 @@ -1,5 +1,9 @@ Changes with Apache 1.3.7 + *) Link DSO's with gcc -shared instead of ld -Bshareable at + least on Linux and FreeBSD for now. + [Rasmus Lerdorf] + *) Win32: More apache -k restart work. Restarts are now honored immediately and connections in the listen queue are -not- lost. This is made possible by the use of the WSADuplicateSocket() 1.363 +4 -2 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.362 retrieving revision 1.363 diff -u -r1.362 -r1.363 --- Configure 1999/07/24 18:05:01 1.362 +++ Configure 1999/07/24 18:48:21 1.363 @@ -965,15 +965,17 @@ SHLIB_SUFFIX_DEPTH=0 ;; *-freebsd2*) + LD_SHLIB=gcc CFLAGS_SHLIB=-fpic - LDFLAGS_SHLIB=-Bshareable + LDFLAGS_SHLIB=-shared LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB LDFLAGS_SHLIB_EXPORT= SHLIB_SUFFIX_DEPTH=2 ;; *-freebsd3*|*-freebsd4*) + LD_SHLIB=gcc CFLAGS_SHLIB=-fpic - LDFLAGS_SHLIB=-Bshareable + LDFLAGS_SHLIB=-shared LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB OBJFORMAT=`test -x /usr/bin/objformat /usr/bin/objformat || echo aout` if [ x$OBJFORMAT = xelf ]; then
cvs commit: apache-1.3/src Configure
rasmus 99/07/22 10:41:48 Modified:src Configure Log: Need to take a different approach here. I think the easiest thing to do is simply to require modules installed via apxs to provide their own .exp file for AIX. Revision ChangesPath 1.361 +0 -1 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.360 retrieving revision 1.361 diff -u -r1.360 -r1.361 --- Configure 1999/07/21 11:57:08 1.360 +++ Configure 1999/07/22 17:41:47 1.361 @@ -1190,7 +1190,6 @@ ;; esac LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB -bI:@libexecdir@/httpd.exp -lc - LDFLAGS_MOD_SHLIB=$LDFLAGS_MOD_SHLIB -bE:\`echo \$@|sed -e 's:\.so\$\$:.exp:'\` LDFLAGS_SHLIB=$LDFLAGS_SHLIB -bI:\$(SRCDIR)/support/httpd.exp LDFLAGS_SHLIB=$LDFLAGS_SHLIB -bE:\`echo \$@|sed -e 's:\.so\$\$:.exp:'\` LDFLAGS_SHLIB=$LDFLAGS_SHLIB -lc
cvs commit: apache-1.3 Makefile.tmpl
rasmus 99/07/22 10:47:08
Modified:.Makefile.tmpl
Log:
Not much point distributing expat-lite with Apache if we don't install
the header files so modules can actually build against it.
Revision ChangesPath
1.86 +1 -0 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- Makefile.tmpl 1999/06/16 22:19:14 1.85
+++ Makefile.tmpl 1999/07/22 17:47:07 1.86
@@ -427,6 +427,7 @@
install-include:
@echo === [include: Installing Apache C header files]
$(CP) $(TOP)/$(SRC)/include/*.h $(root)$(includedir)/
+ $(CP) $(TOP)/$(SRC)/lib/expat-lite/*.h $(root)$(includedir)/
@osdir=`grep '^OSDIR=' $(TOP)/$(SRC)/Makefile.config | sed -e
's:^OSDIR=.*/os/:os/:'`; \
echo $(CP) $(TOP)/$(SRC)/$${osdir}/os.h
$(root)$(includedir)/; \
$(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(root)$(includedir)/; \
cvs commit: apache-1.3/src Configure
rasmus 99/07/20 10:59:44 Modified:src Configure Log: This should make mod_dav build using apxs under AIX again. Revision ChangesPath 1.359 +1 -0 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.358 retrieving revision 1.359 diff -u -r1.358 -r1.359 --- Configure 1999/06/25 21:24:34 1.358 +++ Configure 1999/07/20 17:59:42 1.359 @@ -1191,6 +1191,7 @@ ;; esac LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB -bI:@libexecdir@/httpd.exp -lc + LDFLAGS_MOD_SHLIB=$LDFLAGS_MOD_SHLIB -bE:\`echo \$@|sed -e 's:\.so\$\$:.exp:'\` LDFLAGS_SHLIB=$LDFLAGS_SHLIB -bI:\$(SRCDIR)/support/httpd.exp LDFLAGS_SHLIB=$LDFLAGS_SHLIB -bE:\`echo \$@|sed -e 's:\.so\$\$:.exp:'\` LDFLAGS_SHLIB=$LDFLAGS_SHLIB -lc
cvs commit: apache-1.3/src/support Makefile.tmpl apxs.pl
rasmus 99/06/25 14:24:36
Modified:src Configure
src/support Makefile.tmpl apxs.pl
Log:
Fix APXS LDFLAGS_SHLIB stuff on AIX. Should not affect any other platform
Revision ChangesPath
1.358 +33 -0 apache-1.3/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- Configure 1999/06/25 04:32:48 1.357
+++ Configure 1999/06/25 21:24:34 1.358
@@ -603,6 +603,7 @@
LIBS=$LIBS -lsocket -lnsl -lgen
LD_SHLIB='cc'
LDFLAGS_SHLIB=-Zlink=so
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT=-Zlink=dynamic -Wl,-Bexport
CFLAGS_SHLIB='-Zpic'
;;
@@ -918,6 +919,7 @@
##
TLD_SHLIB=`egrep '^LD_SHLIB=' Makefile.config | tail -1 | awk -F= '{print
$2}'`
TLDFLAGS_SHLIB=`egrep '^LDFLAGS_SHLIB=' Makefile.config | tail -1 | awk -F=
'{print $2}'`
+TLDFLAGS_MOD_SHLIB=`egrep '^LDFLAGS_MOD_SHLIB=' Makefile.config | tail -1 |
awk -F= '{print $2}'`
TLDFLAGS_SHLIB_EXPORT=`egrep '^LDFLAGS_SHLIB_EXPORT=' Makefile.config | tail
-1 | awk -F= '{print $2}'`
TCFLAGS_SHLIB=`egrep '^CFLAGS_SHLIB=' Makefile.config | tail -1 | awk -F=
'{print $2}'`
@@ -952,23 +954,27 @@
*-linux1)
CFLAGS_SHLIB=-fpic
LDFLAGS_SHLIB=-Bshareable
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT=-rdynamic
;;
*-linux2)
CFLAGS_SHLIB=-fpic
LDFLAGS_SHLIB=-Bshareable
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT=-rdynamic
SHLIB_SUFFIX_DEPTH=0
;;
*-freebsd2*)
CFLAGS_SHLIB=-fpic
LDFLAGS_SHLIB=-Bshareable
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT=
SHLIB_SUFFIX_DEPTH=2
;;
*-freebsd3*|*-freebsd4*)
CFLAGS_SHLIB=-fpic
LDFLAGS_SHLIB=-Bshareable
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
OBJFORMAT=`test -x /usr/bin/objformat /usr/bin/objformat || echo
aout`
if [ x$OBJFORMAT = xelf ]; then
LDFLAGS_SHLIB_EXPORT=-Wl,-E
@@ -981,6 +987,7 @@
*-openbsd*)
CFLAGS_SHLIB=-fPIC
LDFLAGS_SHLIB=-Bforcearchive -Bshareable
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT=
SHLIB_SUFFIX_DEPTH=2
;;
@@ -993,21 +1000,25 @@
LDFLAGS_SHLIB=-shared
LDFLAGS_SHLIB_EXPORT=-Wl,-E
fi
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
SHLIB_SUFFIX_DEPTH=2
;;
*-bsdi3)
LD_SHLIB=shlicc2
LDFLAGS_SHLIB=-r
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
;;
*-bsdi)
CFLAGS_SHLIB=-fPIC
LDFLAGS_SHLIB=-shared
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT=-rdynamic
;;
*-next-openstep*)
LD_SHLIB='cc'
CFLAGS_SHLIB='-dynamic -fno-common'
LDFLAGS_SHLIB='-bundle -undefined warning'
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT=''
SHLIB_SUFFIX_DEPTH=0
;;
@@ -1015,6 +1026,7 @@
LD_SHLIB=cc
CFLAGS_SHLIB=
LDFLAGS_SHLIB='$(EXTRA_LDFLAGS) -bundle -undefined suppress'
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT=
SHLIB_SUFFIX_DEPTH=0
;;
@@ -1025,6 +1037,7 @@
CFLAGS_SHLIB=-KPIC
fi
LDFLAGS_SHLIB=-G
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT=
SHLIB_SUFFIX_DEPTH=1
;;
@@ -1034,6 +1047,7 @@
*/acc|acc ) CFLAGS_SHLIB=-pic ;;
esac
LDFLAGS_SHLIB=-assert pure-text
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT=
;;
*-sgi-irix32)
@@ -1052,6 +1066,7 @@
else
LDFLAGS_SHLIB=-shared
fi
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT=
;;
*-sgi-irix64)
@@ -1070,6 +1085,7 @@
else
LDFLAGS_SHLIB=-shared
fi
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT=
;;
*-sgi-irix)
@@ -1078,6 +1094,7 @@
*/cc|cc ) CFLAGS_SHLIB=-KPIC ;;
esac
LDFLAGS_SHLIB=-shared
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT=
;;
*-dec-osf*)
@@ -1086,6 +1103,7 @@
*/cc|cc ) CFLAGS_SHLIB= ;;
esac
LDFLAGS_SHLIB=-shared -expect_unresolved '*' -s
+ LDFLAGS_MOD_SHLIB
cvs commit: apache-1.3/src/support httpd.exp
rasmus 99/06/16 14:27:22 Modified:.Makefile.tmpl src/support httpd.exp Log: Fix broken AIX shared module build. The httpd.exp file was not up to date. Also install the httpd.exp file on a 'make install' to allow apxs builds against it on AIX. apxs is still completely broken on AIX. It generates bogus -bI and -bE stuff. Working on fix for that. Revision ChangesPath 1.84 +2 -0 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- Makefile.tmpl 1999/06/02 20:01:43 1.83 +++ Makefile.tmpl 1999/06/16 21:27:15 1.84 @@ -277,6 +277,8 @@ [EMAIL PROTECTED] [ .`grep '^[ ]*AddModule.*mod_so\.o' $(TOP)/$(SRC)/Configuration.apaci` != . ]; then \ echo $(INSTALL_CORE) $(TOP)/$(SRC)/$(TARGET) $(root)$(sbindir)/$(TARGET); \ $(INSTALL_CORE) $(TOP)/$(SRC)/$(TARGET) $(root)$(sbindir)/$(TARGET); \ + $(CP) $(TOP)/$(SRC)/support/httpd.exp $(root)$(libexecdir)/; \ + chmod 644 $(root)$(libexecdir)/httpd.exp; \ else \ echo $(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET) $(root)$(sbindir)/$(TARGET); \ $(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET) $(root)$(sbindir)/$(TARGET); \ 1.21 +1 -2 apache-1.3/src/support/httpd.exp Index: httpd.exp === RCS file: /home/cvs/apache-1.3/src/support/httpd.exp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- httpd.exp 1999/05/25 15:24:02 1.20 +++ httpd.exp 1999/06/16 21:27:20 1.21 @@ -100,6 +100,7 @@ ap_exists_config_define ap_exists_scoreboard_image ap_extended_status +ap_field_noparam ap_finalize_request_protocol ap_finalize_sub_req_protocol ap_find_command @@ -206,7 +207,6 @@ ap_open_logs ap_open_piped_log ap_os_escape_path -ap_os_is_filename_valid ap_os_is_path_absolute ap_overlay_tables ap_overlap_tables @@ -313,7 +313,6 @@ ap_show_modules ap_signal ap_single_module_configure -ap_single_module_init ap_size_list_item ap_slack ap_snprintf
cvs commit: apache-1.3/src CHANGES Configure
rasmus 99/06/16 15:19:22
Modified:.Makefile.tmpl
src CHANGES Configure
Log:
Only install httpd.exp if $SHLIB_EXPORT_FILES is set
Revision ChangesPath
1.85 +5 -2 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- Makefile.tmpl 1999/06/16 21:27:15 1.84
+++ Makefile.tmpl 1999/06/16 22:19:14 1.85
@@ -277,8 +277,11 @@
[EMAIL PROTECTED] [ .`grep '^[ ]*AddModule.*mod_so\.o'
$(TOP)/$(SRC)/Configuration.apaci` != . ]; then \
echo $(INSTALL_CORE) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET); \
$(INSTALL_CORE) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET); \
- $(CP) $(TOP)/$(SRC)/support/httpd.exp $(root)$(libexecdir)/; \
- chmod 644 $(root)$(libexecdir)/httpd.exp; \
+ SHLIB_EXPORT_FILES=`grep '^SHLIB_EXPORT_FILES='
$(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`; \
+ if [ .$${SHLIB_EXPORT_FILES} != . ]; then \
+ $(CP) $(TOP)/$(SRC)/support/httpd.exp
$(root)$(libexecdir)/; \
+ chmod 644 $(root)$(libexecdir)/httpd.exp; \
+ fi; \
else \
echo $(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET); \
$(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET); \
1.1379+2 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1378
retrieving revision 1.1379
diff -u -r1.1378 -r1.1379
--- CHANGES 1999/06/13 19:59:38 1.1378
+++ CHANGES 1999/06/16 22:19:16 1.1379
@@ -1,4 +1,6 @@
Changes with Apache 1.3.7
+ *) Fix apxs build issues on AIX
+ [Rasmus Lerdorf [EMAIL PROTECTED]]
*) New directive, DocumentRootCheck, added to determine if
we bother doing the stat of each DocumentRoot during
1.354 +1 -0 apache-1.3/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- Configure 1999/06/09 10:45:00 1.353
+++ Configure 1999/06/16 22:19:16 1.354
@@ -1811,6 +1811,7 @@
echo SUBTARGET=$SUBTARGET Makefile
echo SHLIB_SUFFIX_NAME=$SHLIB_SUFFIX_NAME Makefile
echo SHLIB_SUFFIX_LIST=$SHLIB_SUFFIX_LIST Makefile
+echo SHLIB_EXPORT_FILES=$SHLIB_EXPORT_FILES Makefile
echo Makefile
cvs commit: apache-1.3/src/modules/standard .cvsignore
rasmus 99/06/16 15:20:18 Modified:src/modules/standard .cvsignore Log: Tired of looking at these Revision ChangesPath 1.4 +1 -0 apache-1.3/src/modules/standard/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-1.3/src/modules/standard/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore1999/05/04 11:21:14 1.3 +++ .cvsignore1999/06/16 22:20:17 1.4 @@ -3,3 +3,4 @@ *.so *.dll *.def +*.exp
cvs commit: apache-site/contributors index.html
rasmus 99/05/07 10:42:17 Modified:contributors index.html Log: Revision ChangesPath 1.71 +6 -6 apache-site/contributors/index.html Index: index.html === RCS file: /home/cvs/apache-site/contributors/index.html,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- index.html1999/04/12 08:50:48 1.70 +++ index.html1999/05/07 17:42:16 1.71 @@ -359,16 +359,16 @@ STRONGComments:/STRONG What am I doing here?BR P -IMG SRC=../images/rasmus.jpg ALIGN=RIGHT ALT=[photo] WIDTH=153 HEIGHT=115 STRONGName:/STRONG A NAME=lerdorfRasmus Lerdorf/ABR -STRONGEmail:/STRONG A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR +STRONGEmail:/STRONG A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR STRONGURL:/STRONG A HREF=http://www.lerdorf.on.ca/;http://www.lerdorf.on.ca//ABR -STRONGCompany:/STRONG Lerdorf Consultants Inc.BR -STRONGOccupation:/STRONG IT ConsultantBR -STRONGLocation:/STRONG Toronto, Ontario, CanadaBR +STRONGCompany:/STRONG IBM CorporationBR +STRONGOccupation:/STRONG Senior Software EngineerBR +STRONGLocation:/STRONG Research Triangle Park, NCBR STRONGOS Expertise:/STRONG Solaris, LinuxBR STRONGContribution:/STRONG Wrote mod_info module included in the - distribution, as well as mod_php which is available separately.BR + distribution, as well as mod_php which is available separately from +a href=http://www.php.net;www.php.net/a.BR BR CLEAR=ALL P
cvs commit: apache-1.3 config.layout
rasmus 99/03/25 08:48:17 Modified:.config.layout Log: Add RedHat 5.x layout Revision ChangesPath 1.5 +17 -0 apache-1.3/config.layout Index: config.layout === RCS file: /home/cvs/apache-1.3/config.layout,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- config.layout 1999/03/08 21:06:57 1.4 +++ config.layout 1999/03/25 16:48:15 1.5 @@ -77,3 +77,20 @@ logfiledir:$prefix/Logs proxycachedir: $prefix/ProxyCache /Layout + +# RedHat 5.x layout +Layout RedHat +prefix:/usr +exec_prefix: $prefix +bindir:$prefix/bin +sbindir: $prefix/sbin +libexecdir:$prefix/lib/apache +mandir:$prefix/man +sysconfdir:/etc/httpd/conf +datadir: /home/httpd +includedir:$prefix/include/apache +localstatedir: /var +runtimedir:$localstatedir/run +logfiledir:$localstatedir/log/httpd +proxycachedir: $localstatedir/cache/httpd +/Layout
cvs commit: apache-devsite binaries.html
rasmus 99/03/24 08:14:48 Modified:.binaries.html Log: Revision ChangesPath 1.17 +1 -1 apache-devsite/binaries.html Index: binaries.html === RCS file: /export/home/cvs/apache-devsite/binaries.html,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- binaries.html 1999/03/21 22:37:15 1.16 +++ binaries.html 1999/03/24 16:14:47 1.17 @@ -134,7 +134,7 @@ H4Linux/H4 UL -LIarm-linux(Netwinder-ELF)Rasmus Lerdorf +LIarmv4l-whatever-linux2: Rasmus Lerdorf LIi386-whatever-linux(ELF):Aram Mirzadeh, Michael Douglass LIi386-whatever-linux(a.out): Sameer Parekh LIi586-whatever-linux2:Ralf S. Engelschall, Lars Eilebrecht
cvs commit: apache-1.3 STATUS
rasmus 99/03/24 08:19:15 Modified:.STATUS Log: Revision ChangesPath 1.672 +2 -2 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.671 retrieving revision 1.672 diff -u -r1.671 -r1.672 --- STATUS1999/03/24 00:27:13 1.671 +++ STATUS1999/03/24 16:19:13 1.672 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/03/24 00:27:13 $] + Last modified at [$Date: 1999/03/24 16:19:13 $] Release: @@ -25,7 +25,7 @@ -- alpha-dec-osf3.0 no Sameer Parekh alpha-dec-osf4.0 no Lars Eilebrecht - arm-linux(Netwinder-ELF) no Rasmus Lerdorf + armv4l-whatever-linux2yes Rasmus Lerdorf hppa1.1-hp-hpux no Rob Hartill i386-slackware-linux(a.out) no Sameer Parekh i386-sun-solaris2.5 no Sameer Parekh
cvs commit: apache-1.3/src/support apxs.pl
rasmus 99/03/13 19:53:04
Modified:src/support apxs.pl
Log:
Add a quick sanity check here. The binary could have been moved or the
permissions changed which would cause the following grep for mos_so to
fail which then resulted in a misleading error message being printed.
We might also want to check for people who do ./configure --prefix=.
and disallow it or replace it with the absolute path to the current dir
since a $CFG_SBINDIR for ./bin in apxs doesn't make any sense.
Revision ChangesPath
1.19 +4 -0 apache-1.3/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /home/cvs/apache-1.3/src/support/apxs.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- apxs.pl 1999/01/01 22:00:15 1.18
+++ apxs.pl 1999/03/14 03:53:03 1.19
@@ -91,6 +91,10 @@
##
## Initial shared object support check
##
+if (not -x `$CFG_SBINDIR/$CFG_TARGET`) {
+ print STDERR apxs:Error: $CFG_SBINDIR/$CFG_TARGET not found or not
executable\n;
+ exit(1);
+}
if (not grep(/mod_so/, `$CFG_SBINDIR/$CFG_TARGET -l`)) {
print STDERR apxs:Error: Sorry, no shared object support for Apache\n;
print STDERR apxs:Error: available under your platform. Make sure\n;
cvs commit: apache-devsite binaries.html
rasmus 99/03/06 12:42:39 Modified:.binaries.html Log: Revision ChangesPath 1.8 +1 -0 apache-devsite/binaries.html Index: binaries.html === RCS file: /export/home/cvs/apache-devsite/binaries.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- binaries.html 1999/02/28 18:19:56 1.7 +++ binaries.html 1999/03/06 20:42:39 1.8 @@ -52,6 +52,7 @@ UL LIalpha-dec-osf3.0:Sameer Parekh LIalpha-dec-osf4.0:Lars Eilebrecht +LIarm-linux(Netwinder-ELF)Rasmus Lerdorf LIhppa1.1-hp-hpux: Rob Hartill LIi386-slackware-linux(a.out): Sameer Parekh LIi386-sun-solaris2.5: Sameer Parekh
cvs commit: apache-1.3/conf httpd.conf-dist
rasmus 99/02/06 22:25:24 Modified:conf httpd.conf-dist Log: Suggest .php3 extension to match PHP docs Revision ChangesPath 1.37 +3 -3 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- httpd.conf-dist 1998/12/12 17:04:29 1.36 +++ httpd.conf-dist 1999/02/07 06:25:23 1.37 @@ -642,10 +642,10 @@ # AddType allows you to tweak mime.types without actually editing it, or to # make certain files to be certain types. # -# For example, the PHP3 module (not part of the Apache distribution) -# will typically use: +# For example, the PHP3 module (not part of the Apache distribution - see +# http://www.php.net) will typically use: # -#AddType application/x-httpd-php3 .phtml +#AddType application/x-httpd-php3 .php3 #AddType application/x-httpd-php3-source .phps #
cvs commit: apache-1.3 README.configure
rasmus 99/02/07 10:03:54 Modified:.README.configure Log: Update Apache/APXS/PHP documentation Revision ChangesPath 1.17 +19 -0 apache-1.3/README.configure Index: README.configure === RCS file: /home/cvs/apache-1.3/README.configure,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- README.configure 1999/01/14 00:41:34 1.16 +++ README.configure 1999/02/07 18:03:53 1.17 @@ -284,3 +284,22 @@ $ make $ make install + 3. You can also use APXS: + +$ cd apache-1.3.X +$ ./configure --prefix=/path/to/apache --enable-shared=max +$ make +$ make install + +$ cd php-3.0.X + $ ./configure --with-apxs=/path/to/apache/bin/apxs \ + --with-config-file-path=/path/to/apache +$ make +$ make install + + At this point don't forget to edit your conf/httpd.conf file and + make sure the file contains the line: + +AddType application/x-httpd-php3 .php3 + + Then restart your server.
cvs commit: apache-1.3 README.configure
rasmus 99/02/07 10:05:34 Modified:.README.configure Log: . Revision ChangesPath 1.18 +1 -1 apache-1.3/README.configure Index: README.configure === RCS file: /home/cvs/apache-1.3/README.configure,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- README.configure 1999/02/07 18:03:53 1.17 +++ README.configure 1999/02/07 18:05:33 1.18 @@ -292,7 +292,7 @@ $ make install $ cd php-3.0.X - $ ./configure --with-apxs=/path/to/apache/bin/apxs \ +$ ./configure --with-apxs=/path/to/apache/bin/apxs \ --with-config-file-path=/path/to/apache $ make $ make install
cvs commit: apache-1.3/src/ap ap_md5c.c
rasmus 99/02/05 05:11:12 Modified:src/ap ap_md5c.c Log: Should include crypt.h here if available since we are using crypt() Revision ChangesPath 1.21 +3 -0 apache-1.3/src/ap/ap_md5c.c Index: ap_md5c.c === RCS file: /export/home/cvs/apache-1.3/src/ap/ap_md5c.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ap_md5c.c 1999/02/03 23:28:58 1.20 +++ ap_md5c.c 1999/02/05 13:11:11 1.21 @@ -107,6 +107,9 @@ #ifdef CHARSET_EBCDIC #include ebcdic.h #endif /*CHARSET_EBCDIC*/ +#if HAVE_CRYPT_H +#include crypt.h +#endif /* Constants for MD5Transform routine. */
cvs commit: apache-1.3/src/main http_core.c
rasmus 99/02/05 05:17:33
Modified:src/main http_core.c
Log:
This Windows stuff was breaking the Unix compile
Revision ChangesPath
1.246 +4 -0 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- http_core.c 1999/02/05 00:37:49 1.245
+++ http_core.c 1999/02/05 13:17:33 1.246
@@ -2629,6 +2629,7 @@
return NULL;
}
+#ifdef WIN32
static const char *set_interpreter_source(cmd_parms *cmd, core_dir_config *d,
char *arg)
{
@@ -2641,6 +2642,7 @@
}
return NULL;
}
+#endif
/* Note --- ErrorDocument will now work from .htaccess files.
* The AllowOverride of Fileinfo allows webmasters to turn it off
@@ -2858,8 +2860,10 @@
(void*)XtOffsetOf(core_dir_config, limit_req_body),
OR_ALL, TAKE1,
Limit (in bytes) on maximum size of request message body },
+#ifdef WIN32
{ Win32InterpreterSource, set_interpreter_source, NULL, OR_FILEINFO, TAKE1,
Where to find interpreter to run Win32 scripts (Registry or script
shebang line) },
+#endif
{ NULL },
};
cvs commit: apache-site/contributors index.html
rasmus 99/01/19 21:22:41 Modified:contributors index.html Log: Yikes! Didn't realize that my big ugly face was that prominent on the contributors page. Make it the same size as Ken's. Revision ChangesPath 1.62 +1 -1 apache-site/contributors/index.html Index: index.html === RCS file: /home/cvs/apache-site/contributors/index.html,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- index.html1999/01/15 15:55:51 1.61 +++ index.html1999/01/20 05:22:40 1.62 @@ -353,7 +353,7 @@ STRONGComments:/STRONG What am I doing here?BR P -IMG SRC=../images/rasmus.jpg ALIGN=RIGHT ALT=[photo] WIDTH=320 HEIGHT=240 +IMG SRC=../images/rasmus.jpg ALIGN=RIGHT ALT=[photo] WIDTH=153 HEIGHT=115 STRONGName:/STRONG A NAME=lerdorfRasmus Lerdorf/ABR STRONGEmail:/STRONG A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR STRONGURL:/STRONG A HREF=http://www.lerdorf.on.ca/;http://www.lerdorf.on.ca//ABR
cvs commit: apache-1.3/src/os/unix os.c os.h
rasmus 98/07/10 11:29:52 Modified:src CHANGES src/os/unix os.c os.h Log: Set the RTLD_GLOBAL dlopen mode parameter to allow dynamically loaded modules to load their own modules dynamically. This improves mod_perl and mod_php3 when these modules are loaded dynamically into Apache. Revision ChangesPath 1.958 +5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.957 retrieving revision 1.958 diff -u -r1.957 -r1.958 --- CHANGES 1998/07/10 12:58:54 1.957 +++ CHANGES 1998/07/10 18:29:45 1.958 @@ -270,6 +270,11 @@ log the current cache usage percentage at LogLevel debug [Martin Kraemer, based on discussion between Dean Gaudet Dirk vanGulik] + *) Set the RTLD_GLOBAL dlopen mode parameter to allow dynamically loaded + modules to load their own modules dynamically. This improves mod_perl + and mod_php3 when these modules are loaded dynamically into Apache. + [Rasmus Lerdorf] + Changes with Apache 1.3.0 *) Using a type map file as a custom error document was not possible. 1.12 +2 -2 apache-1.3/src/os/unix/os.c Index: os.c === RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- os.c 1998/04/28 08:42:11 1.11 +++ os.c 1998/07/10 18:29:50 1.12 @@ -35,9 +35,9 @@ #else #if defined(OSF1) ||\ (defined(__FreeBSD_version) (__FreeBSD_version = 22)) -return dlopen((char *)path, RTLD_NOW); +return dlopen((char *)path, RTLD_NOW | RTLD_GLOBAL); #else -return dlopen(path, RTLD_NOW); +return dlopen(path, RTLD_NOW | RTLD_GLOBAL); #endif #endif } 1.26 +4 -0 apache-1.3/src/os/unix/os.h Index: os.h === RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- os.h 1998/07/06 11:54:30 1.25 +++ os.h 1998/07/10 18:29:51 1.26 @@ -120,6 +120,10 @@ #define RTLD_NOW 1 #endif +#ifndef RTLD_GLOBAL +#define RTLD_GLOBAL 0 +#endif + #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) #define DLSYM_NEEDS_UNDERSCORE #endif
Re: cvs commit: apache-1.3 Announcement
+ awaited 1.3.0 version of the Apache HTTP server. A dozen months, + hundreds of patches and over 5 score code contributors helped make the I gather you are kidding? -Rasmus
cvs commit: apache-1.3 README.configure
rasmus 98/03/29 09:17:12 Modified:.README.configure Log: Update PHP commment in README.configure Revision ChangesPath 1.2 +6 -7 apache-1.3/README.configure Index: README.configure === RCS file: /export/home/cvs/apache-1.3/README.configure,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README.configure 1998/03/29 12:27:27 1.1 +++ README.configure 1998/03/29 17:17:11 1.2 @@ -231,19 +231,18 @@ Apache and PHP -- - The PHP language (http://www.php.net/) from Rasmus Lerdorf [EMAIL PROTECTED] - is a very impressive scripting language which can be directly integrated - into the Apache HTTP server for powerful HTML scripting. The distribution - php-3.0RC.tar.gz can be found on http://www.php.net/download-php.php3. Here - is how you can install Apache with PHP: + The PHP language (http://www.php.net/) is an HTML-embedded scripting language + which can be directly integrated into the Apache HTTP server for powerful HTML + scripting. The distribution php-3.0RC.tar.gz can be found at + http://www.php.net/download-php.php3. Here is how you can install Apache with PHP: -$ cd php-3.0RC +$ cd php-3.0 $ ./configure --with-apache=../apache-1.3 $ make $ make install $ cd ../apache-1.3 $ ./configure --prefix=/path/to/apache \ - --activate-module=src/modules/extra/mod_php3.c + --activate-module=src/modules/php3/mod_php3.c $ make $ make install
cvs commit: apache-1.3 README.configure
rasmus 98/03/29 09:18:57 Modified:.README.configure Log: Make it more generic Revision ChangesPath 1.3 +3 -3 apache-1.3/README.configure Index: README.configure === RCS file: /export/home/cvs/apache-1.3/README.configure,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- README.configure 1998/03/29 17:17:11 1.2 +++ README.configure 1998/03/29 17:18:56 1.3 @@ -231,10 +231,10 @@ Apache and PHP -- - The PHP language (http://www.php.net/) is an HTML-embedded scripting language + The PHP language (http://www.php.net) is an HTML-embedded scripting language which can be directly integrated into the Apache HTTP server for powerful HTML - scripting. The distribution php-3.0RC.tar.gz can be found at - http://www.php.net/download-php.php3. Here is how you can install Apache with PHP: + scripting. The package can be found at http://www.php.net/download-php.php3. + Here is how you can install Apache with PHP: $ cd php-3.0 $ ./configure --with-apache=../apache-1.3
cvs commit: apache-1.3/src Configure
rasmus 98/03/11 15:58:04
Modified:src Configure
Log:
When writing the SERVER_SUBVERSION -D flag to ap_config.h it came out
looking like:
#define SERVER_SUBVERSION \whatever\
When including this in a file you end up with an unterminated string
constant. We want it to look like this instead:
#define SERVER_SUBVERSION whatever
The backslashes are only needed in the actual -D argument.
This little patch makes sure that any \ from a -D is replaced with just
when ap_config.h is generated.
Revision ChangesPath
1.204 +1 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- Configure 1998/03/11 21:06:05 1.203
+++ Configure 1998/03/11 23:58:03 1.204
@@ -1165,7 +1165,7 @@
# can be used by external modules needing to include Apache
# header files.
for cflag in $CFLAGS; do
- echo $cflag $tmpconfig ;
+ echo $cflag | sed 's/\\\/\/g' $tmpconfig ;
done
awk include/ap_config.h $tmpconfig '
BEGIN {
cvs commit: apache-1.3/src/os/unix os.h
rasmus 98/03/05 07:50:47 Modified:src/os/unix os.h Log: Fix a typo (and a test to see if I can commit without getting slammed ;) Reviewed by: Ralf Revision ChangesPath 1.9 +1 -1 apache-1.3/src/os/unix/os.h Index: os.h === RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- os.h 1998/03/04 02:28:26 1.8 +++ os.h 1998/03/05 15:50:46 1.9 @@ -87,7 +87,7 @@ * Abstraction layer for dynamic loading of modules (mod_so.c) */ -#if defined(LINUX) || defined(__FreeBSD__) || defined(SOLARIS) || \ +#if defined(LINUX) || defined(__FreeBSD__) || defined(SOLARIS2) || \ defined(__bsdi__) || defined(IRIX) # define HAS_DLFCN #endif
cvs commit: apache-1.3/src/os/unix os.h
rasmus 98/03/05 10:58:36
Modified:src CHANGES Configure
src/include conf.h http_config.h
src/os/unix os.h
Log:
These patches make Configure create src/include/ap_config.h and they also
clean up the various autoconf symbol clashes I was getting. I bumped the
MODULE_MAGIC_NUMBER so an external module will now that it can expect to
find ap_config.h after today. The patches have been tested on
Solaris 2.5.1 and a generic Linux 2.1.79 box both with and without the
external module compiled in. Nothing here should affect anybody, but
it allows people to correctly build external modules outside of the
Apache build environment.
Reviewed by: Concept ok'ed, at least in part, by Jim and Dean
Revision ChangesPath
1.688 +8 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.687
retrieving revision 1.688
diff -u -r1.687 -r1.688
--- CHANGES 1998/03/04 14:28:25 1.687
+++ CHANGES 1998/03/05 18:58:30 1.688
@@ -1,5 +1,13 @@
Changes with Apache 1.3b6
+ *) The Configure script now generates src/include/ap_config.h which
+ contains the set of defines used when Apache is compiled on a platform.
+ This file can then be included by external modules before including
+ any Apache header files in case they are being built separately from
+ Apache. Along with this change, a couple of minor changes were
+ made to make Apache's #defines coexist peacefully with any autoconf
+ defines and external module might have. [Rasmus Lerdorf]
+
*) Fix mod_rewrite for the ugly API case where VirtualHost sections exist
but without any RewriteX directives. Here mod_rewrite is given no
chance by the API to initialise its per-server configuration and thus
1.194 +20 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- Configure 1998/03/03 01:22:06 1.193
+++ Configure 1998/03/05 18:58:31 1.194
@@ -1,6 +1,6 @@
#!/bin/sh
exitcode=0
-trap 'rm -f $tmpfile $tmpfile2 $tmpfile3 $awkfile; exit $exitcode' 0 1 2 3 15
+trap 'rm -f $tmpfile $tmpfile2 $tmpfile3 $tmpconfig $awkfile; exit
$exitcode' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
# Don't like it? Inspired to do something better? Go for it.
@@ -26,6 +26,7 @@
tmpfile2=$tmpfile.2
tmpfile3=$tmpfile.3
awkfile=$tmpfile.4
+tmpconfig=$tmpfile.5
SUBDIRS='$(OSDIR) main ap modules'
@@ -838,6 +839,24 @@
SEEN[pp[2]] = 1
}
}'`
+
+#
+# At this point we can pick out all -D's from CFLAGS and create ap_config.h
+# to be used by external modules needing to include Apache header files.
+#
+
+for cflag in $CFLAGS; do
+ echo $cflag $tmpconfig ;
+done
+awk include/ap_config.h $tmpconfig '
+ BEGIN {
+ printf /* Automatically generated file - do not edit */\n\n
+ }
+ /^-D.*/ {
+ split(substr($1,3,length($1)),parts,=)
+ printf (#define %s %s\n,parts[1],parts[2])
+ }
+'
#
# Now autoconfigure each of the modules specified by AddModule.
1.188 +96 -101 apache-1.3/src/include/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- conf.h1998/03/05 10:45:23 1.187
+++ conf.h1998/03/05 18:58:33 1.188
@@ -80,7 +80,7 @@
/* Define one of these according to your system. */
#if defined(MINT)
typedef int rlim_t;
-#define HAVE_SYS_RESOURCE_H
+#define HAVE_SYS_RESOURCE_H 1
#define JMP_BUF sigjmp_buf
#define NO_LONG_DOUBLE
#define USE_FLOCK_SERIALIZED_ACCEPT
@@ -95,7 +95,7 @@
#define NO_SETSID
#define NO_KILLPG
#define NO_WRITEV
-#define HAVE_SHMGET
+#define HAVE_SHMGET 1
#define USE_SHMGET_SCOREBOARD
#define SHM_R 0400 /* Read permission */
#define SHM_W 0200 /* Write permission */
@@ -114,13 +114,13 @@
#define PF_INET AF_INET
#elif defined(SUNOS4)
-#define HAVE_GMTOFF
-#define HAVE_SYS_RESOURCE_H
+#define HAVE_GMTOFF 1
+#define HAVE_SYS_RESOURCE_H 1
#undef NO_KILLPG
#undef NO_SETSID
char *crypt(const char *pw, const char *salt);
char *mktemp(char *template);
-#define HAVE_MMAP
+#define HAVE_MMAP 1
#define USE_MMAP_SCOREBOARD
#define USE_MMAP_FILES
#include sys/time.h
@@ -130,25 +130,26 @@
#define
cvs commit: apache-1.3/src/os/unix os.h
rasmus 98/03/05 11:40:37 Modified:src/os/unix os.h Log: Due to the order of inclusion, it isn't feasible to move this check to conf.h. So, reverse this part of my last patch. The whole DLFCN thing could be moved to conf.h, but I will leave that for another battle. Revision ChangesPath 1.11 +9 -0 apache-1.3/src/os/unix/os.h Index: os.h === RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- os.h 1998/03/05 18:58:36 1.10 +++ os.h 1998/03/05 19:40:36 1.11 @@ -83,6 +83,15 @@ extern int os_is_path_absolute(const char *f); #endif +/* + * Abstraction layer for dynamic loading of modules (mod_so.c) + */ + +#if defined(LINUX) || defined(__FreeBSD__) || defined(SOLARIS2) || \ +defined(__bsdi__) || defined(IRIX) +# define HAVE_DLFCN_H 1 +#endif + #if defined(__FreeBSD__) # define NEED_UNDERSCORE_SYM #endif
cvs commit: apache-site related_projects.html
rasmus 98/01/29 22:04:30 Modified:.related_projects.html Log: Update PHP project info Revision ChangesPath 1.15 +9 -10 apache-site/related_projects.html Index: related_projects.html === RCS file: /export/home/cvs/apache-site/related_projects.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- related_projects.html 1997/12/19 21:49:49 1.14 +++ related_projects.html 1998/01/30 06:04:29 1.15 @@ -24,7 +24,7 @@ UL LI A HREF=#apachesslApache-SSL/A LI A HREF=#moduleregApache Module Registry/A -LI A HREF=#phpfiPHP/FI Project/A +LI A HREF=#phpPHP Project/A LI A HREF=#modperlApache/Perl Integration Project/A LI A HREF=#os2Apache for OS/2/A LI A HREF=#amigaApache for Amiga/A @@ -81,18 +81,17 @@ /BLOCKQUOTE HR -A NAME=phpfi -H3PHP/FI Project/H3 +A NAME=php +H3PHP Project/H3 -PHP/FI implements a simple HTML-embedded scripting language. It includes -a built-in page logging/counting mechanism with the ability to log hits to -an SQL database. It also supports a number of RDBMS packages including -Adabas-D, mSQL 1, mSQL 2, MySQL, FilePro, Solid, Postgres95, PostgreSQL, Oracle, and -Sybase. +PHP implements an easy-to-learn HTML-embedded scripting language. +It supports a number of RDBMS packages including Adabas-D, mSQL 1, mSQL 2, MySQL, +FilePro, Solid, Postgres95, PostgreSQL, Oracle, Sybase as well as many others via +standard ODBC. BLOCKQUOTE -For more information on PHP/FI see the -A HREF=http://php.iquest.net/;PHP/FI Homepage/A. +For more information on PHP see the +A HREF=http://www.php.net/;PHP Homepage/A. /BLOCKQUOTE HR
cvs commit: apache-site/contributors index.html
rasmus 98/01/26 23:42:37 Modified:contributors index.html Log: Update my own info Revision ChangesPath 1.26 +3 -3 apache-site/contributors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/contributors/index.html,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- index.html1998/01/26 23:51:49 1.25 +++ index.html1998/01/27 07:42:36 1.26 @@ -108,7 +108,7 @@ TDCreator of all those nifty icons TR VALIGN=TOP TDBA HREF=#lerdorfRasmus Lerdorf/A/B - TDmod_info, mod_php + TDmod_info, mod_php, mod_php3 TR VALIGN=TOP TDBAmbarish Malpani/B TDBeginning of the NT port @@ -311,8 +311,8 @@ P BName:/B A NAME=lerdorfRasmus Lerdorf/ABR -BEmail:/B A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR -BURL:/B A HREF=http://www.vex.net/~rasmus/;http://www.vex.net/~rasmus//ABR +BEmail:/B A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR +BURL:/B A HREF=http://www.lerdorf.on.ca/;http://www.lerdorf.on.ca//ABR BCompany:/B Lerdorf Consultants Inc.BR BOccupation:/B IT ConsultantBR BLocation:/B Toronto, Ontario, CanadaBR
