apache 1.3b3 plus no2slash-loop-fix patch
This commit is contained in:
marc
parent
9c16b034ba
commit
84f92a869a
@ -1,17 +1,27 @@
|
||||
# New ports collection makefile for: apache HTTPD
|
||||
# Version required: 1.3a1
|
||||
# Version required: 1.3b3
|
||||
# Date created: 17 Nov 1997
|
||||
# Whom: ejovi
|
||||
#
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 1997/11/17 23:01:02 joey Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 1998/02/17 04:00:35 marc Exp $
|
||||
#
|
||||
|
||||
DISTNAME= apache_1.3a1
|
||||
PKGNAME= apache-1.3a1
|
||||
DISTNAME= apache_1.3b3
|
||||
PKGNAME= apache-1.3b3
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= ftp://www.apache.org/apache/dist/
|
||||
|
||||
MAINTAINER= joey@OpenBSD.ORG
|
||||
# Official apache patches
|
||||
#
|
||||
PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3b3/
|
||||
PATCHFILES= no2slash-loop-fix.patch
|
||||
.if defined(PATCH_DEBUG)
|
||||
PATCH_DIST_ARGS=-d ${WRKSRC}/src/main -E ${PATCH_STRIP}
|
||||
.else
|
||||
PATCH_DIST_ARGS=-d ${WRKSRC}/src/main --forward --quiet -E ${PATCH_DIST_STRIP}
|
||||
.endif
|
||||
|
||||
MAINTAINER= ports@OpenBSD.ORG
|
||||
|
||||
# Set it for local-supplied patch, f.e.
|
||||
# VERS_ID = mods-1.0/me
|
||||
@ -25,11 +35,11 @@ post-patch:
|
||||
.endif
|
||||
|
||||
post-install:
|
||||
@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
|
||||
echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
|
||||
echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
|
||||
echo "[ -x /usr/local/sbin/httpd ] && /usr/local/sbin/httpd && echo -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
|
||||
chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
|
||||
fi
|
||||
@$(ECHO) ""
|
||||
@$(ECHO) "*** To complete the installation of $(DISTNAME)"
|
||||
@$(ECHO) "*** you should modify the file /etc/rc.local to start"
|
||||
@$(ECHO) "*** ${PREFIX}/sbin/httpd at system startup."
|
||||
@$(ECHO) "*** See the rc(8) manual page for more information."
|
||||
@$(ECHO) ""
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
#
|
||||
# Makefile for building and installing apache
|
||||
#
|
||||
SERVERROOT=@@PREFIX@@
|
||||
|
||||
all::
|
||||
cd src; ${MAKE} PREFIX=@@PREFIX@@ $@
|
||||
|
||||
@ -9,18 +11,67 @@ configure::
|
||||
|
||||
INSTALL_FILE=${INSTALL} -c -m 644 -o bin -g bin
|
||||
|
||||
CONF_DIR= @@PREFIX@@/etc/apache
|
||||
CONF_DIR= $(SERVERROOT)/etc/apache
|
||||
DOC_DIR= $(SERVERROOT)/www/docs
|
||||
DOC_FILES= apache_pb.gif index.html
|
||||
|
||||
MAN_DIR= $(SERVERROOT)/www/docs/manual
|
||||
MAN_FILES= LICENSE TODO bind.html cgi_path.html content-negotiation.html \
|
||||
custom-error.html dns-caveats.html env.html footer.html \
|
||||
handler.html header.html index.html install.html \
|
||||
install_1_1.html invoking.html keepalive.html location.html \
|
||||
man-template.html multilogs.html process-model.html \
|
||||
new_features_1_0.html new_features_1_1.html \
|
||||
new_features_1_2.html new_features_1_3.html sections.html \
|
||||
sourcereorg.html stopping.html suexec.html unixware.html \
|
||||
upgrading_to_1_3.html windows.html
|
||||
|
||||
IMG_DIR= $(SERVERROOT)/www/docs/manual/images
|
||||
IMG_FILES= home.gif index.gif sub.gif
|
||||
|
||||
MISC_DIR= $(SERVERROOT)/www/docs/manual/misc
|
||||
MISC_FILES= API.html FAQ.html client_block_api.html compat_notes.html \
|
||||
descriptors.html fin_wait_2.html footer.html \
|
||||
header.html howto.html index.html known_bugs.html \
|
||||
known_client_problems.html nopgp.html perf-bsd44.html \
|
||||
perf-dec.html perf-hp.html perf-tuning.html perf.html \
|
||||
security_tips.html vif-info.html windoz_keepalive.html
|
||||
|
||||
MOD_DIR= $(SERVERROOT)/www/docs/manual/mod
|
||||
MOD_FILES= core.html directive-dict.html directives.html \
|
||||
footer.html header.html index.html mod_access.html \
|
||||
mod_actions.html mod_alias.html mod_asis.html mod_auth.html \
|
||||
mod_auth_anon.html mod_auth_db.html mod_auth_dbm.html \
|
||||
mod_auth_msql.html mod_autoindex.html mod_browser.html \
|
||||
mod_cern_meta.html mod_cgi.html mod_cookies.html \
|
||||
mod_digest.html mod_dir.html mod_dld.html mod_dll.html \
|
||||
mod_env.html mod_example.html mod_expires.html \
|
||||
mod_headers.html mod_imap.html mod_include.html mod_info.html \
|
||||
mod_isapi.html mod_log_agent.html mod_log_common.html \
|
||||
mod_log_config.html mod_log_referer.html mod_mime.html \
|
||||
mod_mime_magic.html mod_negotiation.html mod_proxy.html \
|
||||
mod_rewrite.html mod_setenvif.html mod_speling.html \
|
||||
mod_status.html mod_unique_id.html mod_userdir.html \
|
||||
mod_usertrack.html
|
||||
|
||||
VHOST_DIR= $(SERVERROOT)/www/docs/manual/vhosts
|
||||
VHOST_FILES= details.html details_1_2.html examples.html fd-limits.html \
|
||||
footer.html header.html host.html index.html \
|
||||
ip-based.html name-based.html vhosts-in-depth.html \
|
||||
virtual-host.html
|
||||
|
||||
install::
|
||||
-mkdir -p ${CONF_DIR}
|
||||
-mkdir -p @@PREFIX@@/www/data
|
||||
-mkdir -p @@PREFIX@@/www/icons
|
||||
-mkdir -p @@PREFIX@@/www/cgi-bin
|
||||
${INSTALL} -c -s -m 755 -o root src/httpd @@PREFIX@@/sbin
|
||||
${INSTALL} -c -m 644 -o nobody icons/* @@PREFIX@@/www/icons
|
||||
-mkdir -p ${MAN_DIR}
|
||||
-mkdir -p $(SERVERROOT)/www/data
|
||||
-mkdir -p $(SERVERROOT)/www/icons
|
||||
-mkdir -p $(SERVERROOT)/www/cgi-bin
|
||||
${INSTALL} -c -s -m 755 -o root src/httpd $(SERVERROOT)/sbin
|
||||
${INSTALL} -c -m 644 -o nobody icons/* $(SERVERROOT)/www/icons
|
||||
for file in httpd.conf srm.conf access.conf ; do \
|
||||
if [ ! -f ${CONF_DIR}/$$file ] ; then \
|
||||
${INSTALL_FILE} conf/$$file-dist ${CONF_DIR}/$$file ; \
|
||||
sed -e "s#@@ServerRoot@@#${SERVERROOT}#g" < conf/$$file-dist > conf/$$file ; \
|
||||
${INSTALL_FILE} conf/$$file ${CONF_DIR}/$$file ; \
|
||||
fi ; \
|
||||
${INSTALL_FILE} conf/$$file-dist ${CONF_DIR} ; \
|
||||
done
|
||||
@ -30,3 +81,27 @@ install::
|
||||
fi ; \
|
||||
${INSTALL_FILE} conf/$$file ${CONF_DIR}/$${file}-dist ; \
|
||||
done
|
||||
-mkdir -p ${DOC_DIR}
|
||||
for file in ${DOC_FILES}; do \
|
||||
${INSTALL_FILE} htdocs/$$file ${DOC_DIR} ; \
|
||||
done
|
||||
-mkdir -p ${MAN_DIR}
|
||||
for file in ${MAN_FILES}; do \
|
||||
${INSTALL_FILE} htdocs/manual/$$file ${MAN_DIR} ; \
|
||||
done
|
||||
-mkdir -p ${IMG_DIR}
|
||||
for file in ${IMG_FILES}; do \
|
||||
${INSTALL_FILE} htdocs/manual/images/$$file ${IMG_DIR} ; \
|
||||
done
|
||||
-mkdir -p ${MISC_DIR}
|
||||
for file in ${MISC_FILES}; do \
|
||||
${INSTALL_FILE} htdocs/manual/misc/$$file ${MISC_DIR} ; \
|
||||
done
|
||||
-mkdir -p ${MOD_DIR}
|
||||
for file in ${MOD_FILES}; do \
|
||||
${INSTALL_FILE} htdocs/manual/mod/$$file ${MOD_DIR} ; \
|
||||
done
|
||||
-mkdir -p ${VHOST_DIR}
|
||||
for file in ${VHOST_FILES}; do \
|
||||
${INSTALL_FILE} htdocs/manual/vhosts/$$file ${VHOST_DIR} ; \
|
||||
done
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
#
|
||||
# Makefile for building and installing secure apache
|
||||
#
|
||||
all::
|
||||
cd src; ${MAKE} PREFIX=@@PREFIX@@ $@
|
||||
|
||||
configure::
|
||||
cd src; ./Configure
|
||||
|
||||
certificate::
|
||||
cd src; ${MAKE} PREFIX=@@PREFIX@@ $@
|
||||
|
||||
INSTALL_FILE=${INSTALL} -c -m 644 -o bin -g bin
|
||||
|
||||
CONF_DIR= @@PREFIX@@/etc/apache
|
||||
|
||||
install::
|
||||
-mkdir -p ${CONF_DIR}
|
||||
-mkdir -p @@PREFIX@@/www/data
|
||||
-mkdir -p @@PREFIX@@/www/icons
|
||||
-mkdir -p @@PREFIX@@/www/cgi-bin
|
||||
${INSTALL} -c -s -m 755 -o root src/httpsd @@PREFIX@@/sbin
|
||||
${INSTALL} -c -m 644 -o nobody icons/* @@PREFIX@@/www/icons
|
||||
for file in httpd.conf srm.conf access.conf ; do \
|
||||
if [ -f ${CONF_DIR}/$$file ] ; then \
|
||||
${INSTALL_FILE} conf/$$file-dist ${CONF_DIR} ; \
|
||||
else \
|
||||
${INSTALL_FILE} conf/$$file-dist ${CONF_DIR}/$$file ; \
|
||||
fi ; \
|
||||
done
|
||||
for file in httpd.conf ; do \
|
||||
${INSTALL_FILE} SSLconf/conf/$$file ${CONF_DIR}/$$file-SSL ; \
|
||||
done
|
||||
if [ -f ${CONF_DIR}/mime.types ] ; then \
|
||||
${INSTALL_FILE} conf/mime.types ${CONF_DIR}/mime.types-dist ; \
|
||||
else \
|
||||
${INSTALL_FILE} conf/mime.types ${CONF_DIR} ; \
|
||||
fi ; \
|
||||
${INSTALL_FILE} SSLconf/conf/mime.types ${CONF_DIR}/mime.types-SSL ; \
|
||||
@ -1 +1,2 @@
|
||||
MD5 (apache_1.3a1.tar.gz) = 638fad5c69178d2a92407900547e8732
|
||||
MD5 (apache_1.3b3.tar.gz) = befabda0148e3a26a93920c8721c5918
|
||||
MD5 (no2slash-loop-fix.patch) = e56db42ebe5a79a7004afae8868570b4
|
||||
|
||||
@ -1,149 +1,93 @@
|
||||
*** src/Configuration.orig Wed Jul 23 04:11:59 1997
|
||||
--- src/Configuration Thu Jul 24 05:55:25 1997
|
||||
***************
|
||||
*** 41,49 ****
|
||||
# Settings here have priority; If not set, Configure will attempt to guess
|
||||
# the C compiler, and set OPTIM to '-O2'
|
||||
#
|
||||
! EXTRA_CFLAGS=
|
||||
EXTRA_LDFLAGS=
|
||||
! EXTRA_LIBS=
|
||||
EXTRA_INCLUDES=
|
||||
|
||||
#CC=
|
||||
--- 41,63 ----
|
||||
# Settings here have priority; If not set, Configure will attempt to guess
|
||||
# the C compiler, and set OPTIM to '-O2'
|
||||
#
|
||||
! EXTRA_CFLAGS= \
|
||||
! -DHTTPD_ROOT=\"${PREFIX}/etc/apache/\" \
|
||||
! -DDOCUMENT_LOCATION=\"${PREFIX}/www/data/\" \
|
||||
! -DSERVER_CONFIG_FILE=\"httpd.conf\" \
|
||||
! -DRESOURCE_CONFIG_FILE=\"srm.conf\" \
|
||||
! -DTYPES_CONFIG_FILE=\"mime.types\" \
|
||||
! -DACCESS_CONFIG_FILE=\"access.conf\" \
|
||||
! -DDEFAULT_PATH=\"/bin:/usr/bin:${PREFIX}/bin\" \
|
||||
! -DSUEXEC_BIN=\"${PREFIX}/sbin/suexec\" \
|
||||
! -DDEFAULT_XFERLOG=\"/var/log/httpd-access.log\" \
|
||||
! -DDEFAULT_ERRORLOG=\"/var/log/httpd-error.log\" \
|
||||
! -DDEFAULT_PIDLOG=\"/var/run/httpd.pid\" \
|
||||
! -DDEFAULT_SCOREBOARD=\"/var/run/apache_runtime_status\" \
|
||||
! -DDEFAULT_LOCKFILE=\"/var/spool/lock/accept.lock\" \
|
||||
! -DMAGIC=\"magic\"
|
||||
EXTRA_LDFLAGS=
|
||||
! EXTRA_LIBS=
|
||||
EXTRA_INCLUDES=
|
||||
|
||||
#CC=
|
||||
***************
|
||||
*** 172,183 ****
|
||||
## STATUS=yes (see the Rules section near the start of this file) to allow
|
||||
## full status information. Check conf/access.conf on how to enable this.
|
||||
|
||||
! # Module status_module mod_status.o
|
||||
|
||||
## The Info module displays configuration information for the server and
|
||||
## all included modules. It's very useful for debugging.
|
||||
|
||||
! # Module info_module mod_info.o
|
||||
|
||||
## mod_include translates server-side include (SSI) statements in text files.
|
||||
## mod_autoindex handles requests for directories which have no index file
|
||||
--- 186,197 ----
|
||||
## STATUS=yes (see the Rules section near the start of this file) to allow
|
||||
## full status information. Check conf/access.conf on how to enable this.
|
||||
|
||||
! Module status_module mod_status.o
|
||||
|
||||
## The Info module displays configuration information for the server and
|
||||
## all included modules. It's very useful for debugging.
|
||||
|
||||
! Module info_module mod_info.o
|
||||
|
||||
## mod_include translates server-side include (SSI) statements in text files.
|
||||
## mod_autoindex handles requests for directories which have no index file
|
||||
***************
|
||||
*** 221,227 ****
|
||||
## mod_rewrite allows for powerful URI-to-URI and URI-to-filename mapping,
|
||||
## using regular expressions.
|
||||
|
||||
! # Module rewrite_module mod_rewrite.o
|
||||
|
||||
##
|
||||
## Access control and authentication modules.
|
||||
--- 235,241 ----
|
||||
## mod_rewrite allows for powerful URI-to-URI and URI-to-filename mapping,
|
||||
## using regular expressions.
|
||||
|
||||
! Module rewrite_module mod_rewrite.o
|
||||
|
||||
##
|
||||
## Access control and authentication modules.
|
||||
***************
|
||||
*** 239,245 ****
|
||||
## "gdbm" package if not and possibly adjust EXTRA_LIBS. (This may be
|
||||
## done by Configure at a later date)
|
||||
|
||||
! # Module db_auth_module mod_auth_db.o
|
||||
# Module dbm_auth_module mod_auth_dbm.o
|
||||
|
||||
## msql_auth checks against an mSQL database. You must have mSQL installed
|
||||
--- 253,259 ----
|
||||
## "gdbm" package if not and possibly adjust EXTRA_LIBS. (This may be
|
||||
## done by Configure at a later date)
|
||||
|
||||
! Module db_auth_module mod_auth_db.o
|
||||
# Module dbm_auth_module mod_auth_dbm.o
|
||||
|
||||
## msql_auth checks against an mSQL database. You must have mSQL installed
|
||||
***************
|
||||
*** 256,279 ****
|
||||
## "digest" implements HTTP Digest Authentication rather than the less
|
||||
## secure Basic Auth used by the other modules.
|
||||
|
||||
! # Module digest_module mod_digest.o
|
||||
|
||||
## Optional response header manipulation modules.
|
||||
##
|
||||
## cern_meta mimics the behavior of the CERN web server with regards to
|
||||
## metainformation files.
|
||||
|
||||
! # Module cern_meta_module mod_cern_meta.o
|
||||
|
||||
## The expires module can apply Expires: headers to resources,
|
||||
## as a function of access time or modification time.
|
||||
|
||||
! # Module expires_module mod_expires.o
|
||||
|
||||
## The headers module can set arbitrary HTTP response headers,
|
||||
## as configured in server, vhost, access.conf or .htaccess configs
|
||||
|
||||
! # Module headers_module mod_headers.o
|
||||
|
||||
## Miscellaneous modules
|
||||
##
|
||||
--- 270,293 ----
|
||||
## "digest" implements HTTP Digest Authentication rather than the less
|
||||
## secure Basic Auth used by the other modules.
|
||||
|
||||
! Module digest_module mod_digest.o
|
||||
|
||||
## Optional response header manipulation modules.
|
||||
##
|
||||
## cern_meta mimics the behavior of the CERN web server with regards to
|
||||
## metainformation files.
|
||||
|
||||
! Module cern_meta_module mod_cern_meta.o
|
||||
|
||||
## The expires module can apply Expires: headers to resources,
|
||||
## as a function of access time or modification time.
|
||||
|
||||
! Module expires_module mod_expires.o
|
||||
|
||||
## The headers module can set arbitrary HTTP response headers,
|
||||
## as configured in server, vhost, access.conf or .htaccess configs
|
||||
|
||||
! Module headers_module mod_headers.o
|
||||
|
||||
## Miscellaneous modules
|
||||
##
|
||||
--- src/Configuration.orig Wed Nov 19 16:49:57 1997
|
||||
+++ src/Configuration Mon Feb 16 15:22:27 1998
|
||||
@@ -41,7 +41,21 @@
|
||||
# Settings here have priority; If not set, Configure will attempt to guess
|
||||
# the C compiler, looking for gcc first, then cc.
|
||||
#
|
||||
-EXTRA_CFLAGS=
|
||||
+EXTRA_CFLAGS= \
|
||||
+-DDOCUMENT_LOCATION=\"${PREFIX}/www/data/\" \
|
||||
+-DHTTPD_ROOT=\"${PREFIX}/etc/apache/\" \
|
||||
+-DSERVER_CONFIG_FILE=\"${PREFIX}/etc/apache/httpd.conf\" \
|
||||
+-DRESOURCE_CONFIG_FILE=\"${PREFIX}/etc/apache/srm.conf\" \
|
||||
+-DACCESS_CONFIG_FILE=\"${PREFIX}/etc/apache/access.conf\" \
|
||||
+-DTYPES_CONFIG_FILE=\"${PREFIX}/etc/apache/mime.types\" \
|
||||
+-DDEFAULT_PATH=\"/bin:/usr/bin:${PREFIX}/bin\" \
|
||||
+-DSUEXEC_BIN=\"${PREFIX}/sbin/suexec\" \
|
||||
+-DDEFAULT_XFERLOG=\"/var/log/httpd-access.log\" \
|
||||
+-DDEFAULT_ERRORLOG=\"/var/log/httpd-error.log\" \
|
||||
+-DDEFAULT_PIDLOG=\"/var/run/httpd.pid\" \
|
||||
+-DDEFAULT_SCOREBOARD=\"/var/run/apache_runtime_status\" \
|
||||
+-DDEFAULT_LOCKFILE=\"/var/spool/lock/accept.lock\" \
|
||||
+-DMAGIC=\"magic\"
|
||||
EXTRA_LDFLAGS=
|
||||
EXTRA_LIBS=
|
||||
EXTRA_INCLUDES=
|
||||
@@ -181,12 +195,12 @@
|
||||
## STATUS=yes (see the Rules section near the start of this file) to allow
|
||||
## full status information. Check conf/access.conf on how to enable this.
|
||||
|
||||
-# AddModule modules/standard/mod_status.o
|
||||
+AddModule modules/standard/mod_status.o
|
||||
|
||||
## The Info module displays configuration information for the server and
|
||||
## all included modules. It's very useful for debugging.
|
||||
|
||||
-# AddModule modules/standard/mod_info.o
|
||||
+AddModule modules/standard/mod_info.o
|
||||
|
||||
## mod_include translates server-side include (SSI) statements in text files.
|
||||
## mod_autoindex handles requests for directories which have no index file
|
||||
@@ -218,7 +232,7 @@
|
||||
## transposition/typo). This catches the majority of misspelled requests.
|
||||
## If it finds a match, a "spelling corrected" redirection is returned.
|
||||
|
||||
-# AddModule modules/standard/mod_speling.o
|
||||
+AddModule modules/standard/mod_speling.o
|
||||
|
||||
## The UserDir module for selecting resource directories by user name
|
||||
## and a common prefix, e.g., /~<user> , /usr/web/<user> , etc.
|
||||
@@ -240,7 +254,7 @@
|
||||
## URI-to-filename mapping using a regular expression based
|
||||
## rule-controlled rewriting engine.
|
||||
|
||||
-# AddModule modules/standard/mod_rewrite.o
|
||||
+AddModule modules/standard/mod_rewrite.o
|
||||
|
||||
##
|
||||
## Access control and authentication modules.
|
||||
@@ -259,29 +273,29 @@
|
||||
## done by Configure at a later date)
|
||||
|
||||
# AddModule modules/standard/mod_auth_dbm.o
|
||||
-# AddModule modules/standard/mod_auth_db.o
|
||||
+AddModule modules/standard/mod_auth_db.o
|
||||
|
||||
## "digest" implements HTTP Digest Authentication rather than the less
|
||||
## secure Basic Auth used by the other modules.
|
||||
|
||||
-# AddModule modules/standard/mod_digest.o
|
||||
+AddModule modules/standard/mod_digest.o
|
||||
|
||||
## Optional response header manipulation modules.
|
||||
##
|
||||
## cern_meta mimics the behavior of the CERN web server with regards to
|
||||
## metainformation files.
|
||||
|
||||
-# AddModule modules/standard/mod_cern_meta.o
|
||||
+AddModule modules/standard/mod_cern_meta.o
|
||||
|
||||
## The expires module can apply Expires: headers to resources,
|
||||
## as a function of access time or modification time.
|
||||
|
||||
-# AddModule modules/standard/mod_expires.o
|
||||
+AddModule modules/standard/mod_expires.o
|
||||
|
||||
## The headers module can set arbitrary HTTP response headers,
|
||||
## as configured in server, vhost, access.conf or .htaccess configs
|
||||
|
||||
-# AddModule modules/standard/mod_headers.o
|
||||
+AddModule modules/standard/mod_headers.o
|
||||
|
||||
## Miscellaneous modules
|
||||
##
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
*** conf/access.conf-dist.orig Wed Jul 3 21:18:11 1996
|
||||
--- conf/access.conf-dist Fri Jul 5 06:32:54 1996
|
||||
*** conf/access.conf-dist 1997/08/19 23:00:22 1.1.1.1
|
||||
--- conf/access.conf-dist 1998/01/25 12:07:04 1.2
|
||||
***************
|
||||
*** 12,18 ****
|
||||
|
||||
# This should be changed to whatever you set DocumentRoot to.
|
||||
|
||||
! <Directory /usr/local/etc/httpd/htdocs>
|
||||
! <Directory @@ServerRoot@@/htdocs>
|
||||
|
||||
# This may also be "None", "All", or any combination of "Indexes",
|
||||
# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
|
||||
@ -13,24 +13,7 @@
|
||||
|
||||
# This should be changed to whatever you set DocumentRoot to.
|
||||
|
||||
! <Directory /usr/local/www/data>
|
||||
! <Directory @@ServerRoot@@/www/docs>
|
||||
|
||||
# This may also be "None", "All", or any combination of "Indexes",
|
||||
# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
|
||||
***************
|
||||
*** 38,44 ****
|
||||
# /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
|
||||
# CGI directory exists, if you have that configured.
|
||||
|
||||
! <Directory /usr/local/etc/httpd/cgi-bin>
|
||||
AllowOverride None
|
||||
Options None
|
||||
</Directory>
|
||||
--- 38,44 ----
|
||||
# /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
|
||||
# CGI directory exists, if you have that configured.
|
||||
|
||||
! <Directory /usr/local/www/cgi-bin>
|
||||
AllowOverride None
|
||||
Options None
|
||||
</Directory>
|
||||
|
||||
@ -1,79 +1,15 @@
|
||||
*** src/httpd.h.orig Wed Jul 23 04:06:06 1997
|
||||
--- src/httpd.h Thu Jul 24 04:55:02 1997
|
||||
*** conf/magic 1997/07/07 18:18:36 1.1.1.1
|
||||
--- conf/magic 1998/01/25 12:07:04 1.2
|
||||
***************
|
||||
*** 77,82 ****
|
||||
--- 77,83 ----
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+ #ifndef DOCUMENT_LOCATION
|
||||
/* Root of server */
|
||||
#ifdef __EMX__
|
||||
/* Set default for OS/2 file system */
|
||||
***************
|
||||
*** 84,89 ****
|
||||
--- 85,91 ----
|
||||
#else
|
||||
#define DOCUMENT_LOCATION "/usr/local/etc/httpd/htdocs"
|
||||
#endif
|
||||
+ #endif
|
||||
|
||||
/* Max. number of dynamically loaded modules */
|
||||
#define DYNAMIC_MODULE_LIMIT 64
|
||||
***************
|
||||
*** 115,135 ****
|
||||
--- 117,147 ----
|
||||
#endif
|
||||
|
||||
/* The name of the log files */
|
||||
+ #ifndef DEFAULT_XFERLOG
|
||||
#ifdef __EMX__
|
||||
/* Set default for OS/2 file system */
|
||||
#define DEFAULT_XFERLOG "logs/access.log"
|
||||
#else
|
||||
#define DEFAULT_XFERLOG "logs/access_log"
|
||||
#endif
|
||||
+ #endif /* DEFAULT_XFERLOG */
|
||||
+ #ifndef DEFAULT_ERRORLOG
|
||||
#ifdef __EMX__
|
||||
/* Set default for OS/2 file system */
|
||||
#define DEFAULT_ERRORLOG "logs/error.log"
|
||||
#else
|
||||
#define DEFAULT_ERRORLOG "logs/error_log"
|
||||
#endif
|
||||
+ #endif /* DEFAULT_ERRORLOG */
|
||||
+ #ifndef DEFAULT_PIDLOG
|
||||
#define DEFAULT_PIDLOG "logs/httpd.pid"
|
||||
+ #endif
|
||||
+ #ifndef DEFAULT_SCOREBOARD
|
||||
#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
|
||||
+ #endif
|
||||
+ #ifndef DEFAULT_LOCKFILE
|
||||
#define DEFAULT_LOCKFILE "logs/accept.lock"
|
||||
+ #endif
|
||||
|
||||
/* Define this to be what your HTML directory content files are called */
|
||||
#define DEFAULT_INDEX "index.html"
|
||||
***************
|
||||
*** 154,167 ****
|
||||
--- 166,185 ----
|
||||
#define SERVER_CONFIG_FILE "conf/httpd.conf"
|
||||
#endif
|
||||
|
||||
+ #ifndef RESOURCE_CONFIG_FILE
|
||||
/* The name of the document config file */
|
||||
#define RESOURCE_CONFIG_FILE "conf/srm.conf"
|
||||
+ #endif
|
||||
|
||||
+ #ifndef TYPES_CONFIG_FILE
|
||||
/* The name of the MIME types file */
|
||||
#define TYPES_CONFIG_FILE "conf/mime.types"
|
||||
+ #endif
|
||||
|
||||
+ #ifndef ACCESS_CONFIG_FILE
|
||||
/* The name of the access file */
|
||||
#define ACCESS_CONFIG_FILE "conf/access.conf"
|
||||
+ #endif
|
||||
|
||||
/* Whether we should enable rfc1413 identity checking */
|
||||
#define DEFAULT_RFC1413 0
|
||||
*** 1,5 ****
|
||||
# Magic data for mod_mime_magic Apache module (originally for file(1) command)
|
||||
! # The module is described in htdocs/manual/mod/mod_mime_magic.html
|
||||
#
|
||||
# The format is 4-5 columns:
|
||||
# Column #1: byte number to begin checking from, ">" indicates continuation
|
||||
--- 1,5 ----
|
||||
# Magic data for mod_mime_magic Apache module (originally for file(1) command)
|
||||
! # The module is described in www/docs/manual/mod/mod_mime_magic.html
|
||||
#
|
||||
# The format is 4-5 columns:
|
||||
# Column #1: byte number to begin checking from, ">" indicates continuation
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
*** src/Makefile.tmpl.orig Thu Jul 17 08:37:46 1997
|
||||
--- src/Makefile.tmpl Tue Aug 26 02:58:54 1997
|
||||
diff -c -r1.1.1.1 -r1.2
|
||||
*** src/main/Makefile.tmpl 1997/11/15 19:04:47 1.1.1.1
|
||||
--- src/main/Makefile.tmpl 1998/01/25 11:29:16 1.2
|
||||
***************
|
||||
*** 3,9 ****
|
||||
# This is combined with the information in the "Configuration" file
|
||||
@ -7,7 +8,7 @@
|
||||
|
||||
! CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
|
||||
LIBS=$(EXTRA_LIBS) $(LIBS1)
|
||||
INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
|
||||
INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH0) $(EXTRA_INCLUDES)
|
||||
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
|
||||
--- 3,9 ----
|
||||
# This is combined with the information in the "Configuration" file
|
||||
@ -15,5 +16,5 @@
|
||||
|
||||
! CFLAGS+=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
|
||||
LIBS=$(EXTRA_LIBS) $(LIBS1)
|
||||
INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
|
||||
INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH0) $(EXTRA_INCLUDES)
|
||||
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
*** conf/httpd.conf-dist.orig Wed Jul 16 09:02:44 1997
|
||||
--- conf/httpd.conf-dist Thu Jul 24 05:13:38 1997
|
||||
diff -c -r1.1.1.1 -r1.2
|
||||
*** conf/httpd.conf-dist 1997/08/19 23:00:22 1.1.1.1
|
||||
--- conf/httpd.conf-dist 1998/01/25 11:29:08 1.2
|
||||
***************
|
||||
*** 34,40 ****
|
||||
# suggested workaround is to create a user www and use that user.
|
||||
@ -18,23 +19,6 @@
|
||||
# ServerAdmin: Your address, where problems with the server should be
|
||||
# e-mailed.
|
||||
***************
|
||||
*** 44,50 ****
|
||||
# ServerRoot: The directory the server's config, error, and log files
|
||||
# are kept in
|
||||
|
||||
! ServerRoot /usr/local/etc/httpd
|
||||
|
||||
# BindAddress: You can support virtual hosts with this option. This option
|
||||
# is used to tell the server which IP address to listen to. It can either
|
||||
--- 44,50 ----
|
||||
# ServerRoot: The directory the server's config, error, and log files
|
||||
# are kept in
|
||||
|
||||
! ServerRoot /usr/local/etc/apache
|
||||
|
||||
# BindAddress: You can support virtual hosts with this option. This option
|
||||
# is used to tell the server which IP address to listen to. It can either
|
||||
***************
|
||||
*** 56,76 ****
|
||||
# ErrorLog: The location of the error log file. If this does not start
|
||||
# with /, ServerRoot is prepended to it.
|
||||
@ -97,10 +81,10 @@
|
||||
|
||||
#<VirtualHost host.some_domain.com>
|
||||
#ServerAdmin webmaster@host.some_domain.com
|
||||
! #DocumentRoot /usr/local/www/host.some_domain.com/data
|
||||
! #DocumentRoot /usr/local/www/docs/host.some_domain.com
|
||||
#ServerName host.some_domain.com
|
||||
! #ErrorLog /var/log/host.some_domain.com-error_log
|
||||
! #TransferLog /var/log/host.some_domain.com-access_log
|
||||
! #ErrorLog /var/log//host.some_domain.com-error_log
|
||||
! #TransferLog /var/log//host.some_domain.com-access_log
|
||||
#</VirtualHost>
|
||||
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
*** src/conf.h.orig Mon Jul 21 07:37:48 1997
|
||||
--- src/conf.h Thu Jul 24 05:09:25 1997
|
||||
*** src/main/conf.h 1997/11/16 15:43:15 1.1.1.1
|
||||
--- src/main/conf.h 1998/01/25 11:29:16 1.2
|
||||
***************
|
||||
*** 416,421 ****
|
||||
--- 416,422 ----
|
||||
*** 483,488 ****
|
||||
--- 483,489 ----
|
||||
#undef NO_KILLPG
|
||||
#undef NO_SETSID
|
||||
#define JMP_BUF sigjmp_buf
|
||||
#define HAVE_MMAP
|
||||
+ #define HAVE_SNPRINTF
|
||||
#define USE_MMAP_FILES
|
||||
#ifndef DEFAULT_USER
|
||||
#define DEFAULT_USER "nobody"
|
||||
#define DEFAULT_GROUP "nogroup"
|
||||
#if defined(__bsdi__) || \
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
*** conf/srm.conf-dist.orig Wed May 7 23:21:47 1997
|
||||
--- conf/srm.conf-dist Sat May 31 23:31:47 1997
|
||||
*** conf/srm.conf-dist 1997/11/05 11:32:36 1.1.1.1
|
||||
--- conf/srm.conf-dist 1998/01/25 12:07:05 1.2
|
||||
***************
|
||||
*** 12,18 ****
|
||||
# documents. By default, all requests are taken from this directory, but
|
||||
# symbolic links and aliases may be used to point to other locations.
|
||||
|
||||
! DocumentRoot /usr/local/etc/httpd/htdocs
|
||||
! DocumentRoot @@ServerRoot@@/htdocs
|
||||
|
||||
# UserDir: The name of the directory which is appended onto a user's home
|
||||
# directory if a ~user request is recieved.
|
||||
@ -13,34 +13,7 @@
|
||||
# documents. By default, all requests are taken from this directory, but
|
||||
# symbolic links and aliases may be used to point to other locations.
|
||||
|
||||
! DocumentRoot /usr/local/www/data
|
||||
! DocumentRoot @@ServerRoot@@/www/docs
|
||||
|
||||
# UserDir: The name of the directory which is appended onto a user's home
|
||||
# directory if a ~user request is recieved.
|
||||
***************
|
||||
*** 135,146 ****
|
||||
# require it to be present in the URL. So "/icons" isn't aliased in this
|
||||
# example.
|
||||
|
||||
! #Alias /icons/ /usr/local/etc/httpd/icons/
|
||||
|
||||
# ScriptAlias: This controls which directories contain server scripts.
|
||||
# Format: ScriptAlias fakename realname
|
||||
|
||||
! #ScriptAlias /cgi-bin/ /usr/local/etc/httpd/cgi-bin/
|
||||
|
||||
# If you want to use server side includes, or CGI outside
|
||||
# ScriptAliased directories, uncomment the following lines.
|
||||
--- 135,146 ----
|
||||
# require it to be present in the URL. So "/icons" isn't aliased in this
|
||||
# example.
|
||||
|
||||
! Alias /icons/ /usr/local/www/icons/
|
||||
|
||||
# ScriptAlias: This controls which directories contain server scripts.
|
||||
# Format: ScriptAlias fakename realname
|
||||
|
||||
! ScriptAlias /cgi-bin/ /usr/local/www/cgi-bin/
|
||||
|
||||
# If you want to use server side includes, or CGI outside
|
||||
# ScriptAliased directories, uncomment the following lines.
|
||||
|
||||
@ -1,13 +1,22 @@
|
||||
--- src/Configure.orig Mon Nov 17 13:49:29 1997
|
||||
+++ src/Configure Mon Nov 17 13:49:54 1997
|
||||
@@ -170,8 +170,8 @@
|
||||
####################################################################
|
||||
# Preset some "constants"; can be overridden on a per-platform basis below.
|
||||
#
|
||||
-DBM_LIB="-ldbm"
|
||||
-DB_LIB="-ldb"
|
||||
+DBM_LIB=""
|
||||
+DB_LIB=""
|
||||
SHELL="/bin/sh"
|
||||
if ./helpers/PrintPath -s ranlib; then
|
||||
RANLIB="ranlib"
|
||||
diff -c -r1.1.1.1 -r1.2
|
||||
*** src/Configure 1997/11/15 19:04:47 1.1.1.1
|
||||
--- src/Configure 1998/01/25 11:29:15 1.2
|
||||
***************
|
||||
*** 158,165 ****
|
||||
####################################################################
|
||||
# Preset some "constants"; can be overridden on a per-platform basis below.
|
||||
#
|
||||
! DBM_LIB="-ldbm"
|
||||
! DB_LIB="-ldb"
|
||||
SHELL="/bin/sh"
|
||||
TARGET="httpd"
|
||||
PRINTPATH=PrintPath
|
||||
--- 158,165 ----
|
||||
####################################################################
|
||||
# Preset some "constants"; can be overridden on a per-platform basis below.
|
||||
#
|
||||
! DBM_LIB=""
|
||||
! DB_LIB=""
|
||||
SHELL="/bin/sh"
|
||||
TARGET="httpd"
|
||||
PRINTPATH=PrintPath
|
||||
|
||||
@ -1,11 +1,140 @@
|
||||
etc/rc.d/apache.sh
|
||||
@exec mkdir -p %D/www/cgi-bin %D/www/data
|
||||
etc/apache/httpd.conf-dist
|
||||
etc/apache/srm.conf-dist
|
||||
etc/apache/access.conf-dist
|
||||
etc/apache/mime.types-dist
|
||||
etc/apache/magic-dist
|
||||
@exec mkdir -p %D/etc/apache
|
||||
@exec mkdir -p %D/www/cgi-bin
|
||||
@exec mkdir -p %D/www/data
|
||||
@exec mkdir -p %D/www/docs
|
||||
@exec mkdir -p %D/www/docs/manual
|
||||
@exec mkdir -p %D/www/docs/manual/images
|
||||
@exec mkdir -p %D/www/docs/manual/misc
|
||||
@exec mkdir -p %D/www/docs/manual/mod
|
||||
@exec mkdir -p %D/www/docs/manual/vhosts
|
||||
@exec mkdir -p %D/www/icons
|
||||
sbin/httpd
|
||||
etc/apache/httpd.conf
|
||||
etc/apache/httpd.conf-dist
|
||||
etc/apache/srm.conf
|
||||
etc/apache/srm.conf-dist
|
||||
etc/apache/access.conf
|
||||
etc/apache/access.conf-dist
|
||||
etc/apache/mime.types
|
||||
etc/apache/mime.types-dist
|
||||
etc/apache/magic
|
||||
etc/apache/magic-dist
|
||||
www/docs/apache_pb.gif
|
||||
www/docs/index.html
|
||||
www/docs/manual/LICENSE
|
||||
www/docs/manual/TODO
|
||||
www/docs/manual/bind.html
|
||||
www/docs/manual/cgi_path.html
|
||||
www/docs/manual/content-negotiation.html
|
||||
www/docs/manual/custom-error.html
|
||||
www/docs/manual/dns-caveats.html
|
||||
www/docs/manual/env.html
|
||||
www/docs/manual/footer.html
|
||||
www/docs/manual/handler.html
|
||||
www/docs/manual/header.html
|
||||
www/docs/manual/index.html
|
||||
www/docs/manual/install.html
|
||||
www/docs/manual/install_1_1.html
|
||||
www/docs/manual/invoking.html
|
||||
www/docs/manual/keepalive.html
|
||||
www/docs/manual/location.html
|
||||
www/docs/manual/man-template.html
|
||||
www/docs/manual/multilogs.html
|
||||
www/docs/manual/process-model.html
|
||||
www/docs/manual/new_features_1_0.html
|
||||
www/docs/manual/new_features_1_1.html
|
||||
www/docs/manual/new_features_1_2.html
|
||||
www/docs/manual/new_features_1_3.html
|
||||
www/docs/manual/sections.html
|
||||
www/docs/manual/sourcereorg.html
|
||||
www/docs/manual/stopping.html
|
||||
www/docs/manual/suexec.html
|
||||
www/docs/manual/unixware.html
|
||||
www/docs/manual/upgrading_to_1_3.html
|
||||
www/docs/manual/windows.html
|
||||
www/docs/manual/images/home.gif
|
||||
www/docs/manual/images/index.gif
|
||||
www/docs/manual/images/sub.gif
|
||||
www/docs/manual/misc/API.html
|
||||
www/docs/manual/misc/FAQ.html
|
||||
www/docs/manual/misc/client_block_api.html
|
||||
www/docs/manual/misc/compat_notes.html
|
||||
www/docs/manual/misc/descriptors.html
|
||||
www/docs/manual/misc/fin_wait_2.html
|
||||
www/docs/manual/misc/footer.html
|
||||
www/docs/manual/misc/header.html
|
||||
www/docs/manual/misc/howto.html
|
||||
www/docs/manual/misc/index.html
|
||||
www/docs/manual/misc/known_bugs.html
|
||||
www/docs/manual/misc/known_client_problems.html
|
||||
www/docs/manual/misc/nopgp.html
|
||||
www/docs/manual/misc/perf-bsd44.html
|
||||
www/docs/manual/misc/perf-dec.html
|
||||
www/docs/manual/misc/perf-hp.html
|
||||
www/docs/manual/misc/perf-tuning.html
|
||||
www/docs/manual/misc/perf.html
|
||||
www/docs/manual/misc/security_tips.html
|
||||
www/docs/manual/misc/vif-info.html
|
||||
www/docs/manual/misc/windoz_keepalive.html
|
||||
www/docs/manual/mod/core.html
|
||||
www/docs/manual/mod/directive-dict.html
|
||||
www/docs/manual/mod/directives.html
|
||||
www/docs/manual/mod/footer.html
|
||||
www/docs/manual/mod/header.html
|
||||
www/docs/manual/mod/index.html
|
||||
www/docs/manual/mod/mod_access.html
|
||||
www/docs/manual/mod/mod_actions.html
|
||||
www/docs/manual/mod/mod_alias.html
|
||||
www/docs/manual/mod/mod_asis.html
|
||||
www/docs/manual/mod/mod_auth.html
|
||||
www/docs/manual/mod/mod_auth_anon.html
|
||||
www/docs/manual/mod/mod_auth_db.html
|
||||
www/docs/manual/mod/mod_auth_dbm.html
|
||||
www/docs/manual/mod/mod_auth_msql.html
|
||||
www/docs/manual/mod/mod_autoindex.html
|
||||
www/docs/manual/mod/mod_browser.html
|
||||
www/docs/manual/mod/mod_cern_meta.html
|
||||
www/docs/manual/mod/mod_cgi.html
|
||||
www/docs/manual/mod/mod_cookies.html
|
||||
www/docs/manual/mod/mod_digest.html
|
||||
www/docs/manual/mod/mod_dir.html
|
||||
www/docs/manual/mod/mod_dld.html
|
||||
www/docs/manual/mod/mod_dll.html
|
||||
www/docs/manual/mod/mod_env.html
|
||||
www/docs/manual/mod/mod_example.html
|
||||
www/docs/manual/mod/mod_expires.html
|
||||
www/docs/manual/mod/mod_headers.html
|
||||
www/docs/manual/mod/mod_imap.html
|
||||
www/docs/manual/mod/mod_include.html
|
||||
www/docs/manual/mod/mod_info.html
|
||||
www/docs/manual/mod/mod_isapi.html
|
||||
www/docs/manual/mod/mod_log_agent.html
|
||||
www/docs/manual/mod/mod_log_common.html
|
||||
www/docs/manual/mod/mod_log_config.html
|
||||
www/docs/manual/mod/mod_log_referer.html
|
||||
www/docs/manual/mod/mod_mime.html
|
||||
www/docs/manual/mod/mod_mime_magic.html
|
||||
www/docs/manual/mod/mod_negotiation.html
|
||||
www/docs/manual/mod/mod_proxy.html
|
||||
www/docs/manual/mod/mod_rewrite.html
|
||||
www/docs/manual/mod/mod_setenvif.html
|
||||
www/docs/manual/mod/mod_speling.html
|
||||
www/docs/manual/mod/mod_status.html
|
||||
www/docs/manual/mod/mod_unique_id.html
|
||||
www/docs/manual/mod/mod_userdir.html
|
||||
www/docs/manual/mod/mod_usertrack.html
|
||||
www/docs/manual/vhosts/details.html
|
||||
www/docs/manual/vhosts/details_1_2.html
|
||||
www/docs/manual/vhosts/examples.html
|
||||
www/docs/manual/vhosts/fd-limits.html
|
||||
www/docs/manual/vhosts/footer.html
|
||||
www/docs/manual/vhosts/header.html
|
||||
www/docs/manual/vhosts/host.html
|
||||
www/docs/manual/vhosts/index.html
|
||||
www/docs/manual/vhosts/ip-based.html
|
||||
www/docs/manual/vhosts/name-based.html
|
||||
www/docs/manual/vhosts/vhosts-in-depth.html
|
||||
www/docs/manual/vhosts/virtual-host.html
|
||||
www/icons/README
|
||||
www/icons/a.gif
|
||||
www/icons/alert.black.gif
|
||||
@ -82,3 +211,15 @@ www/icons/uu.gif
|
||||
www/icons/uuencoded.gif
|
||||
www/icons/world1.gif
|
||||
www/icons/world2.gif
|
||||
@dirrm www/docs/manual/vhosts
|
||||
@dirrm www/docs/manual/mod
|
||||
@dirrm www/docs/manual/misc
|
||||
@dirrm www/docs/manual/images
|
||||
@dirrm www/docs/manual
|
||||
@dirrm www/docs
|
||||
@dirrm www/data
|
||||
@dirrm www/icons
|
||||
@dirrm www/cgi-bin
|
||||
@dirrm www
|
||||
@dirrm etc/apache
|
||||
@unexec echo "*** Don't forget to remove %D/sbin/httpd from /etc/rc.local"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user