cvs commit: apache-1.3/src/helpers PrintPath TestCompile findcpp.sh PrintPathOS2
jim 98/09/16 21:09:42
Modified:src CHANGES Configure
src/helpers PrintPath TestCompile findcpp.sh
Removed: src/helpers PrintPathOS2
Log:
Remove the hack of having an OS/2 version of PrintPath around.
Reviewed by: Brian Havard
Revision ChangesPath
1.1061+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1060
retrieving revision 1.1061
diff -u -r1.1060 -r1.1061
--- CHANGES 1998/09/16 19:38:26 1.1060
+++ CHANGES 1998/09/17 04:09:39 1.1061
@@ -1,4 +1,7 @@
Changes with Apache 1.3.2
+
+ *) Make PrintPath work generically instead of having one version
+ strictly for OS/2. [Jim Jagielski, Brian Havard]
*) Fix the recently introduced C header file checking: We now use the C
pre-processor pass only (and no longer the complete compiler pass) to
1.290 +2 -6 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- Configure 1998/09/16 19:38:26 1.289
+++ Configure 1998/09/17 04:09:39 1.290
@@ -257,8 +257,6 @@
TARGET=httpd
SUBTARGET=target_static
SHLIB_SUFFIX_LIST=
-AP_PRINTPATH=PrintPath
-export AP_PRINTPATH
CAT=cat
@@ -350,8 +348,6 @@
LIBS=$LIBS -lsocket -lufc -lbsd
DBM_LIB=-lgdbm
SHELL=sh
- AP_PRINTPATH=PrintPathOS2
- export AP_PRINTPATH
;;
*-hi-hiux)
OS='HI-UX'
@@ -769,7 +765,7 @@
for compilers in gcc cc acc c89
do
lookedfor=$lookedfor $compilers
- if ./helpers/$AP_PRINTPATH -s $compilers; then
+ if ./helpers/PrintPath -s $compilers; then
COMPILER=$compilers
break
fi
@@ -1225,7 +1221,7 @@
if [ .$TRANLIB != . ]; then
RANLIB=$TRANLIB
else
-if ./helpers/$AP_PRINTPATH -s ranlib; then
+if ./helpers/PrintPath -s ranlib; then
RANLIB=ranlib
else
RANLIB=true
1.13 +46 -16apache-1.3/src/helpers/PrintPath
Index: PrintPath
===
RCS file: /export/home/cvs/apache-1.3/src/helpers/PrintPath,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PrintPath 1998/09/16 20:49:23 1.12
+++ PrintPath 1998/09/17 04:09:41 1.13
@@ -22,6 +22,11 @@
echo=yes
##
+# Find out what OS we are running for later on
+##
+os=`(uname) 2/dev/null`
+
+##
# Parse command line
##
for args in $*
@@ -34,12 +39,39 @@
done
##
-# We do some funny stuff to check to see
-# if test/[] knows about -x
+# Now we make the adjustments required for OS/2 and everyone
+# else :)
+#
+# First of all, all OS/2 programs have the '.exe' extension.
+# Next, we adjust PATH (or what was given to us as PATH) to
+# be whitespace seperated directories.
+# Finally, we try to determine the best flag to use for
+# test/[] to look for an executable file. OS/2 just has '-r'
+# but with other OSs, we do some funny stuff to check to see
+# if test/[] knows about -x, which is the prefered flag.
##
-testfile=pp.t.$$
+
+if [ x$os = xOS/2 ]
+then
+ext=.exe
+pathname=`echo -E $pathname |
+ sed 's/^;/.;/
+ s/;;/;.;/g
+ s/;$/;./
+ s/;/ /g
+ s//\\//g' `
+test_exec_flag=-r
+else
+ext= # No default extensions
+pathname=`echo $pathname |
+ sed 's/^:/.:/
+ s/::/:.:/g
+ s/:$/:./
+ s/:/ /g' `
+# Here is how we test to see if test/[] can handle -x
+testfile=pp.t.$$
-cat $testfile ENDTEST
+cat $testfile ENDTEST
#!/bin/sh
if [ -x / ] || [ -x /bin ] || [ -x /bin/ls ]; then
exit 0
@@ -47,24 +79,22 @@
exit 1
ENDTEST
-if `/bin/sh $testfile 2/dev/null`; then
-test_exec_flag=-x
-else
-test_exec_flag=-r
+if `/bin/sh $testfile 2/dev/null`; then
+ test_exec_flag=-x
+else
+ test_exec_flag=-r
+fi
+rm -f $testfile
fi
-rm -f $testfile
for program in $programs
do
-for path in `echo $pathname |
- sed 's/^:/.:/
- s/::/:.:/g
- s/:$/:./
- s/:/ /g' `
+for path in $pathname
do
- if [ $test_exec_flag $path/$program ] [ ! -d $path/$program ]; then
+ if [ $test_exec_flag $path/${program}${ext} ] \
+[ ! -d $path/${program}${ext} ]; then
if [ $echo = yes ]; then
- echo $path/$program
cvs commit: apache-1.3 configure
rse 98/09/17 01:07:54 Modified:src CHANGES .configure Log: ARGL, people on sw-mod-ssl and c.i.w.s.u said they have to fix the Group directive after installing, but no one said why or wrote a problem report. We lost an else inside the configure script which forced a failure of the configuration adjustment (we have one more problem: `conf_group = #-1' is fine under BSD Make, but GNU make sees `conf_group = ' because of the hash character): Fix APACI's `Group' configuration adjustment - especially for Linux platforms where `nogroup' exists in /etc/group. Revision ChangesPath 1.1062+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1061 retrieving revision 1.1062 diff -u -r1.1061 -r1.1062 --- CHANGES 1998/09/17 04:09:39 1.1061 +++ CHANGES 1998/09/17 08:07:52 1.1062 @@ -1,4 +1,7 @@ Changes with Apache 1.3.2 + + *) Fix APACI's `Group' configuration adjustment - especially for Linux + platforms where `nogroup' exists in /etc/group. [Ralf S. Engelschall] *) Make PrintPath work generically instead of having one version strictly for OS/2. [Jim Jagielski, Brian Havard] 1.48 +1 -0 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- configure 1998/09/16 20:37:41 1.47 +++ configure 1998/09/17 08:07:53 1.48 @@ -817,6 +817,7 @@ if [ .$confadjust = .1 ]; then if [ .`egrep '^nobody:' /etc/group` != . ]; then conf_group=nobody +else if [ .`egrep '^nogroup:' /etc/group` != . ]; then conf_group=nogroup fi
cvs commit: apache-1.3/src CHANGES
rse 98/09/17 01:26:49 Modified:src CHANGES Log: Add the correct the PR number. PS: Wasn't there another PR speaking about the header checks? I cannot find it in the bugdb. When someone finds it, please it add here, too. Revision ChangesPath 1.1063+1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1062 retrieving revision 1.1063 diff -u -r1.1062 -r1.1063 --- CHANGES 1998/09/17 08:07:52 1.1062 +++ CHANGES 1998/09/17 08:26:47 1.1063 @@ -16,7 +16,7 @@ the possibility to override it manually via APACI or src/Configuration. As a fallback for the header check itself we can directly check the existance of the file under /usr/include, too. - [Ralf S. Engelschall] PR + [Ralf S. Engelschall] PR#2777 *) PORT: Added RHAPSODY (Mac OS X Server) support. MAP_TMPFILE defined as an alternate mechanism for mmap'd shared memory for RHAPSODY.
cvs commit: apache-1.3 Makefile.tmpl
rse 98/09/17 01:59:09
Modified:src CHANGES
.Makefile.tmpl
Log:
Remove redundant substitutions in top-level Makefile.tmpl
Revision ChangesPath
1.1064+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1063
retrieving revision 1.1064
diff -u -r1.1063 -r1.1064
--- CHANGES 1998/09/17 08:26:47 1.1063
+++ CHANGES 1998/09/17 08:59:07 1.1064
@@ -1,5 +1,8 @@
Changes with Apache 1.3.2
+ *) Remove redundant substitutions in top-level Makefile.tmpl.
+ [Ralf S. Engelschall]
+
*) Fix APACI's `Group' configuration adjustment - especially for Linux
platforms where `nogroup' exists in /etc/group. [Ralf S. Engelschall]
1.46 +0 -1 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Makefile.tmpl 1998/08/12 11:33:37 1.45
+++ Makefile.tmpl 1998/09/17 08:59:08 1.46
@@ -377,7 +377,6 @@
cat $(TOP)/conf/$${conf}-dist ) |\
sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
-e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
- -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
cvs commit: apache-1.3/htdocs/manual/mod core.html mod_actions.html mod_alias.html mod_auth_dbm.html mod_autoindex.html mod_expires.html mod_include.html mod_mime.html mod_negotiation.html mod_rewrite.html
coar98/09/17 05:06:43
Modified:htdocs/manual content-negotiation.html
htdocs/manual/mod core.html mod_actions.html mod_alias.html
mod_auth_dbm.html mod_autoindex.html
mod_expires.html mod_include.html mod_mime.html
mod_negotiation.html mod_rewrite.html
Log:
Fix some typos and inaccuracies and incorrectnesses.
PR: 3016
Submitted by: Youichirou Koga [EMAIL PROTECTED]
Revision ChangesPath
1.16 +3 -3 apache-1.3/htdocs/manual/content-negotiation.html
Index: content-negotiation.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/content-negotiation.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- content-negotiation.html 1998/05/20 14:22:27 1.15
+++ content-negotiation.html 1998/09/17 12:06:38 1.16
@@ -422,7 +422,7 @@
extension, and the order of the extensions is normally irrelevant
(see A HREF=mod/mod_mime.htmlmod_mime/A documentation for details).
P
-A typical file has a mime-type extension (e.g. SAMPhtml/SAMP),
+A typical file has a MIME-type extension (e.g. SAMPhtml/SAMP),
maybe an encoding extension (e.g. SAMPgz/SAMP and of course a
language extension (e.g. SAMPen/SAMP) when we have different
language variants of this file.
@@ -496,9 +496,9 @@
hyperlink references.
P
-If you want to continue to use a mime-type in your hyperlinks (e.g.
+If you want to continue to use a MIME-type in your hyperlinks (e.g.
SAMPfoo.html/SAMP) the language extension (including an encoding
extension
-if there is one) must be on the right hand side of the mime-type extension
+if there is one) must be on the right hand side of the MIME-type extension
(e.g. SAMPfoo.html.en/SAMP).
1.135 +4 -4 apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- core.html 1998/09/07 08:31:45 1.134
+++ core.html 1998/09/17 12:06:39 1.135
@@ -513,7 +513,7 @@
A
HREF=directive-dict.html#Syntax
REL=Help
-STRONGSyntax:/STRONG/A DefaultType EMmime-type/EMBR
+STRONGSyntax:/STRONG/A DefaultType EMMIME-type/EMBR
A
HREF=directive-dict.html#Default
REL=Help
@@ -1213,7 +1213,7 @@
P HR
H2A NAME=includeInclude directive/A/H2
-STRONGSyntax: (Apache 1.2)/STRONG Include EMfilename/EMBR
+STRONGSyntax:/STRONG Include EMfilename/EMBR
A
HREF=directive-dict.html#Context
REL=Help
@@ -2074,7 +2074,7 @@
STRONGSee also:/STRONG
A HREF=../vhosts/index.htmlApache Virtual Host documentation/A
-
+HR
H2A NAME=optionsOptions directive/A/H2
!--%plaintext lt;?INDEX {\tt Options} directivegt; --
A
@@ -2887,7 +2887,7 @@
it is far more efficient. The server is started once, and services all
subsequent connections. If you intend running Apache to serve a busy site,
standalone will probably be your only option.P
-
+HR
H2A NAME=startserversStartServers directive/A/H2
!--%plaintext lt;?INDEX {\tt StartServers} directivegt; --
A
1.10 +2 -2 apache-1.3/htdocs/manual/mod/mod_actions.html
Index: mod_actions.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_actions.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_actions.html 1998/05/20 14:12:52 1.9
+++ mod_actions.html 1998/09/17 12:06:39 1.10
@@ -39,7 +39,7 @@
A
HREF=directive-dict.html#Syntax
REL=Help
-STRONGSyntax:/STRONG/A Action EMmime-type cgi-script/EMBR
+STRONGSyntax:/STRONG/A Action EMMIME-type cgi-script/EMBR
A
HREF=directive-dict.html#Context
REL=Help
@@ -65,7 +65,7 @@
/P
P
This directive adds an action, which will activate EMcgi-script/EM when
-a file of content type EMmime-type/EM is requested. It sends the
+a file of content type EMMIME-type/EM is requested. It sends the
URL and file path of the requested document using the standard
CGI PATH_INFO and PATH_TRANSLATED environment variables.
/P
1.21 +2 -1 apache-1.3/htdocs/manual/mod/mod_alias.html
Index: mod_alias.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_alias.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_alias.html1998/05/20 14:12:53 1.20
+++ mod_alias.html1998/09/17 12:06:39 1.21
@@ -211,7 +211,8 @@
A
HREF=directive-dict.html#Syntax
REL=Help
-STRONGSyntax:/STRONG/A
cvs commit: apache-1.3/src CHANGES
stoddard98/09/17 05:15:32 Modified:src CHANGES Log: Remove 64 thread limit on Win32. Sorry about the multiple commits. Will not happen again. Revision ChangesPath 1.1065+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1064 retrieving revision 1.1065 diff -u -r1.1064 -r1.1065 --- CHANGES 1998/09/17 08:59:07 1.1064 +++ CHANGES 1998/09/17 12:15:30 1.1065 @@ -1,5 +1,8 @@ Changes with Apache 1.3.2 + *) Remove 64 thread limit on Win32. + [Bill Stoddard [EMAIL PROTECTED]] + *) Remove redundant substitutions in top-level Makefile.tmpl. [Ralf S. Engelschall]
cvs commit: apache-1.3/htdocs/manual/vhosts details.html host.html virtual-host.html
coar98/09/17 07:52:04 Modified:htdocs/manual suexec.html upgrading_to_1_3.html htdocs/manual/misc howto.html htdocs/manual/vhosts details.html host.html virtual-host.html Log: Some more consistency (cgi - CGI) fixes, and shortened long lines. (There are about 200 more 80 lines in the dos, but I haven't the time now to fix 'em. Oh well.) Revision ChangesPath 1.21 +2 -1 apache-1.3/htdocs/manual/suexec.html Index: suexec.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/suexec.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- suexec.html 1998/07/30 16:42:47 1.20 +++ suexec.html 1998/09/17 14:52:01 1.21 @@ -400,7 +400,8 @@ P ALIGN=LEFT If your installation requires location of the wrapper program in a different -directory, either add CODE-DSUEXEC_BIN=\EMlt;/your/path/to/suexecgt;/EM\/CODE +directory, either add +CODE-DSUEXEC_BIN=\EMlt;/your/path/to/suexecgt;/EM\/CODE to your CFLAGS (or edit src/include/httpd.h) and recompile your Apache server. See A HREF=install.htmlCompiling and Installing Apache/A (and the SAMPINSTALL/SAMP file in the source distribution) 1.32 +2 -1 apache-1.3/htdocs/manual/upgrading_to_1_3.html Index: upgrading_to_1_3.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/upgrading_to_1_3.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- upgrading_to_1_3.html 1998/09/17 14:14:49 1.31 +++ upgrading_to_1_3.html 1998/09/17 14:52:01 1.32 @@ -233,7 +233,8 @@ To avoid symbol clashes with third-party code compiled into the server, the general prefix `CODEap_/CODE' was globally applied to the following classes of symbols: Apache provided general functions (EMe.g./EM, - CODEap_cpystrn/CODE), public API functions (EMe.g./EM, CODEpalloc/CODE, + CODEap_cpystrn/CODE), public API functions (EMe.g./EM, + CODEpalloc/CODE, CODEbgets/CODE) and private functions which can't be made static (because of cross-object usage) but should be (EMe.g./EM, CODEnew_connection/CODE). For backward source compatibility with 1.9 +6 -4 apache-1.3/htdocs/manual/misc/howto.html Index: howto.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/howto.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- howto.html1998/09/17 14:14:53 1.8 +++ howto.html1998/09/17 14:52:02 1.9 @@ -60,13 +60,14 @@ http://www.apache.org;. The second option is to set up a CODEScriptAlias/CODE pointing to -a STRONGcgi script/STRONG which outputs a 301 or 302 status and the +a STRONGCGI script/STRONG which outputs a 301 or 302 status and the location of the other server./P -PBy using a STRONGcgi-script/STRONG you can intercept various requests +PBy using a STRONGCGI script/STRONG you can intercept various requests and -treat them specially, EMe.g./EM, you might want to intercept STRONGPOST/STRONG +treat them specially, EMe.g./EM, you might want to intercept +STRONGPOST/STRONG requests, so that the client isn't redirected to a script on the other server which expects POST information (a redirect will lose the POST information.) You might also want to use a CGI script if you don't @@ -108,7 +109,8 @@ PThe correct procedure is to move the logfile, then signal Apache to tell it to reopen the logfiles./P -PApache is signaled using the STRONGSIGHUP/STRONG (-1) signal. EMe.g./EM +PApache is signaled using the STRONGSIGHUP/STRONG (-1) signal. +EMe.g./EM BLOCKQUOTECODE mv access_log access_log.oldBR kill -1 `cat httpd.pid` 1.9 +3 -2 apache-1.3/htdocs/manual/vhosts/details.html Index: details.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/vhosts/details.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- details.html 1998/09/17 14:15:02 1.8 +++ details.html 1998/09/17 14:52:03 1.9 @@ -307,7 +307,7 @@ number for the request. The request is only caught if the port number to which the client sent the request matches the port number of your CODE_default_/CODE vhost which is your standard CODEPort/CODE -by default. A wildcard port can be specified (EMi.e./EM +by default. A wildcard port can be specified (EMi.e./EM, CODE_default_:*/CODE) to catch requests to any available port. P @@ -322,7 +322,8 @@ LIA
cvs commit: apache-1.3 STATUS
rse 98/09/17 08:28:06 Modified:.STATUS Log: Update to current state. Revision ChangesPath 1.465 +5 -25 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.464 retrieving revision 1.465 diff -u -r1.464 -r1.465 --- STATUS1998/09/11 16:35:07 1.464 +++ STATUS1998/09/17 15:28:05 1.465 @@ -2,8 +2,10 @@ Release: -1.3.2: In development. Release proposed for Friday, September 18th, 1998 - Ralf is volunteering as the release manager. +1.3.2: In preparation for a release. + - Tarball rolling proposed for Friday, September 18th, 1998 + - Release and announcement proposed for Monday, September 21th, 1998 + - Ralf is the release manager. 1.3.1: Tagged and rolled on July 19. Announced and released. @@ -24,30 +26,8 @@ Unix 1.3.2 RELEASE SHOWSTOPPERS: -* header detection is broken; eg. sys/resource.h often requires - other includes first, etc. This breaks things like RLimit* - on many platforms. - - -- Ralf already hacked on this, but it's even more complicated - than we initially though. Because src/Configure has to check how CPP - can be called. On gcc systems that's gcc -E, on others there is a cpp - in PATH. But on the remaining systems there is neither the canonical - -E nor cpp. I need more time for figuring out what's the best - approach. But currently I'm totally busy with mod_ssl and a - presentation I've to do on next Monday. I expect to finish this - before the 18th of September (1.3.2 release date). - - -- Also, the return type of main is wrong in the test code and a - test test needs to be done to ensure we can be successful with - any (eg. stdio.h) header and print an error if not. Otherwise, you - have _very_ difficult to resolve problems if you do something - like: link in a library on Solaris that also requires -lsocket - but don't explicitly put that on your EXTRA_LIBS line; then - the final result will link fine because Apache adds them for itself, - but all the testcompiles will fail because they aren't there at - that stage. +* none - Documentation that needs writing: * Need a document explaining mod_rewrite/UseCanonicalName off based
cvs commit: apache-1.3 INSTALL
rse 98/09/17 09:12:49 Modified:.INSTALL Log: Add note about AIX. Submitted by: Jens-Uwe Mager [EMAIL PROTECTED] Revision ChangesPath 1.41 +8 -1 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- INSTALL 1998/09/12 11:21:59 1.40 +++ INSTALL 1998/09/17 16:12:49 1.41 @@ -418,7 +418,14 @@ installation process by using the `install-quiet' target. Example: $ make install-quiet root=/tmp/apache-root - + + Notes for specific platforms: + + NOTE: Please note that for re-installing Apache on AIX you should use the + command `slibclean' before using `make install' to really unload + any old versions of the DSO's that might still be cached by the + dynamic loader. + 6. Testing the package ---
cvs commit: apache-1.3 STATUS
rse 98/09/17 09:16:57 Modified:.STATUS Log: Solaris 2.6 is fine, too. Revision ChangesPath 1.467 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.466 retrieving revision 1.467 diff -u -r1.466 -r1.467 --- STATUS1998/09/17 15:51:53 1.466 +++ STATUS1998/09/17 16:16:56 1.467 @@ -13,7 +13,7 @@ o HPUX 10.20 . Ok (Ralf S. Engelschall) o AIX 4.1.5 .. Ok (Jens-Uwe Mager) o AIX (general)... Ok (Bill Stoddard) - o Solaris 2.6 ?? (??) + o Solaris 2.6 Ok (Ralf S. Engelschall) o SunOS 4.1.3 ?? (??) o Digital Unix 4.0 ... ?? (??) o IRIX 6.2 ... ?? (??)
cvs commit: apache-1.3 STATUS
rse 98/09/17 09:30:47 Modified:.STATUS Log: Remember our 1.3.2 TODO list... Revision ChangesPath 1.468 +11 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.467 retrieving revision 1.468 diff -u -r1.467 -r1.468 --- STATUS1998/09/17 16:16:56 1.467 +++ STATUS1998/09/17 16:30:46 1.468 @@ -29,6 +29,17 @@ RELEASE SHOWSTOPPERS: +* IRIX semctl problem: we should switch from a IPC based to FCNTL based mutex + Status: How volunteers? Dean? + +* Ultrix rlim_t problem: we have to find out why it's now undefined under Ultrix + Status: Under repair by Ben Hyde? + +* DB1.x vs. DB2.x problem: we should add DB2.x support to mod_auth_db.c to + get rid of glibc2 problems (and FreeBSD ports problems in case the DB2.x + package is installed) + Status: Under construction by Dan Jacobowitz [EMAIL PROTECTED] + WIN32 1.3.2 RELEASE SHOWSTOPPERS: * can not build tarball until someone verifies the final code
cvs commit: apache-1.3/src CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/include/ap_mmn.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ap_mmn.h 1998/09/06 19:23:51 1.7
+++ ap_mmn.h 1998/09/17 20:23:41 1.8
@@ -177,10 +177,11 @@
*request_rec* instead of pool*
*(for implementing better error reporting).
* 19980906 (1.3.2-dev) - added ap_md5_binary()
+ * 19980917 (1.3.2-dev) - bs2000: changed os_set_authfile() to
os_set_account()
*/
#ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 19980906
+#define MODULE_MAGIC_NUMBER_MAJOR 19980917
#endif
#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */
#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward
compat */
1.241 +2 -2 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- httpd.h 1998/09/17 15:56:03 1.240
+++ httpd.h 1998/09/17 20:23:42 1.241
@@ -984,12 +984,12 @@
#endif
#ifdef _OSD_POSIX
-extern const char *os_set_authfile(pool *p, const char *filename);
+extern const char *os_set_account(pool *p, const char *account);
extern int os_init_job_environment(server_rec *s, const char *user_name);
#endif /* _OSD_POSIX */
char *ap_get_local_host(pool *);
-unsigned long ap_get_virthost_addr(char *hostname, unsigned short *port);
+unsigned long ap_get_virthost_addr(const char *hostname, unsigned short
*port);
extern API_VAR_EXPORT time_t ap_restart_time;
1.230 +4 -4 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.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- http_core.c 1998/09/10 17:36:15 1.229
+++ http_core.c 1998/09/17 20:23:45 1.230
@@ -2302,14 +2302,14 @@
}
#ifdef _OSD_POSIX /* BS2000 Logon Passwd file */
-static const char *set_bs2000_authfile(cmd_parms *cmd, void *dummy, char
*name)
+static const char *set_bs2000_account(cmd_parms *cmd, void *dummy, char
*name)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
return err;
}
-return os_set_authfile(cmd-pool, name);
+return os_set_account(cmd-pool, name);
}
#endif /*_OSD_POSIX*/
@@ -2624,8 +2624,8 @@
{ NameVirtualHost, ap_set_name_virtual_host, NULL, RSRC_CONF, TAKE1,
A numeric IP address:port, or the name of a host },
#ifdef _OSD_POSIX
-{ BS2000AuthFile, set_bs2000_authfile, NULL, RSRC_CONF, TAKE1,
- Name of server User's bs2000 logon password file (read-protected) },
+{ BS2000Account, set_bs2000_account, NULL, RSRC_CONF, TAKE1,
+ Name of server User's bs2000 logon account name },
#endif
{ ServerTokens, set_serv_tokens, NULL, RSRC_CONF, TAKE1,
Determine tokens displayed in the Server: header - Min(imal), OS or Full
},
1.4 +22 -98apache-1.3/src/os/bs2000/bs2login.c
Index: bs2login.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/bs2login.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bs2login.c1998/07/08 17:47:24 1.3
+++ bs2login.c1998/09/17 20:23:46 1.4
@@ -60,125 +60,49 @@
#include http_config.h
#include http_log.h
-static const char *bs2000_authfile = NULL;
+static const char *bs2000_account = NULL;
-/* This routine is called by http_core for the BS2000AuthFile directive */
-/* It stores the file name (after a quick check for validity) for later use
*/
-const char *os_set_authfile(pool *p, const char *name)
+/* This routine is called by http_core for the BS2000Account directive */
+/* It stores the account name for later use */
+const char *os_set_account(pool *p, const char *account)
{
-struct stat stbuf;
-char *filename;
+if (bs2000_account != NULL strcasecmp(bs2000_account, account) != 0)
+return BS2000Account: can be defined only once.;
-filename = ap_server_root_relative(p, name);
-
-/* auth file must exist */
-if (stat(filename, stbuf) != 0) {
- return ap_pstrcat(p, Unable to access bs2000 auth file ,
-filename, NULL);
- exit(APEXIT_CHILDFATAL);
-}
-
-/* auth file must be owned by root, and not readable/writable by
everyone else */
-if (stbuf.st_uid != 0) {
- return ap_pstrcat(p, BS2000 auth file , filename,
- is not owned
cvs commit: apache-1.3/src/include httpd.h
martin 98/09/17 13:39:27 Modified:src/include httpd.h Log: Oops: I inadvertently dropped Dean's const hostname change of Rev. 1.239 Revision ChangesPath 1.242 +1 -1 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.241 retrieving revision 1.242 diff -u -r1.241 -r1.242 --- httpd.h 1998/09/17 20:23:42 1.241 +++ httpd.h 1998/09/17 20:39:24 1.242 @@ -989,7 +989,7 @@ #endif /* _OSD_POSIX */ char *ap_get_local_host(pool *); -unsigned long ap_get_virthost_addr(const char *hostname, unsigned short *port); +unsigned long ap_get_virthost_addr(char *hostname, unsigned short *port); extern API_VAR_EXPORT time_t ap_restart_time;
cvs commit: apache-1.3/src BUILD.NOTES PORTING
jim 98/09/17 14:13:59 Modified:src PORTING Added: src BUILD.NOTES Log: Create an OS-specific notes file Revision ChangesPath 1.33 +0 -11 apache-1.3/src/PORTING Index: PORTING === RCS file: /export/home/cvs/apache-1.3/src/PORTING,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- PORTING 1998/07/13 12:35:51 1.32 +++ PORTING 1998/09/17 21:13:58 1.33 @@ -373,14 +373,3 @@ Good luck and happy porting! - - -Appendix: OS-Specific Notes: - -A/UX: - Don't even try with cc. Instead, use gcc-2.7.2 and the libUTIL.a - function library, both of which are available on jagubox.gsfc.nasa.gov. - libUTIL.a includes many basic functions that Apache (and other software) - requires as well as fixed versions of functions in libc.a. Contact - Jim Jagielski ([EMAIL PROTECTED]) if you need a precompiled build for - A/UX 3.1.x. 1.1 apache-1.3/src/BUILD.NOTES Index: BUILD.NOTES === OS Specific notes for building/compiling Apache - Introduction: - Apache has been ported to a wide variety of platforms, from multiple UNIX variants to OS/2 to Windows95/NT. In building and/or compiling Apache on some platforms, there are some hints and notes which may help you if you run into problems. - A/UX: - Don't even try with cc. Instead, use gcc-2.7.2 and the libUTIL.a function library, both of which are available on jagubox.gsfc.nasa.gov. libUTIL.a includes many basic functions that Apache (and other software) requires as well as fixed versions of functions in libc.a. Contact Jim Jagielski ([EMAIL PROTECTED]) if you need a precompiled build for A/UX 3.1.x.
