cvs commit: apache-1.3 STATUS
wsanchez00/02/25 11:06:23 Modified:.STATUS Log: Reset Binaries -> 1.3.12. Revision ChangesPath 1.811 +6 -6 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.810 retrieving revision 1.811 diff -u -r1.810 -r1.811 --- STATUS2000/02/20 15:04:59 1.810 +++ STATUS2000/02/25 19:06:23 1.811 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/02/20 15:04:59 $] + Last modified at [$Date: 2000/02/25 19:06:23 $] Release: @@ -523,7 +523,7 @@ cause instability - see PR#1729. -Binaries (1.3.11): +Binaries (1.3.12): Platform Avail. Volunteer -- @@ -538,7 +538,7 @@ i386-sun-solaris2.7 no Cliff Skolnick i386-unixware-svr4no Sameer Parekh, Randy Terbush i386-unknown-freebsd2.1 no Andrew Wilson, Brian Tao - i386-unknown-freebsd2.2.8 yes Jim Jagielski + i386-unknown-freebsd2.2.8 no Jim Jagielski i386-whatever-freebsd3.0 no Ken Coar i386-whatever-freebsd3.0 no Dirk-Willem van Gulik i686-pc-freebsd3.1no Ralf S. Engelschall @@ -549,7 +549,7 @@ i386-unknown-netBSD-1.3.2 no Lars Eilebrecht, Randy Terbush i386-unknown-sco3 no Ben Laurie i386-unknown-sco5 no Ben Laurie - i386-siemens-sinix5.4 yes Martin Kraemer + i386-siemens-sinix5.4 no Martin Kraemer i386-dg-dgux5.4R2.01 no Randy Terbush x86-qnx-4.x no Randy Terbush x86-bsdos-3.x no Randy Terbush @@ -563,12 +563,12 @@ mips-sgi-irix5.3 no Mark Imbrianco, Randy Terbush mips-sgi-irix6.2 no Lars Eilebrecht, Randy Terbush mips-sgi-irix6.4 no Lars Eilebrecht - mips-siemens-reliantunix5.4 yes Martin Kraemer + mips-siemens-reliantunix5.4 no Martin Kraemer OS/2 yes Brian Havard powerpc-apple-rhapsody5.6 yes Wilfredo Sanchez rs6000-ibm-aix3.2.5 no Sameer Parekh rs6000-ibm-aix4.1 no Lars Eilebrecht - rs6000-ibm-aix4.2 no Bill Stoddard + rs6000-ibm-aix4.2 yes Bill Stoddard rs6000-ibm-aix4.3.x no Bill Stoddard, Randy Terbush sparc-sun-solaris2.5 no Lars Eilebrecht, Randy Terbush sparc-sun-solaris2.6 no Lars Eilebrecht
cvs commit: apache-site/dist .key.gif .htaccess
wsanchez00/02/24 18:46:49 Modified:dist .htaccess Added: dist .key.gif Log: Move descriptions for old binaries into old/.htaccess. Spiff up iconage for key files and CHANGES files. Revision ChangesPath 1.25 +4 -18 apache-site/dist/.htaccess Index: .htaccess === RCS file: /home/cvs/apache-site/dist/.htaccess,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .htaccess 2000/01/22 21:09:32 1.24 +++ .htaccess 2000/02/25 02:46:49 1.25 @@ -1,30 +1,16 @@ IndexOptions FancyIndexing ScanHTMLTitles +AddIcon /dist/.key.gif .md5 .asc KEYS +AddIcon /icons/text.gif .README CHANGES CHANGES_1.2 CHANGES_1.3 +AddDescription "MD5 hash" *.md5 AddDescription "PGP signature" .asc -AddDescription "1.2.6 compressed source" apache_1.2.6.tar.Z -AddDescription "1.2.6 gzipped source" apache_1.2.6.tar.gz -AddDescription "1.3.1 compressed source" apache_1.3.1.tar.Z -AddDescription "1.3.1 gzipped source" apache_1.3.1.tar.gz -AddDescription "1.3.1 Win32 binary" apache_1_3_1.exe -AddDescription "1.3.2 compressed source" apache_1.3.2.tar.Z -AddDescription "1.3.2 gzipped source" apache_1.3.2.tar.gz -AddDescription "1.3.2 Win32 binary" apache_1_3_2_win32.exe -AddDescription "1.3.3 compressed source" apache_1.3.3.tar.Z -AddDescription "1.3.3 gzipped source" apache_1.3.3.tar.gz -AddDescription "1.3.3 Win32 binary" apache_1_3_3.exe -AddDescription "1.3.4 compressed source" apache_1.3.4.tar.Z -AddDescription "1.3.4 gzipped source" apache_1.3.4.tar.gz -AddDescription "1.3.4 Win32 binary" apache_1_3_4_win32.exe -AddDescription "1.3.6 compressed source" apache_1.3.6.tar.Z -AddDescription "1.3.6 gzipped source" apache_1.3.6.tar.gz -AddDescription "1.3.6 Win32 binary" apache_1_3_6_win32.exe AddDescription "1.3.9 compressed source" apache_1.3.9.tar.Z AddDescription "1.3.9 gzipped source" apache_1.3.9.tar.gz AddDescription "1.3.9 Win32 binary" apache_1_3_9_win32.exe AddDescription "1.3.11 compressed source" apache_1.3.11.tar.Z AddDescription "1.3.11 gzipped source" apache_1.3.11.tar.gz AddDescription "1.3.11 Win32 binary" apache_1_3_11_win32.exe -AddDescription "List of changes in 1.3" CHANGES_1.3 AddDescription "List of changes in 1.2" CHANGES_1.2 +AddDescription "List of changes in 1.3" CHANGES_1.3 AddDescription "Developer PGP keys" KEYS AddDescription "Apache 1.3.11 Released" Announcement.txt AddDescription "Binary distributions" binaries 1.1 apache-site/dist/.key.gif <>
cvs commit: apache-devsite binaries.html
wsanchez00/02/24 18:00:58 Modified:.binaries.html Log: I'll take care of Darwin binaries. Revision ChangesPath 1.22 +7 -2 apache-devsite/binaries.html Index: binaries.html === RCS file: /home/cvs/apache-devsite/binaries.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- binaries.html 1999/08/20 21:25:30 1.21 +++ binaries.html 2000/02/25 02:00:58 1.22 @@ -107,11 +107,16 @@ rs6000-ibm-aix4.3.2:Bill Stoddard -AUX +A/UX m68k-apple-aux3.1.1: Jim Jagielski +Darwin / Mac OS X + +powerpc-apple-rhapsody5.6: Wilfredo Sánchez + + DGUX m88k-dg-dgux5.4R2.01:Sameer parekh @@ -157,7 +162,7 @@ i386-whatever-netBSD:Lars Eilebrecht -NEXT +NeXT m88k-next-next: Rob Hartill
cvs commit: apache-1.3/conf httpd.conf-dist
wsanchez00/01/26 15:05:06 Modified:conf httpd.conf-dist Log: Indent newly contained directives, as well as mod_proxy directives which were already in an IfModule conditional. Revision ChangesPath 1.53 +264 -264 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.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- httpd.conf-dist 2000/01/26 20:10:32 1.52 +++ httpd.conf-dist 2000/01/26 23:05:04 1.53 @@ -329,7 +329,7 @@ # directory if a ~user request is received. # -UserDir public_html +UserDir public_html # @@ -354,7 +354,7 @@ # directory index. Separate multiple entries with spaces. # -DirectoryIndex index.html +DirectoryIndex index.html # @@ -402,7 +402,7 @@ # to be found. # -TypesConfig conf/mime.types +TypesConfig conf/mime.types # @@ -503,40 +503,40 @@ # -# -# Note that if you include a trailing / on fakename then the server will -# require it to be present in the URL. So "/icons" isn't aliased in this -# example, only "/icons/".. -# -Alias /icons/ "@@ServerRoot@@/icons/" - - -Options Indexes MultiViews -AllowOverride None -Order allow,deny -Allow from all - - -# -# ScriptAlias: This controls which directories contain server scripts. -# ScriptAliases are essentially the same as Aliases, except that -# documents in the realname directory are treated as applications and -# run by the server when requested rather than as documents sent to the client. -# The same rules about trailing "/" apply to ScriptAlias directives as to -# Alias. -# -ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/" - -# -# "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased -# CGI directory exists, if you have that configured. -# - -AllowOverride None -Options None -Order allow,deny -Allow from all - +# +# Note that if you include a trailing / on fakename then the server will +# require it to be present in the URL. So "/icons" isn't aliased in this +# example, only "/icons/".. +# +Alias /icons/ "@@ServerRoot@@/icons/" + + +Options Indexes MultiViews +AllowOverride None +Order allow,deny +Allow from all + + +# +# ScriptAlias: This controls which directories contain server scripts. +# ScriptAliases are essentially the same as Aliases, except that +# documents in the realname directory are treated as applications and +# run by the server when requested rather than as documents sent to the client. +# The same rules about trailing "/" apply to ScriptAlias directives as to +# Alias. +# +ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/" + +# +# "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# + +AllowOverride None +Options None +Order allow,deny +Allow from all + # End of aliases. @@ -552,82 +552,82 @@ # Directives controlling the display of server-generated directory listings. # - -# -# FancyIndexing is whether you want fancy directory indexing or standard -# -IndexOptions FancyIndexing - -# -# AddIcon* directives tell the server which icon to show for different -# files or filename extensions. These are only displayed for -# FancyIndexed directories. -# -AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip - -AddIconByType (TXT,/icons/text.gif) text/* -AddIconByType (IMG,/icons/image2.gif) image/* -AddIconByType (SND,/icons/sound2.gif) audio/* -AddIconByType (VID,/icons/movie.gif) video/* - -AddIcon /icons/binary.gif .bin .exe -AddIcon /icons/binhex.gif .hqx -AddIcon /icons/tar.gif .tar -AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv -AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip -AddIcon /icons/a.gif .ps .ai .eps -AddIcon /icons/layout.gif .html .shtml .htm .pdf -AddIcon /icons/text.gif .txt -AddIcon /icons/c.gif .c -AddIcon /icons/p.gif .pl .py -AddIcon /icons/f.gif .for -AddIcon /icons/dvi.gif .dvi -AddIcon /icons/uuencoded.gif .uu -AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl -AddIcon /icons/tex.gif .tex -AddIcon /icons/bomb.gif core -AddIcon /icons/back.gif .. -AddIcon /icons/hand.right.gif README -AddIcon /icons/folder.gif ^^DIRECTORY^^ -AddIcon /icons/blank.gif ^^BLANKICON^^ +# +# FancyIndexing is whether you want
cvs commit: apache-1.3/src/main http_main.c
wsanchez00/01/26 12:10:45 Modified:.STATUS conf httpd.conf-dist src/main http_main.c Log: STATUS Revision ChangesPath 1.801 +2 -2 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.800 retrieving revision 1.801 diff -u -r1.800 -r1.801 --- STATUS2000/01/26 15:38:57 1.800 +++ STATUS2000/01/26 20:10:23 1.801 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/26 15:38:57 $] + Last modified at [$Date: 2000/01/26 20:10:23 $] Release: @@ -573,7 +573,7 @@ mips-sgi-irix6.4 no Lars Eilebrecht mips-siemens-reliantunix5.4 yes Martin Kraemer OS/2 yes Brian Havard - powerpc-apple-rhapsody5.3 no Wilfredo Sanchez + powerpc-apple-rhapsody5.6 yes Wilfredo Sanchez rs6000-ibm-aix3.2.5 no Sameer Parekh rs6000-ibm-aix4.1 no Lars Eilebrecht rs6000-ibm-aix4.2 no Bill Stoddard 1.52 +33 -0 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.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- httpd.conf-dist 1999/12/09 16:01:09 1.51 +++ httpd.conf-dist 2000/01/26 20:10:32 1.52 @@ -328,7 +328,9 @@ # UserDir: The name of the directory which is appended onto a user's home # directory if a ~user request is received. # + UserDir public_html + # # Control access to UserDir directories. The following is an example @@ -351,7 +353,9 @@ # DirectoryIndex: Name of the file or files to use as a pre-written HTML # directory index. Separate multiple entries with spaces. # + DirectoryIndex index.html + # # AccessFileName: The name of the file to look for in each directory @@ -397,7 +401,9 @@ # TypesConfig describes where the mime.types file (or equivalent) is # to be found. # + TypesConfig conf/mime.types + # # DefaultType is the default MIME type the server will use for a document @@ -495,6 +501,9 @@ # Aliases: Add here as many aliases as you need (with no limit). The format is # Alias fakename realname # + + +# # Note that if you include a trailing / on fakename then the server will # require it to be present in the URL. So "/icons" isn't aliased in this # example, only "/icons/".. @@ -529,6 +538,9 @@ Allow from all + +# End of aliases. + # # Redirect allows you to tell clients about documents which used to exist in # your server's namespace, but do not anymore. This allows you to tell the @@ -539,6 +551,7 @@ # # Directives controlling the display of server-generated directory listings. # + # # FancyIndexing is whether you want fancy directory indexing or standard @@ -615,6 +628,14 @@ # IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t + +# End of indexing directives. + +# +# Document types. +# + + # # AddEncoding allows you to have certain browsers (Mosaic/X 2.1+) uncompress # information on the fly. Note: Not all browsers support this. @@ -669,7 +690,9 @@ # Just list the languages in decreasing order of preference. We have # more or less alphabetized them here. You probably want to change this. # + LanguagePriority en da nl et fr de el it pt ltz ca es sv + # # AddType allows you to tweak mime.types without actually editing it, or to @@ -722,6 +745,9 @@ # #AddHandler type-map var + +# End of document types. + # # Action lets you define media types that will execute a script whenever # a matching file is called. This eliminates the need for repeated URL @@ -763,6 +789,11 @@ # request will *not* be available to such a script. # +# Customize behaviour based on the browser +# + + +# # The following directives modify normal HTTP response behavior. # The first directive disables keepalive for Netscape 2.x and browsers that # spoof it. There are known problems with these browser implementations. @@ -781,6 +812,8 @@ BrowserMatch "RealPlayer 4\.0" force-response-1.0 BrowserMatch "Java/1\.0" force-response-1.0 BrowserMatch "JDK/1\.0" force-response-1.0 + + # # Allow server status reports, with the URL of http://servername/server-status 1.490 +5 -0 apache-1.3/src/main/http_main.c Index: http_main.c === RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v retrieving rev
cvs commit: apache-1.3/src/ap ap_getpass.c
wsanchez00/01/25 20:39:03 Modified:src/ap ap_getpass.c Log: Don't define getpass on BeOS. Submitted by: David Reid <[EMAIL PROTECTED]> Revision ChangesPath 1.4 +1 -1 apache-1.3/src/ap/ap_getpass.c Index: ap_getpass.c === RCS file: /home/cvs/apache-1.3/src/ap/ap_getpass.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ap_getpass.c 1999/12/10 11:03:13 1.3 +++ ap_getpass.c 2000/01/26 04:39:00 1.4 @@ -84,7 +84,7 @@ #define ERR_OVERFLOW 5 -#ifdef MPE +#ifdef defined(MPE) || defined(BEOS) #include char *
cvs commit: apache-1.3/src/support htdigest.c
wsanchez00/01/25 20:36:55 Modified:src/support htdigest.c Log: BeOS uses . Submitted by: David Reid <[EMAIL PROTECTED]> Revision ChangesPath 1.29 +1 -1 apache-1.3/src/support/htdigest.c Index: htdigest.c === RCS file: /home/cvs/apache-1.3/src/support/htdigest.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- htdigest.c1999/12/09 17:19:48 1.28 +++ htdigest.c2000/01/26 04:36:53 1.29 @@ -72,7 +72,7 @@ #endif #include "ap.h" #include "ap_md5.h" -#if defined(MPE) || defined(QNX) || defined(WIN32) || defined(__TANDEM) || defined(OS390) +#if defined(MPE) || defined(QNX) || defined(WIN32) || defined(__TANDEM) || defined(OS390) || defined(BEOS) #include #else #include
cvs commit: apache-1.3/src/support logresolve.c
wsanchez00/01/25 20:36:03 Modified:src/support logresolve.c Log: BeOS lacks . Submitted by: David Reid <[EMAIL PROTECTED]> Revision ChangesPath 1.18 +7 -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.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- logresolve.c 1999/12/07 04:54:45 1.17 +++ logresolve.c 2000/01/26 04:36:00 1.18 @@ -45,8 +45,14 @@ #include #ifndef MPE +#ifndef BEOS #include -#endif +#else +/* BeOS lacks the necessary files until we get the new networking */ +#include +#define NO_ADDRESS 4 +#endif /* BEOS */ +#endif /* MPE */ static void cgethost(struct in_addr ipnum, char *string, int check); static int getline(char *s, int n);
cvs commit: apache-1.3 configure
wsanchez00/01/17 14:53:19
Modified:.configure
Log:
Fix misplacement of MPE/iX overrides.
Submitted by: <[EMAIL PROTECTED]>
Reviewed by: wsanchez
Revision ChangesPath
1.116 +5 -4 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- configure 2000/01/11 19:47:42 1.115
+++ configure 2000/01/17 22:53:17 1.116
@@ -339,7 +339,11 @@
iflags_program="${iflags_program} -e .exe"
iflags_core="${iflags_core} -e .exe"
;;
- *)
+*MPE/iX* )
+ default_layout="Apache"
+ iflags_program="-m 755"
+ ;;
+*)
default_layout="Apache"
;;
esac
@@ -357,9 +361,6 @@
set -- --with-layout="$default_layout" "$@"
fi
;;
-*MPE/iX* )
- iflags_program="-m 755"
- ;;
esac
##
cvs commit: apache-1.3 STATUS
wsanchez99/12/09 15:26:31 Modified:.STATUS Log: Tested EAPI on Mac OS X, solves my SSL problem. Revision ChangesPath 1.765 +2 -2 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.764 retrieving revision 1.765 diff -u -r1.764 -r1.765 --- STATUS1999/12/09 18:10:30 1.764 +++ STATUS1999/12/09 23:26:29 1.765 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/12/09 18:10:30 $] + Last modified at [$Date: 1999/12/09 23:26:29 $] Release: @@ -119,7 +119,7 @@ Randy +1 (please choose name other than "hook") Doug +1 on concept (untested), Lars +1 on concept, Martin +1 (untested), Ken -1 for 1.3.7 (too controversial, - esp. w/KEAPI offered as well) + esp. w/KEAPI offered as well), Fred +1 * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth. (PR#2598)
cvs commit: apache-2.0/src/support apxs.pl
wsanchez99/12/06 16:09:04
Modified:src/support apxs.pl
Log:
If we can't open httpd.conf, print a warning, but don't die.
Otherwise, you can't install a module into a package root.
Revision ChangesPath
1.3 +10 -7 apache-2.0/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /home/cvs/apache-2.0/src/support/apxs.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apxs.pl 1999/12/07 00:06:41 1.2
+++ apxs.pl 1999/12/07 00:09:01 1.3
@@ -511,13 +511,16 @@
}
}
if (@lmd or @amd) {
-open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new") || die;
-print FP $content;
-close(FP);
-system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf
$CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " .
- "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new
$CFG_SYSCONFDIR/$CFG_TARGET.conf && " .
- "rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new");
-}
+if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) {
+print FP $content;
+close(FP);
+system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf
$CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " .
+ "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new
$CFG_SYSCONFDIR/$CFG_TARGET.conf && " .
+ "rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new");
+} else {
+print STDERR "unable to open configuration file\n";
+}
+ }
}
}
cvs commit: apache-2.0/src/support apxs.pl
wsanchez99/12/06 16:06:43
Modified:src/support apxs.pl
Log:
Perform check for "$CFG_SBINDIR/$CFG_TARGET" _after_ the command line
overrides for CFG_SBINDIR and CFG_TARGET have been evaluated.
Revision ChangesPath
1.2 +15 -15apache-2.0/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /home/cvs/apache-2.0/src/support/apxs.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apxs.pl 1999/08/24 06:45:53 1.1
+++ apxs.pl 1999/12/07 00:06:41 1.2
@@ -89,21 +89,6 @@
$CFG_CFLAGS =~ s|\s+`.+apaci`||;
##
-## 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";
-print STDERR "apxs:Error: the Apache module mod_so is compiled into\n";
-print STDERR "apxs:Error: your server binary
`$CFG_SBINDIR/$CFG_TARGET'.\n";
-exit(1);
-}
-
-##
## parse argument line
##
@@ -231,6 +216,21 @@
&usage;
}
}
+}
+
+##
+## 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";
+print STDERR "apxs:Error: the Apache module mod_so is compiled into\n";
+print STDERR "apxs:Error: your server binary
`$CFG_SBINDIR/$CFG_TARGET'.\n";
+exit(1);
}
##
cvs commit: apache-1.3/src/support apxs.pl
wsanchez99/12/06 16:03:26
Modified:src/support apxs.pl
Log:
If we can't open httpd.conf, print a warning, but don't die.
Otherwise, you can't install a module into a package root.
Revision ChangesPath
1.30 +11 -8 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- apxs.pl 1999/12/06 23:55:37 1.29
+++ apxs.pl 1999/12/07 00:03:24 1.30
@@ -510,15 +510,18 @@
} else {
$content =~ s|^(.*\n)#?\s*$amd[^\n]*\n|$1$c$amd\n|sg;
}
-}
+ }
if (@lmd or @amd) {
-open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new") || die;
-print FP $content;
-close(FP);
-system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf
$CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " .
- "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new
$CFG_SYSCONFDIR/$CFG_TARGET.conf && " .
- "rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new");
-}
+if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) {
+print FP $content;
+close(FP);
+system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf
$CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " .
+ "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new
$CFG_SYSCONFDIR/$CFG_TARGET.conf && " .
+ "rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new");
+} else {
+print STDERR "unable to open configuration file\n";
+}
+ }
}
}
cvs commit: apache-1.3/src/support apxs.pl
wsanchez99/12/06 15:55:43
Modified:src/support apxs.pl
Log:
Perform check for "$CFG_SBINDIR/$CFG_TARGET" _after_ the command line
overrides for CFG_SBINDIR and CFG_TARGET have been evaluated.
Revision ChangesPath
1.29 +15 -15apache-1.3/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /home/cvs/apache-1.3/src/support/apxs.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- apxs.pl 1999/10/27 07:22:48 1.28
+++ apxs.pl 1999/12/06 23:55:37 1.29
@@ -89,21 +89,6 @@
$CFG_CFLAGS =~ s|\s+`.+apaci`||;
##
-## 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";
-print STDERR "apxs:Error: the Apache module mod_so is compiled into\n";
-print STDERR "apxs:Error: your server binary
`$CFG_SBINDIR/$CFG_TARGET'.\n";
-exit(1);
-}
-
-##
## parse argument line
##
@@ -231,6 +216,21 @@
&usage;
}
}
+}
+
+##
+## 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";
+print STDERR "apxs:Error: the Apache module mod_so is compiled into\n";
+print STDERR "apxs:Error: your server binary
`$CFG_SBINDIR/$CFG_TARGET'.\n";
+exit(1);
}
##
cvs commit: apache-2.0/src/include ap_config.h
wsanchez99/12/03 18:56:19 Modified:src/include ap_config.h Log: Disable the DYLD_CANT_UNLOAD workaround for Mac OS X Server, since the current version (and the patched older version) doesn't need this any more. We don't want to delete the code from unix/os.c, however, because OpenStep's dyld needs it. Revision ChangesPath 1.13 +0 -3 apache-2.0/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ap_config.h 1999/12/01 01:16:05 1.12 +++ ap_config.h 1999/12/04 02:56:18 1.13 @@ -432,9 +432,6 @@ #define PLATFORM "Mac OS" #endif #define HAVE_DYLD -#ifdef MAC_OS_X_SERVER -#define DYLD_CANT_UNLOAD -#endif /* MAC_OS_X_SERVER */ #define HAVE_GMTOFF #define HAVE_MMAP #define USE_MMAP_FILES
cvs commit: apache-1.3/src/include ap_config.h
wsanchez99/12/03 18:50:47 Modified:src/include ap_config.h Log: Disable the DYLD_CANT_UNLOAD workaround for Mac OS X Server, since the current version (and the patched older version) doesn't need this any more. We don't want to delete the code from unix/os.c, however, because OpenStep's dyld needs it. Revision ChangesPath 1.275 +0 -3 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.274 retrieving revision 1.275 diff -u -r1.274 -r1.275 --- ap_config.h 1999/11/28 13:28:07 1.274 +++ ap_config.h 1999/12/04 02:50:43 1.275 @@ -422,9 +422,6 @@ #define PLATFORM "Mac OS" #endif #define HAVE_DYLD -#ifdef MAC_OS_X_SERVER -#define DYLD_CANT_UNLOAD -#endif /* MAC_OS_X_SERVER */ #define HAVE_GMTOFF #define HAVE_MMAP #define USE_MMAP_FILES
cvs commit: apache-2.0 configure
wsanchez99/12/03 17:01:12
Modified:.configure
Log:
Try to keep the platform overrides in one place.
Revision ChangesPath
1.6 +4 -6 apache-2.0/configure
Index: configure
===
RCS file: /home/cvs/apache-2.0/configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure 1999/10/05 14:46:06 1.5
+++ configure 1999/12/04 01:01:03 1.6
@@ -237,12 +237,6 @@
iflags_dso="-m 755"
iflags_script="-m 755"
iflags_data="-m 644"
-case $PLATFORM in
-*OS/2* )
-iflags_program="$iflags_program -e .exe"
-iflags_core="$iflags_core -e .exe"
-;;
-esac
# various other flags
support=1
@@ -328,6 +322,10 @@
iflags_core="${iflags_core} -S \"-S\""
iflags_dso="${iflags_dso} -S \"-S\""
;;
+*OS/2* )
+iflags_program="$iflags_program -e .exe"
+iflags_core="$iflags_core -e .exe"
+;;
*)
default_layout="Apache"
;;
cvs commit: apache-1.3 configure
wsanchez99/12/03 16:59:57
Modified:.configure
Log:
Try to keep the platform overrides in one place for sanity.
Revision ChangesPath
1.111 +4 -6 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- configure 1999/11/28 14:15:35 1.110
+++ configure 1999/12/04 00:59:52 1.111
@@ -236,12 +236,6 @@
iflags_dso="-m 755"
iflags_script="-m 755"
iflags_data="-m 644"
-case $PLATFORM in
-*OS/2* )
-iflags_program="$iflags_program -e .exe"
-iflags_core="$iflags_core -e .exe"
-;;
-esac
# various other flags
support=1
@@ -327,6 +321,10 @@
iflags_core="${iflags_core} -S \"-S\""
iflags_dso="${iflags_dso} -S \"-S\""
;;
+*OS/2* )
+iflags_program="${iflags_program} -e .exe"
+iflags_core="${iflags_core} -e .exe"
+;;
*)
default_layout="Apache"
;;
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-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-site/contributors index.html
wsanchez99/10/25 18:29:26 Modified:contributors index.html Log: Add my stats. Alphabetize Sameer. Revision ChangesPath 1.79 +40 -28apache-site/contributors/index.html Index: index.html === RCS file: /home/cvs/apache-site/contributors/index.html,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- index.html1999/10/22 09:56:06 1.78 +++ index.html1999/10/26 01:29:24 1.79 @@ -70,7 +70,7 @@ Alexei Kosut -Martin Kraemer + Martin Kraemer EBCDIC Port to BS2000 mainframes. Ben Laurie @@ -89,7 +89,8 @@ Daniel Lopez Ridruejo - Wilfredo Sanchez + Wilfredo Sánchez + Mac OS porting Cliff Skolnick Solaris porting. @@ -110,8 +111,8 @@ Dirk van Gulik - -Apache Emeritae (old group members now off doing other things) + + Apache Emeritae (old group members now off doing other things) Chuck Murcko UnixWare, IRIX, BSD porting. @@ -126,36 +127,36 @@ Andrew Wilson -Other major contributors: + Other major contributors: Howard Fear SSI extensions. -Florent Guillaume + Florent Guillaume Language Negotiation -Koen Holtman + Koen Holtman Rewrite of mod_negotiation -Kevin Hughes + Kevin Hughes Creator of all those nifty icons -Brandon Long and Beth Frank + Brandon Long and Beth Frank NCSA Server Development Team, post-1.3 -Ambarish Malpani + Ambarish Malpani Beginning of the NT port -Rob McCool + Rob McCool Original author of NCSA httpd 1.3 -Paul Richards + Paul Richards Convinced the group to use remote CVS after 1.0 Garey Smiley OS/2 port. -Henry Spencer + Henry Spencer Author of the regex library @@ -174,7 +175,7 @@ Name: Brian Behlendorf -Email: mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] +Email: mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] URL: http://www.behlendorf.com/";>http://www.behlendorf.com Organization: http://www.oreilly.com";>O'Reilly and Associates Occupation: CTO, New Ventures @@ -311,7 +312,6 @@ - Name: Rob Hartill Email: mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] URL: http://us.imdb.com/";>IMDb @@ -406,6 +406,7 @@ Comments: What am I doing here? + Name: Rasmus Lerdorf Email: mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] URL: http://www.lerdorf.on.ca/";>http://www.lerdorf.on.ca/ @@ -427,6 +428,7 @@ Location: San Francisco, CA, USA Contributions: http://perl.apache.org/";>mod_perl, various API additions + Name: Aram W. Mirzadeh @@ -451,6 +453,17 @@ +Name: Sameer Parekh +Email: mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] +URL: http://www.c2.net/~sameer/";>http://www.c2.net/~sameer/ +Organization: C2Net Software, Inc. +Occupation: Management (whee) +Location: Oakland, CA, USA +Contribution: Bugfixes, documentation, website, +administrative/legal, various binary builds as needed + + + Name: Paul Richards Email: mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] URL: http://www.freebsd.org/~paul";>http://www.freebsd.org/~paul @@ -462,7 +475,17 @@ +Name: Wilfredo Sánchez +Email: mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] +URL: http://www.mit.edu/people/wsanchez/";>http://www.mit.edu/people/wsanchez/ +Organization: Apple Computer, Inc. +Occupation: Software Engineer +Location: Cupertino, CA, USA +OS Expertise: Mac OS X, *BSD +Contribution: Mac OS X port, build fixes. + + Name: David Robinson Email: mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] URL: @@ -475,8 +498,7 @@ Name: Cliff Skolnick email: mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] -URL: http://www.steam.com/~cliff/";>http://www.steam.com -/~cliff/ +URL: http://www.steam.com/~cliff/";>http://www.steam.com/~cliff/ Organization: steam.com Occupation: Network/Unix Consultant Location: San Francisco, CA, USA @@ -507,6 +529,7 @@ http://www.slink.com/ApacheOS2/";>http://www.slink.com/ApacheOS2/ + Name: Bill Stoddard Email: mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] URL: http://www.software.ibm.com/webservers/";>http://www.software.ibm.com/webservers/ @@ -589,17 +612,6 @@ Occupation: Internet Consultant Location: Oxford, UK Comments: I'm really looking forward to this hangover. - - - -Name: Sameer Parekh -Email: mailt
cvs commit: apache-devsite platforms.html
wsanchez99/10/25 18:26:59 Modified:.platforms.html Log: nit Revision ChangesPath 1.3 +1 -1 apache-devsite/platforms.html Index: platforms.html === RCS file: /home/cvs/apache-devsite/platforms.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- platforms.html1999/03/16 21:32:49 1.2 +++ platforms.html1999/10/26 01:26:56 1.3 @@ -47,7 +47,7 @@ Dean Gaudet (mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]) Mac OS X: - Wilfredo Sanchez (mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]) + Wilfredo Sánchez (mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]) NeXT:
cvs commit: apache-1.3/src/support apxs.pl
wsanchez99/08/27 16:31:09
Modified:src/support apxs.pl
Log:
When apxs compiles a .o file, it cc puts it into the current working
directory. But then we're looking for the .o file in the directory that
contains the .c file, and the link line breaks. So lets remove the path to the
.c file when adding to @objs.
Revision ChangesPath
1.26 +1 -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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- apxs.pl 1999/07/24 18:05:02 1.25
+++ apxs.pl 1999/08/27 23:31:00 1.26
@@ -369,6 +369,7 @@
foreach $s (@srcs) {
my $o = $s;
$o =~ s|\.c$|.o|;
+$o =~ s|^.*/||;
push(@cmds, "$CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c $s");
unshift(@objs, $o);
}
cvs commit: apache-1.3 STATUS
wsanchez99/08/18 10:22:33 Modified:.STATUS Log: go Revision ChangesPath 1.749 +2 -2 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.748 retrieving revision 1.749 diff -u -r1.748 -r1.749 --- STATUS1999/08/16 17:59:39 1.748 +++ STATUS1999/08/18 17:22:32 1.749 @@ -1,12 +1,12 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/16 17:59:39 $] + Last modified at [$Date: 1999/08/18 17:22:32 $] Release: 1.3.9-dev: COUNTDOWN restarted at 08/15 3:00pm PDT Tarball planned for Monday morning unless problems found. Votes for rolling: Ralf +1, Martin +1, Roy +1, Randy +1, - Jim +1 + Jim +1, Fred +1 1.3.8: Not released. 1.3.7: Not released.
cvs commit: apache-1.3 STATUS
wsanchez99/08/16 10:59:41 Modified:.STATUS Log: Add Rhapsody to binaries list. Revision ChangesPath 1.748 +4 -4 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.747 retrieving revision 1.748 diff -u -r1.747 -r1.748 --- STATUS1999/08/16 16:27:02 1.747 +++ STATUS1999/08/16 17:59:39 1.748 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/16 16:27:02 $] + Last modified at [$Date: 1999/08/16 17:59:39 $] Release: @@ -485,11 +485,14 @@ m68k-apple-aux3.1.1 no Jim Jagielski m88k-dg-dgux5.4R2.01 no Sameer parekh m88k-next-nextno Rob Hartill + mips-dec-ultrix4.4no Sameer Parekh + mips-unknown-linuxno Lars Eilebrecht mips-sgi-irix5.3 no Mark Imbrianco mips-sgi-irix6.2 no Lars Eilebrecht mips-sgi-irix6.4 no Lars Eilebrecht mips-sni-svr4 no Martin Kraemer OS/2 no Brian Havard + powerpc-apple-rhapsody5.3 no Wilfredo Sanchez rs6000-ibm-aix3.2.5 no Sameer Parekh rs6000-ibm-aix4.1 no Lars Eilebrecht rs6000-ibm-aix4.2 no Bill Stoddard @@ -500,6 +503,3 @@ sparc-sun-sunos4.1.4 no Lars Eilebrecht, Michael Douglass sparc-sun-sunos4.1.3_U1 no Sameer Parekh sparc-unknown-linux no Lars Eilebrecht - mips-dec-ultrix4.4no Sameer Parekh - mips-unknown-linuxno Lars Eilebrecht -
cvs commit: apache-1.3/src/include ap_config.h
wsanchez99/08/05 21:01:21 Modified:src/include ap_config.h Log: Don't need __private_extern__ when building statically. Revision ChangesPath 1.266 +1 -1 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- ap_config.h 1999/08/02 10:45:31 1.265 +++ ap_config.h 1999/08/06 04:01:19 1.266 @@ -981,7 +981,7 @@ * __private_extern__. * For other systems, make that a no-op. */ -#if defined(MAC_OS) || defined(MAC_OS_X_SERVER) +#if (defined(MAC_OS) || defined(MAC_OS_X_SERVER)) && defined(__DYNAMIC__) #define ap_private_extern __private_extern__ #else #define ap_private_extern
cvs commit: apache-1.3 configure
wsanchez99/08/05 20:35:00
Modified:.configure
Log:
Oops. Wrong cut-n-paste.
Revision ChangesPath
1.96 +2 -2 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- configure 1999/08/06 03:29:11 1.95
+++ configure 1999/08/06 03:35:00 1.96
@@ -320,12 +320,12 @@
*-apple-rhapsody*)
default_layout="Mac OS X Server"
iflags_core="${iflags_core} -S \"-S\""
- iflags_dso="${iflags_core} -S \"-S\""
+ iflags_dso="${iflags_dso} -S \"-S\""
;;
*-apple-macos*)
default_layout="Mac OS X Server"
iflags_core="${iflags_core} -S \"-S\""
- iflags_dso="${iflags_core} -S \"-S\""
+ iflags_dso="${iflags_dso} -S \"-S\""
;;
*)
default_layout="Apache"
cvs commit: apache-1.3 configure
wsanchez99/08/05 20:29:13
Modified:.configure
Log:
Pass appropriate strip flags to install.
Revision ChangesPath
1.95 +13 -3 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- configure 1999/07/10 18:27:25 1.94
+++ configure 1999/08/06 03:29:11 1.95
@@ -317,9 +317,19 @@
## Platform-specific defaults
##
case $PLATFORM in
-*-apple-rhapsody*) default_layout="Mac OS X Server";;
-*-apple-macos*)default_layout="Mac OS X Server";;
-*) default_layout="Apache";;
+*-apple-rhapsody*)
+ default_layout="Mac OS X Server"
+ iflags_core="${iflags_core} -S \"-S\""
+ iflags_dso="${iflags_core} -S \"-S\""
+ ;;
+*-apple-macos*)
+ default_layout="Mac OS X Server"
+ iflags_core="${iflags_core} -S \"-S\""
+ iflags_dso="${iflags_core} -S \"-S\""
+ ;;
+ *)
+ default_layout="Apache"
+ ;;
esac
##
cvs commit: apache-1.3/src/include ap_config.h
wsanchez99/07/30 13:58:58 Modified:src/include ap_config.h Log: Get rid of redefinition warning Revision ChangesPath 1.264 +1 -0 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- ap_config.h 1999/07/21 11:57:09 1.263 +++ ap_config.h 1999/07/30 20:58:56 1.264 @@ -390,6 +390,7 @@ #endif #elif defined(MAC_OS) || defined(MAC_OS_X_SERVER) /* Mac OS (>= 10.0) and Mac OS X Server (<= 5.x) */ +#undef PLATFORM #ifdef MAC_OS_X_SERVER #define PLATFORM "Mac OS X Server" #else
cvs commit: apache-1.3/src/helpers GuessOS
wsanchez99/07/29 22:14:09
Modified:src/helpers GuessOS
Log:
Change "Power Macintosh" to Power* so if uname prints "Power Book" we're
still happy.
Revision ChangesPath
1.61 +1 -1 apache-1.3/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /home/cvs/apache-1.3/src/helpers/GuessOS,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- GuessOS 1999/05/03 23:07:45 1.60
+++ GuessOS 1999/07/30 05:14:08 1.61
@@ -243,7 +243,7 @@
Rhapsody:*:*:*)
case "${MACHINE}" in
- "Power Macintosh") MACHINE=powerpc ;;
+ Power*) MACHINE=powerpc ;;
esac
echo "${MACHINE}-apple-rhapsody${RELEASE}"; exit 0
;;
cvs commit: apache-1.3/src/support apxs.8 apxs.pl
wsanchez99/07/09 14:44:37
Modified:src CHANGES
src/support apxs.8 apxs.pl
Log:
Fix up apxs editing code so that multiple invocations of apxs -a will
not result in multiple LoadModule/AddModule entries for that module;
apxs can now be used to re- enable/disable modules that were installed
using apxs.
Revision ChangesPath
1.1395+4 -2 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1394
retrieving revision 1.1395
diff -u -r1.1394 -r1.1395
--- CHANGES 1999/07/08 01:18:28 1.1394
+++ CHANGES 1999/07/09 21:44:23 1.1395
@@ -2,8 +2,10 @@
*) apxs: Add "-S var=val" option which allows for override of CFG_*
built-in values. Add "-e" option which works like -i but doesn't
- install the DSO; useful for editing httpd.conf with apxs.
- [Wilfredo Sanchez]
+ install the DSO; useful for editing httpd.conf with apxs. Fix
+ editing code so that multiple invocations of apxs -a will not
+ create duplicate LoadModule/AddModule entries; apxs can now be
+ used to re- enable/disable a module. [Wilfredo Sanchez]
*) Win32: Update the server to use Winsock 2. Specifically, link with
ws2_32.lib rather than wsock32.lib. This gives us access to
1.9 +3 -5 apache-1.3/src/support/apxs.8
Index: apxs.8
===
RCS file: /home/cvs/apache-1.3/src/support/apxs.8,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apxs.81999/07/08 01:18:31 1.8
+++ apxs.81999/07/09 21:44:31 1.9
@@ -332,20 +332,18 @@
directory.
.TP 12
.B \-a
-This additionally activates the module
-by automatically adding a corresponding
+This activates the module by automatically adding a corresponding
.B LoadModule
line to Apache's
.B httpd.conf
-configuration file (only if no such entry exists yet).
+configuration file, or by enabling it if it already exists.
.TP 12
.B \-A
Same as option
.B \-a
but the created
.B LoadModule
-directive is
-prefixed with a hash sign (#), i.e. the module is
+directive is prefixed with a hash sign (#), i.e. the module is
just prepared for later activation but initially disabled.
.TP 12
.B \-e
1.24 +10 -11apache-1.3/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /home/cvs/apache-1.3/src/support/apxs.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- apxs.pl 1999/07/08 01:18:32 1.23
+++ apxs.pl 1999/07/09 21:44:32 1.24
@@ -485,29 +485,28 @@
exit(1);
}
-my $update = 0;
my $lmd;
+my $c = '';
+$c = '#' if ($opt_A);
foreach $lmd (@lmd) {
+my $what = $opt_A ? "preparing" : "activating";
if ($content !~ m|\n#?\s*$lmd|) {
- my $c = '';
- $c = '#' if ($opt_A);
$content =~
s|^(.*\n#?\s*LoadModule\s+[^\n]+\n)|$1$c$lmd\n|sg;
- $update = 1;
- $lmd =~ m|LoadModule\s+(.+?)_module.*|;
- my $what = $opt_A ? "preparing" : "activating";
- print STDERR "[$what module `$1' in
$CFG_SYSCONFDIR/$CFG_TARGET.conf]\n";
+} else {
+ $content =~ s|^(.*\n)#?\s*$lmd[^\n]*\n|$1$c$lmd\n|sg;
}
+$lmd =~ m|LoadModule\s+(.+?)_module.*|;
+print STDERR "[$what module `$1' in
$CFG_SYSCONFDIR/$CFG_TARGET.conf]\n";
}
my $amd;
foreach $amd (@amd) {
if ($content !~ m|\n#?\s*$amd|) {
- my $c = '';
- $c = '#' if ($opt_A);
$content =~
s|^(.*\n#?\s*AddModule\s+[^\n]+\n)|$1$c$amd\n|sg;
- $update = 1;
+} else {
+ $content =~ s|^(.*\n)#?\s*$amd[^\n]*\n|$1$c$amd\n|sg;
}
}
-if ($update) {
+if (@lmd or @amd) {
open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new") || die;
print FP $content;
close(FP);
cvs commit: apache-1.3/src/support apxs.8 apxs.pl
wsanchez99/07/07 18:18:33
Modified:src CHANGES
src/support apxs.8 apxs.pl
Log:
Add "-e" option which works like -i but doesn't install the DSO;
useful for editing httpd.conf with apxs.
Revision ChangesPath
1.1394+3 -1 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1393
retrieving revision 1.1394
diff -u -r1.1393 -r1.1394
--- CHANGES 1999/07/07 18:58:50 1.1393
+++ CHANGES 1999/07/08 01:18:28 1.1394
@@ -1,7 +1,9 @@
Changes with Apache 1.3.7
*) apxs: Add "-S var=val" option which allows for override of CFG_*
- built-in values. [Wilfredo Sanchez]
+ built-in values. Add "-e" option which works like -i but doesn't
+ install the DSO; useful for editing httpd.conf with apxs.
+ [Wilfredo Sanchez]
*) Win32: Update the server to use Winsock 2. Specifically, link with
ws2_32.lib rather than wsock32.lib. This gives us access to
1.8 +28 -1 apache-1.3/src/support/apxs.8
Index: apxs.8
===
RCS file: /home/cvs/apache-1.3/src/support/apxs.8,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apxs.81999/07/07 18:55:26 1.7
+++ apxs.81999/07/08 01:18:31 1.8
@@ -111,6 +111,22 @@
.B \-A
]
.IR dsofile " ..."
+
+.B apxs
+.B \-e
+[
+.BI \-S " name=value
+]
+[
+.BI \-n " modname"
+]
+[
+.B \-a
+]
+[
+.B \-A
+]
+.IR dsofile " ..."
.PP
.SH DESCRIPTION
.B apxs
@@ -306,7 +322,7 @@
as additional flags to the linker command.
Use this to add local linker-specific options.
.PP
-DSO installation options:
+DSO installation and configuration options:
.TP 12
.B \-i
This indicates the installation operation and installs one or more
@@ -331,6 +347,17 @@
directive is
prefixed with a hash sign (#), i.e. the module is
just prepared for later activation but initially disabled.
+.TP 12
+.B \-e
+This indicates the editing operation, which can be used with the
+.B \-a
+and
+.B \-A
+options similarly to the
+.B \-i
+operation to edit Apache's
+.B httpd.conf
+configuration file without attempting to install the module.
.PD
.SH EXAMPLES
Assume you have an Apache module named mod_foo.c available which should
extend
1.23 +10 -6 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- apxs.pl 1999/07/07 18:55:26 1.22
+++ apxs.pl 1999/07/08 01:18:32 1.23
@@ -118,6 +118,7 @@
my @opt_l = ();
my @opt_W = ();
my @opt_S = ();
+my $opt_e = 0;
my $opt_i = 0;
my $opt_a = 0;
my $opt_A = 0;
@@ -195,15 +196,16 @@
print STDERR " [-I ] [-L ] [-l ]
[-Wc,]\n";
print STDERR " [-Wl,] ...\n";
print STDERR " apxs -i [-S =] [-a] [-A] [-n ]
...\n";
+print STDERR " apxs -e [-S =] [-a] [-A] [-n ]
...\n";
exit(1);
}
# option handling
my $rc;
-($rc, @ARGV) = &Getopts("qn:gco:I+D+L+l+W+S+iaA", @ARGV);
+($rc, @ARGV) = &Getopts("qn:gco:I+D+L+l+W+S+eiaA", @ARGV);
&usage if ($rc == 0);
&usage if ($#ARGV == -1 and not $opt_g);
-&usage if (not $opt_q and not ($opt_g and $opt_n) and not $opt_i and not
$opt_c);
+&usage if (not $opt_q and not ($opt_g and $opt_n) and not $opt_i and not
$opt_c and not $opt_e);
# argument handling
my @args = @ARGV;
@@ -396,12 +398,12 @@
&execute_cmds(@cmds);
# allow one-step compilation and installation
-if ($opt_i) {
+if ($opt_i or $opt_e) {
@args = ( $dso_file );
}
}
-if ($opt_i) {
+if ($opt_i or $opt_e) {
##
## SHARED OBJECT INSTALLATION
##
@@ -419,8 +421,10 @@
}
my $t = $f;
$t =~ s|^.+/([^/]+)$|$1|;
-push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
-push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
+if ($opt_i) {
+ push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
+ push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
+}
# determine module symbolname and filename
my $filename = '';
cvs commit: apache-1.3/src CHANGES
wsanchez99/07/07 11:58:52 Modified:src CHANGES Log: apxs: Add "-S var=val" option which allows for override of CFG_* built-in values. Revision ChangesPath 1.1393+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1392 retrieving revision 1.1393 diff -u -r1.1392 -r1.1393 --- CHANGES 1999/06/30 09:21:57 1.1392 +++ CHANGES 1999/07/07 18:58:50 1.1393 @@ -1,4 +1,8 @@ Changes with Apache 1.3.7 + + *) apxs: Add "-S var=val" option which allows for override of CFG_* + built-in values. [Wilfredo Sanchez] + *) Win32: Update the server to use Winsock 2. Specifically, link with ws2_32.lib rather than wsock32.lib. This gives us access to WSADuplcateSocket() in addition to some other enhanced comm APIs.
cvs commit: apache-1.3/src/support apxs.8 apxs.pl
wsanchez99/07/07 11:55:28
Modified:src/support apxs.8 apxs.pl
Log:
Add "-S var=val" option which allows for override of CFG_* built-in values.
Revision ChangesPath
1.7 +17 -0 apache-1.3/src/support/apxs.8
Index: apxs.8
===
RCS file: /home/cvs/apache-1.3/src/support/apxs.8,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apxs.81999/04/22 21:04:53 1.6
+++ apxs.81999/07/07 18:55:26 1.7
@@ -56,15 +56,24 @@
.SH SYNOPSIS
.B apxs
.B \-g
+[
+.BI \-S " name=value
+]
.BI \-n " modname"
.B apxs
.B \-q
+[
+.BI \-S " name=value
+]
.IR query " ..."
.B apxs
.B \-c
[
+.BI \-S " name=value
+]
+[
.BI \-o " dsofile"
]
[
@@ -90,6 +99,9 @@
.B apxs
.B \-i
[
+.BI \-S " name=value
+]
+[
.BI \-n " modname"
]
[
@@ -218,6 +230,11 @@
.fi
inside your own Makefiles if you need manual access
to Apache's C header files.
+.PP
+Configuration options:
+.TP 12
+.BI \-S " name=value"
+This option changes the apxs settings described above.
.PP
Template Generation options:
.TP 12
1.22 +40 -18apache-1.3/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /home/cvs/apache-1.3/src/support/apxs.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- apxs.pl 1999/06/25 21:24:36 1.21
+++ apxs.pl 1999/07/07 18:55:26 1.22
@@ -68,18 +68,18 @@
## Configuration
##
-my $CFG_TARGET= '@TARGET@';# substituted via Makefile.tmpl
-my $CFG_CC= '@CC@';# substituted via Makefile.tmpl
-my $CFG_CFLAGS= '@CFLAGS@';# substituted via Makefile.tmpl
-my $CFG_CFLAGS_SHLIB = '@CFLAGS_SHLIB@'; # substituted via Makefile.tmpl
-my $CFG_LD_SHLIB = '@LD_SHLIB@'; # substituted via Makefile.tmpl
+my $CFG_TARGET= '@TARGET@';# substituted via
Makefile.tmpl
+my $CFG_CC= '@CC@';# substituted via
Makefile.tmpl
+my $CFG_CFLAGS= '@CFLAGS@';# substituted via
Makefile.tmpl
+my $CFG_CFLAGS_SHLIB = '@CFLAGS_SHLIB@'; # substituted via
Makefile.tmpl
+my $CFG_LD_SHLIB = '@LD_SHLIB@'; # substituted via
Makefile.tmpl
my $CFG_LDFLAGS_SHLIB = '@LDFLAGS_MOD_SHLIB@'; # substituted via
Makefile.tmpl
-my $CFG_LIBS_SHLIB= '@LIBS_SHLIB@';# substituted via Makefile.tmpl
-my $CFG_PREFIX= '@prefix@';# substituted via APACI install
-my $CFG_SBINDIR = '@sbindir@'; # substituted via APACI install
-my $CFG_INCLUDEDIR= '@includedir@';# substituted via APACI install
-my $CFG_LIBEXECDIR= '@libexecdir@';# substituted via APACI install
-my $CFG_SYSCONFDIR= '@sysconfdir@';# substituted via APACI install
+my $CFG_LIBS_SHLIB= '@LIBS_SHLIB@';# substituted via
Makefile.tmpl
+my $CFG_PREFIX= '@prefix@';# substituted via APACI
install
+my $CFG_SBINDIR = '@sbindir@'; # substituted via APACI
install
+my $CFG_INCLUDEDIR= '@includedir@';# substituted via APACI
install
+my $CFG_LIBEXECDIR= '@libexecdir@';# substituted via APACI
install
+my $CFG_SYSCONFDIR= '@sysconfdir@';# substituted via APACI
install
##
## Cleanup the above stuff
@@ -117,6 +117,7 @@
my @opt_L = ();
my @opt_l = ();
my @opt_W = ();
+my @opt_S = ();
my $opt_i = 0;
my $opt_a = 0;
my $opt_A = 0;
@@ -188,18 +189,18 @@
}
sub usage {
-print STDERR "Usage: apxs -g -n \n";
-print STDERR " apxs -q ...\n";
-print STDERR " apxs -c [-o ] [-D [=]] [-I
]\n";
-print STDERR " [-L ] [-l ] [-Wc,]
[-Wl,]\n";
-print STDERR "...\n";
-print STDERR " apxs -i [-a] [-A] [-n ] ...\n";
+print STDERR "Usage: apxs -g [-S =] -n \n";
+print STDERR " apxs -q [-S =] ...\n";
+print STDERR " apxs -c [-S =] [-o ] [-D
[=]]\n";
+print STDERR " [-I ] [-L ] [-l ]
[-Wc,]\n";
+print STDERR " [-Wl,] ...\n";
+print STDERR " apxs -i [-S =] [-a] [-A] [-n ]
...\n";
exit(1);
}
# option handling
my $rc;
-($rc, @ARGV) = &Getopts("qn:gco
cvs commit: apache-1.3 STATUS
wsanchez99/05/10 20:26:30 Modified:.STATUS Log: Revision ChangesPath 1.686 +1 -7 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.685 retrieving revision 1.686 diff -u -r1.685 -r1.686 --- STATUS1999/05/05 20:49:36 1.685 +++ STATUS1999/05/11 03:26:29 1.686 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/05/05 20:49:36 $] + Last modified at [$Date: 1999/05/11 03:26:29 $] Release: @@ -94,12 +94,6 @@ ReadmeName files to be negociated and SSI-parsed. Message-ID: <[EMAIL PROTECTED]> Status: - -* Fred's patch for changing the default layout on Mac OS and Mac - OS X Server. -Message-ID: <[EMAIL PROTECTED]> - Status: Ralf -1 - Alexei, Randy, Greg +1 * John Giannadrea's patch for ceiling on file size for mmap (PR#4122) Message-ID: <[EMAIL PROTECTED]>
cvs commit: apache-1.3/src CHANGES
wsanchez99/05/05 17:49:40 Modified:src CHANGES Log: Use custom default layout for Mac OS X and Mac OS X Server. Revision ChangesPath 1.1350+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1349 retrieving revision 1.1350 diff -u -r1.1349 -r1.1350 --- CHANGES 1999/05/05 20:42:55 1.1349 +++ CHANGES 1999/05/06 00:49:38 1.1350 @@ -1,5 +1,9 @@ Changes with Apache 1.3.7 + *) Mac OS and Mac OS X Server now use the appropriate custom layout + by default when building with APACI; allow for platform-specific + variable defaults in configure. [Wilfredo Sanchez] + *) Do setgid() before initgroups() in http_main; some platforms zap the grouplist when setgid() is called. This was fixed in suexec earlier, but the main httpd code missed the change.
cvs commit: apache-1.3 configure
wsanchez99/05/05 17:44:18 Modified:.configure Log: Make platform-dependant choice as to default layout for Mac OS and Mac OS X Server. Revision ChangesPath 1.91 +11 -2 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- configure 1999/05/04 02:55:15 1.90 +++ configure 1999/05/06 00:44:16 1.91 @@ -309,6 +309,15 @@ IFS="$OIFS" ## +## Platform-specific defaults +## +case $PLATFORM in +*-apple-rhapsody*) default_layout="Mac OS X Server";; +*-apple-macos*)default_layout="Mac OS X Server";; +*) default_layout="Apache";; +esac + +## ## support for the default layout ## case "$*" in @@ -316,9 +325,9 @@ ;; * ) if [ "x$*" = "x" ]; then -set -- '--with-layout=Apache' +set -- --with-layout="$default_layout" else -set -- '--with-layout=Apache' "$@" +set -- --with-layout="$default_layout" "$@" fi ;; esac
cvs commit: apache-1.3/src/os/unix os.h
wsanchez99/05/03 19:57:14 Modified:src CHANGES src/include ap_config.h src/os/unix os.h Log: Define PLATFORM for Mac OS in ap_config.h, not unix/os.c. Seems cleaner and more flexible that way. Revision ChangesPath 1.1345+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1344 retrieving revision 1.1345 diff -u -r1.1344 -r1.1345 --- CHANGES 1999/05/04 01:07:29 1.1344 +++ CHANGES 1999/05/04 02:57:08 1.1345 @@ -1,5 +1,8 @@ Changes with Apache 1.3.7 + *) Add iconsdir, htdocsdir, and cgidir to config.layout. + [Wilfredo Sanchez] + *) Fix minor but annoying bug with the test for Configuration.tmpl being newer than Configuration so that it is less likely to fail when using APACI and shadow sources. [Wilfredo Sanchez] 1.257 +5 -0 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.256 retrieving revision 1.257 diff -u -r1.256 -r1.257 --- ap_config.h 1999/05/03 23:07:52 1.256 +++ ap_config.h 1999/05/04 02:57:13 1.257 @@ -385,6 +385,11 @@ #define HAVE_SYSLOG 1 #elif defined(MAC_OS) || defined(MAC_OS_X_SERVER) /* Mac OS (>= 10.0) and Mac OS X Server (<= 5.x) */ +#ifdef MAC_OS_X_SERVER +#define PLATFORM "Mac OS X Server" +#else +#define PLATFORM "Mac OS" +#endif #define HAVE_DYLD #ifdef MAC_OS_X_SERVER #define DYLD_CANT_UNLOAD 1.41 +1 -3 apache-1.3/src/os/unix/os.h Index: os.h === RCS file: /home/cvs/apache-1.3/src/os/unix/os.h,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- os.h 1999/05/03 23:03:45 1.40 +++ os.h 1999/05/04 02:57:14 1.41 @@ -60,9 +60,7 @@ #include "ap_config.h" -#ifdef MAC_OS -#define PLATFORM "Mac OS" -#else +#ifndef PLATFORM #define PLATFORM "Unix" #endif
cvs commit: apache-1.3 Makefile.tmpl config.layout configure
wsanchez99/05/03 19:55:16 Modified:.Makefile.tmpl config.layout configure Log: Make htdocs, iconsdir, and cgidir configurable via config.layout. Revision ChangesPath 1.82 +3 -3 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- Makefile.tmpl 1999/05/03 10:23:46 1.81 +++ Makefile.tmpl 1999/05/04 02:55:14 1.82 @@ -112,9 +112,9 @@ mandir = @mandir@ sysconfdir = @sysconfdir@ datadir = @datadir@ -iconsdir= $(datadir)/icons -htdocsdir = $(datadir)/htdocs -cgidir = $(datadir)/cgi-bin +iconsdir= @iconsdir@ +htdocsdir = @htdocsdir@ +cgidir = @cgidir@ includedir = @includedir@ localstatedir = @localstatedir@ runtimedir = @runtimedir@ 1.8 +18 -0 apache-1.3/config.layout Index: config.layout === RCS file: /home/cvs/apache-1.3/config.layout,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- config.layout 1999/05/03 23:02:57 1.7 +++ config.layout 1999/05/04 02:55:14 1.8 @@ -19,6 +19,9 @@ mandir:$prefix/man sysconfdir:$prefix/conf datadir: $prefix +iconsdir: $datadir/icons +htdocsdir: $datadir/htdocs +cgidir:$datadir/cgi-bin includedir:$prefix/include localstatedir: $prefix runtimedir:$localstatedir/logs @@ -37,6 +40,9 @@ mandir:$prefix/man sysconfdir:$prefix/etc+ datadir: $prefix/share+ +iconsdir: $datadir/icons +htdocsdir: $datadir/htdocs +cgidir:$datadir/cgi-bin includedir:$prefix/include+ localstatedir: $prefix/var+ runtimedir:$localstatedir/run @@ -54,6 +60,9 @@ mandir:man sysconfdir:conf datadir: +iconsdir: icons +htdocsdir: htdocs +cgidir:cgi-bin includedir:include localstatedir: runtimedir:logs @@ -71,6 +80,9 @@ mandir:$exec_prefix/share/man sysconfdir:$prefix/Configuration datadir: $prefix +iconsdir: /Local/Library/Apache/Icons +htdocsdir: $datadir/Documents +cgidir:$datadir/CGI-Executables includedir: /Local/Library/Frameworks/Apache.framework/Versions/1.3/Headers localstatedir: /var runtimedir:$prefix/Logs @@ -88,6 +100,9 @@ mandir:$prefix/man sysconfdir:/etc/httpd/conf datadir: /home/httpd +iconsdir: $datadir/icons +htdocsdir: $datadir/htdocs +cgidir:$datadir/cgi-bin includedir:$prefix/include/apache localstatedir: /var runtimedir:$localstatedir/run @@ -105,6 +120,9 @@ mandir:$prefix/man sysconfdir:/etc$prefix datadir: $prefix/share +iconsdir: $datadir/icons +htdocsdir: $datadir/htdocs +cgidir:$datadir/cgi-bin includedir:$prefix/include localstatedir: /var$prefix runtimedir:$localstatedir/run 1.90 +11 -4 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- configure 1999/05/02 02:56:02 1.89 +++ configure 1999/05/04 02:55:15 1.90 @@ -437,8 +437,8 @@ OOIFS="$IFS" # most likely not needed: jmj IFS="$DIFS" # ditto for var in prefix exec_prefix bindir sbindir libexecdir mandir \ - sysconfdir datadir includedir localstatedir runtimedir \ - logfiledir proxycachedir; do + sysconfdir datadir iconsdir htdocsdir cgidir includedir \ + localstatedir runtimedir logfiledir proxycachedir; do eval "val=\"\$$var\"" case $val in *+ ) @@ -1004,8 +1004,9 @@ OIFS="$IFS" IFS="$DIFS" for var in prefix exec_prefix bindir sbindir libexecdir mandir \ - sysconfdir datadir includedir localstatedir runtimedir \ - logfiledir proxycachedir suexec_docroot suexec_logexec; do + sysconfdir datadir iconsdir htdocsdir cgidir includedir \ + localstatedir runtimedir logfiledir proxycachedir \ + suexec_docroot suexec_logexec; do eval "val=\"\$$var\
cvs commit: apache-1.3/src CHANGES Configure
wsanchez99/05/03 18:07:32 Modified:src CHANGES Configure Log: Fix trivial but thoroughly annoying bug with the test for Configuration.tmpl being newer than Configuration. If both files are created within a minute of each other (eg. when using APACI and shadow trees), ls -lt is unable to resolve the difference and orders them as specified on the command line. For example, on Linux: [calloway:ttypa:/tmp] tritan% touch 1 2 [calloway:ttypa:/tmp] tritan% ls -lt 1 2 -rw-r--r-- 1 tritan mit 0 May 3 20:52 1 -rw-r--r-- 1 tritan mit 0 May 3 20:52 2 [calloway:ttypa:/tmp] tritan% ls -lt 2 1 -rw-r--r-- 1 tritan mit 0 May 3 20:52 2 -rw-r--r-- 1 tritan mit 0 May 3 20:52 1 [calloway:ttypa:/tmp] tritan% touch 2 [calloway:ttypa:/tmp] tritan% ls -lt 1 2 -rw-r--r-- 1 tritan mit 0 May 3 20:53 2 -rw-r--r-- 1 tritan mit 0 May 3 20:52 1 [calloway:ttypa:/tmp] tritan% ls -lt 2 1 -rw-r--r-- 1 tritan mit 0 May 3 20:53 2 -rw-r--r-- 1 tritan mit 0 May 3 20:52 1 Change the code to fail safe in this case. Revision ChangesPath 1.1344+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1343 retrieving revision 1.1344 diff -u -r1.1343 -r1.1344 --- CHANGES 1999/05/04 00:20:02 1.1343 +++ CHANGES 1999/05/04 01:07:29 1.1344 @@ -1,5 +1,9 @@ Changes with Apache 1.3.7 + *) Fix minor but annoying bug with the test for Configuration.tmpl + being newer than Configuration so that it is less likely to fail + when using APACI and shadow sources. [Wilfredo Sanchez] + *) PORT: Add initial support for Mac OS (versions 10.0 and greater). Use Mac OS X Server layout for now. Clean up dyld code in unix/os.c, and don't install the dyld error handlers, which 1.341 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.340 retrieving revision 1.341 diff -u -r1.340 -r1.341 --- Configure 1999/05/03 23:07:42 1.340 +++ Configure 1999/05/04 01:07:30 1.341 @@ -109,7 +109,7 @@ ## Now see if Configuration.tmpl is more recent than $file. If ## so, then we complain and bail out ## -if ls -lt Configuration.tmpl $file | head -1 | \ +if ls -lt $file Configuration.tmpl | head -1 | \ grep 'Configuration.tmpl' > /dev/null then echo "Configuration.tmpl is more recent than $file;"
cvs commit: apache-1.3/src CHANGES
wsanchez99/05/03 17:20:09 Modified:src CHANGES Log: Note Mac OS X support changes; renamed Rhapsody layout. Revision ChangesPath 1.1343+9 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1342 retrieving revision 1.1343 diff -u -r1.1342 -r1.1343 --- CHANGES 1999/05/03 19:05:11 1.1342 +++ CHANGES 1999/05/04 00:20:02 1.1343 @@ -1,5 +1,14 @@ Changes with Apache 1.3.7 + *) PORT: Add initial support for Mac OS (versions 10.0 and + greater). Use Mac OS X Server layout for now. Clean up dyld code + in unix/os.c, and don't install the dyld error handlers, which + are no longer needed in Mac OS. [Wilfredo Sanchez] + + *) Rename Rhapsody layout to "Mac OS X Server". Change install + locations to appropriate ones for user-built (as opposed to + system) installs. [Wilfredo Sanchez] + *) Modify mod_autoindex's handling of AddDescription so that the behaviour matches the documentation. [Ken Coar] PR#1898, 3072.
cvs commit: apache-1.3 STATUS
wsanchez99/05/03 16:49:26 Modified:.STATUS Log: Revision ChangesPath 1.684 +7 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.683 retrieving revision 1.684 diff -u -r1.683 -r1.684 --- STATUS1999/05/03 21:38:01 1.683 +++ STATUS1999/05/03 23:49:25 1.684 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/05/03 21:38:01 $] + Last modified at [$Date: 1999/05/03 23:49:25 $] Release: @@ -84,6 +84,12 @@ Available Patches: + +* Fred's patch for changing the default layout on Mac OS and Mac + OS X Server. +Message-ID: <[EMAIL PROTECTED]> + Status: Ralf -1 + Alexei, Randy, Greg +1 * John Giannadrea's patch for ceiling on file size for mmap (PR#4122) Message-ID: <[EMAIL PROTECTED]>
cvs commit: apache-1.3/htdocs/manual dso.html
wsanchez99/05/03 16:23:04 Modified:htdocs/manual dso.html Log: Add Apple platforms. Update the date. Revision ChangesPath 1.12 +3 -1 apache-1.3/htdocs/manual/dso.html Index: dso.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/dso.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dso.html 1999/05/03 22:47:08 1.11 +++ dso.html 1999/05/03 23:23:03 1.12 @@ -166,7 +166,7 @@ Apache's src/Configure script currently has only limited but adequate built-in knowledge on how to compile DSO files, because as already mentioned this is heavily platform-dependent. Nevertheless all major Unix -platforms are supported. The definitive current state (May 1998) is this: +platforms are supported. The definitive current state (May 1999) is this: @@ -189,6 +189,8 @@ o AIX(3.2, 4.1.5, 4.2, 4.3) o ReliantUNIX/SINIX (5.43) o SVR4 (-) +o Mac OS X Server(1.0) +o Mac OS (10.0 preview 1)
cvs commit: apache-1.3/src/include ap_config.h hsregex.h
wsanchez99/05/03 16:07:54
Modified:src Configure
src/helpers GuessOS
src/include ap_config.h hsregex.h
Log:
Add support for Mac OS (versions 10.0 and greater), using macro MAC_OS.
Rename RHAPSODY macro to MAC_OS_X_SERVER.
Revision ChangesPath
1.340 +7 -2 apache-1.3/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- Configure 1999/04/29 18:48:53 1.339
+++ Configure 1999/05/03 23:07:42 1.340
@@ -490,9 +490,14 @@
;;
*-apple-rhapsody*)
OS='Mac OS X Server'
- CFLAGS="$CFLAGS -DRHAPSODY"
+ CFLAGS="$CFLAGS -DMAC_OS_X_SERVER"
DEF_WANTHSREGEX=yes
;;
+*-apple-macos*)
+ OS='Mac OS'
+ CFLAGS="$CFLAGS -DMAC_OS"
+ DEF_WANTHSREGEX=yes
+ ;;
*-dec-osf*)
OS='DEC OSF/1'
CFLAGS="$CFLAGS -DOSF1"
@@ -999,7 +1004,7 @@
LDFLAGS_SHLIB="-shared"
LDFLAGS_SHLIB_EXPORT="-rdynamic"
;;
- *-apple-rhapsody*)
+ *-apple-rhapsody* | *-apple-macos* )
LD_SHLIB="cc"
CFLAGS_SHLIB=""
LDFLAGS_SHLIB='$(EXTRA_LDFLAGS) -bundle -undefined suppress'
1.60 +6 -1 apache-1.3/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /home/cvs/apache-1.3/src/helpers/GuessOS,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- GuessOS 1999/04/21 14:30:25 1.59
+++ GuessOS 1999/05/03 23:07:45 1.60
@@ -243,9 +243,14 @@
Rhapsody:*:*:*)
case "${MACHINE}" in
- Power*) MACHINE=powerpc ;;
+ "Power Macintosh") MACHINE=powerpc ;;
esac
echo "${MACHINE}-apple-rhapsody${RELEASE}"; exit 0
+ ;;
+
+"Mac OS":*:*:*)
+ MACHINE=`uname -p`
+ echo "${MACHINE}-apple-macos${RELEASE}"; exit 0
;;
"RISC iX":*)
1.256 +41 -9 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===
RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- ap_config.h 1999/04/27 20:36:29 1.255
+++ ap_config.h 1999/05/03 23:07:52 1.256
@@ -384,12 +384,18 @@
#define NO_USE_SIGACTION
#define HAVE_SYSLOG 1
-#elif defined(RHAPSODY) /* Mac OS X Server */
+#elif defined(MAC_OS) || defined(MAC_OS_X_SERVER) /* Mac OS (>= 10.0) and
Mac OS X Server (<= 5.x) */
+#define HAVE_DYLD
+#ifdef MAC_OS_X_SERVER
+#define DYLD_CANT_UNLOAD
+#endif /* MAC_OS_X_SERVER */
#define HAVE_GMTOFF
#define HAVE_MMAP
#define USE_MMAP_FILES
#define USE_MMAP_SCOREBOARD
+#ifdef MAC_OS_X_SERVER
#define MAP_TMPFILE
+#endif /* MAC_OS_X_SERVER */
#define HAVE_RESOURCE
#define HAVE_SNPRINTF
#define JMP_BUF jmp_buf
@@ -397,26 +403,52 @@
#define USE_FLOCK_SERIALIZED_ACCEPT
#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT
/*
- * If you are using APACI, (you should be on Rhapsody) these
- * values are set at configure time. These are here as reference;
- * the apache that is built into Rhapsody is configured with
- * these values.
+ * If you are using APACI, (you probably should be on Mac OS) these
+ * values are set at configure time.
*/
-#if 0
+#ifndef HTTPD_ROOT
#define HTTPD_ROOT "/Local/Library/WebServer"
+#endif
+#ifndef DOCUMENT_LOCATION
#define DOCUMENT_LOCATION HTTPD_ROOT "/Documents"
+#endif
+#ifndef DEFAULT_XFERLOG
#define DEFAULT_XFERLOG "Logs/Access"
+#endif
+#ifndef DEFAULT_ERRORLOG
#define DEFAULT_ERRORLOG"Logs/Errors"
+#endif
+#ifndef DEFAULT_PIDLOG
#define DEFAULT_PIDLOG "Logs/Process"
+#endif
+#ifndef DEFAULT_SCOREBOARD
#define DEFAULT_SCOREBOARD "Logs/Status"
+#endif
+#ifndef DEFAULT_LOCKFILE
#define DEFAULT_LOCKFILE"Logs/Lock"
+#endif
+#ifndef SERVER_CONFIG_FILE
#define SERVER_CONFIG_FILE "Configuration/Server"
+#endif
+#ifndef RESOURCE_CONFIG_FILE
#define RESOURCE_CONFIG_FILE"Configuration/Resources"
+#endif
+#ifndef TYPES_CONFIG_FILE
#define TYPES_CONFIG_FILE "Configuration/MIME"
+#endif
+#ifndef ACCESS_CONFIG_FILE
#define ACCESS_CONFIG_FILE "Configuration/Access"
+#endif
+#ifndef DEFAULT_USER_DIR
#define DEFAULT_USER
cvs commit: apache-1.3/src/os/unix os.c
wsanchez99/05/03 16:06:06
Modified:src/os/unix os.c
Log:
Use macro "HAVE_DYLD" instead of "RHAPSODY" for dyld-specific code.
Add macro "DYLD_CANT_UNLOAD" around workaround for dyld-unloading-is-a-noop.
Revision ChangesPath
1.16 +15 -8 apache-1.3/src/os/unix/os.c
Index: os.c
===
RCS file: /home/cvs/apache-1.3/src/os/unix/os.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- os.c 1998/09/16 06:49:44 1.15
+++ os.c 1999/05/03 23:06:05 1.16
@@ -26,8 +26,15 @@
* dynamic shared object (DSO) mechanism
*/
-#ifdef RHAPSODY
+#ifdef HAVE_DYLD /* NeXT/Apple dynamic linker */
#include
+
+/*
+ * NSUnlinkModule() is a noop in old versions of dyld.
+ * Let's install an error handler to deal with "multiply defined
+ * symbol" runtime errors.
+ */
+#ifdef DYLD_CANT_UNLOAD
#include "httpd.h"
#include "http_log.h"
@@ -49,7 +56,6 @@
* every time we reload a module. Workaround here is to just
* rebind to the new symbol, and forget about the old one.
* This is crummy, because it's basically a memory leak.
- * (See Radar 2262020 against dyld).
*/
#ifdef DEBUG
@@ -73,11 +79,12 @@
abort();
}
-#endif /*RHAPSODY*/
+#endif /* DYLD_CANT_UNLOAD */
+#endif /* HAVE_DYLD */
void ap_os_dso_init(void)
{
-#if defined(RHAPSODY)
+#if defined(HAVE_DYLD) && defined(DYLD_CANT_UNLOAD)
NSLinkEditErrorHandlers handlers;
handlers.undefined = undefined_symbol_handler;
@@ -95,7 +102,7 @@
handle = shl_load(path, BIND_IMMEDIATE|BIND_VERBOSE|BIND_NOSTART, 0L);
return (void *)handle;
-#elif defined(RHAPSODY)
+#elif defined(HAVE_DYLD)
NSObjectFileImage image;
if (NSCreateObjectFileImageFromFile(path, &image) !=
NSObjectFileImageSuccess)
@@ -116,7 +123,7 @@
#if defined(HPUX) || defined(HPUX10)
shl_unload((shl_t)handle);
-#elif defined(RHAPSODY)
+#elif defined(HAVE_DYLD)
NSUnLinkModule(handle,FALSE);
#else
@@ -138,7 +145,7 @@
status = shl_findsym((shl_t *)&handle, symname, TYPE_DATA, &symaddr);
return (status == -1 ? NULL : symaddr);
-#elif defined(RHAPSODY)
+#elif defined(HAVE_DYLD)
NSSymbol symbol;
char *symname2 = (char*)malloc(sizeof(char)*(strlen(symname)+2));
sprintf(symname2, "_%s", symname);
@@ -163,7 +170,7 @@
{
#if defined(HPUX) || defined(HPUX10)
return strerror(errno);
-#elif defined(RHAPSODY)
+#elif defined(HAVE_DYLD)
return NULL;
#else
return dlerror();
cvs commit: apache-1.3/src/os/unix os.h
wsanchez99/05/03 16:03:46 Modified:src/os/unix os.h Log: On Mac OS, say "Mac OS", not "Unix". Revision ChangesPath 1.40 +4 -0 apache-1.3/src/os/unix/os.h Index: os.h === RCS file: /home/cvs/apache-1.3/src/os/unix/os.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- os.h 1999/05/02 14:01:03 1.39 +++ os.h 1999/05/03 23:03:45 1.40 @@ -60,7 +60,11 @@ #include "ap_config.h" +#ifdef MAC_OS +#define PLATFORM "Mac OS" +#else #define PLATFORM "Unix" +#endif /* * This file in included in all Apache source code. It contains definitions
cvs commit: apache-1.3 config.layout
wsanchez99/05/03 16:02:57 Modified:.config.layout Log: Rename Rhapsody layout to Mac OS X Server. Set install locations to those appropriate for custom user built Apache. Revision ChangesPath 1.7 +5 -5 apache-1.3/config.layout Index: config.layout === RCS file: /home/cvs/apache-1.3/config.layout,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- config.layout 1999/04/27 19:16:27 1.6 +++ config.layout 1999/05/03 23:02:57 1.7 @@ -62,17 +62,17 @@ # Apple's Mac OS X Server Layout - + prefix:/Local/Library/WebServer -exec_prefix: /usr +exec_prefix: /usr/local bindir:$exec_prefix/bin sbindir: $exec_prefix/sbin -libexecdir:/System/Library/Apache/Modules +libexecdir:/Local/Library/Apache/Modules mandir:$exec_prefix/share/man sysconfdir:$prefix/Configuration datadir: $prefix -includedir: /System/Library/Frameworks/Apache.framework/Versions/1.3/Headers -localstatedir: /private/var +includedir: /Local/Library/Frameworks/Apache.framework/Versions/1.3/Headers +localstatedir: /var runtimedir:$prefix/Logs logfiledir:$prefix/Logs proxycachedir: $prefix/ProxyCache
cvs commit: apache-1.3/src CHANGES
wsanchez99/04/29 09:30:53 Modified:src CHANGES Log: Add "opt" (SysV-style) layout. Submitted by: Raymond S Brand <[EMAIL PROTECTED]> Revision ChangesPath 1.1333+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1332 retrieving revision 1.1333 diff -u -r1.1332 -r1.1333 --- CHANGES 1999/04/29 15:44:28 1.1332 +++ CHANGES 1999/04/29 16:30:51 1.1333 @@ -13,6 +13,9 @@ *) Fixed the ServerSignature directive to work as documented. [Raymond S Brand <[EMAIL PROTECTED]>] PR#4248 + *) Add "opt" (SysV-style) layout to config.layout. [Raymond S Brand + <[EMAIL PROTECTED]>] + *) Add APACI --without-execstrip option which can be used to disable the stripping of executables on installation. This is very important for DSO and debugging situations. [Ralf S. Engelschall]
cvs commit: apache-1.3 config.layout
wsanchez99/04/27 12:16:37 Modified:.config.layout Log: Add "opt" (SysV-style) layout. Submitted by: Raymond S Brand <[EMAIL PROTECTED]> Revision ChangesPath 1.6 +17 -0 apache-1.3/config.layout Index: config.layout === RCS file: /home/cvs/apache-1.3/config.layout,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- config.layout 1999/03/25 16:48:15 1.5 +++ config.layout 1999/04/27 19:16:27 1.6 @@ -94,3 +94,20 @@ logfiledir:$localstatedir/log/httpd proxycachedir: $localstatedir/cache/httpd + +# According to the /opt filesystem conventions + +prefix:/opt/apache +exec_prefix: $prefix +bindir:$exec_prefix/bin +sbindir: $exec_prefix/sbin +libexecdir:$exec_prefix/libexec +mandir:$prefix/man +sysconfdir:/etc$prefix +datadir: $prefix/share +includedir:$prefix/include +localstatedir: /var$prefix +runtimedir:$localstatedir/run +logfiledir:$localstatedir/logs +proxycachedir: $localstatedir/proxy +
