remove apache port: it is part of the system now, and the port
referenced a beta version of the code that is no longer available
This commit is contained in:
parent
e0dd347fec
commit
18a80550ed
@ -1,50 +1,11 @@
|
||||
# New ports collection makefile for: apache HTTPD
|
||||
# Version required: 1.3b3
|
||||
# Date created: 17 Nov 1997
|
||||
# Whom: ejovi
|
||||
#
|
||||
# $OpenBSD: Makefile,v 1.6 1998/12/16 22:40:29 marc Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 1999/03/10 02:21:25 marc Exp $
|
||||
#
|
||||
|
||||
DISTNAME= apache_1.3b5
|
||||
PKGNAME= apache-1.3b5
|
||||
PKGNAME= apache
|
||||
CATEGORIES= www
|
||||
|
||||
COMES_WITH= 2.3
|
||||
IGNORE= "is now part of the standard distribution"
|
||||
MIRROR_DISTFILE=no
|
||||
|
||||
MASTER_SITES= ftp://www.apache.org/apache/dist/
|
||||
|
||||
# Official apache patches
|
||||
# put in patches/ since they are pathless
|
||||
#
|
||||
#PATCH_SITES= ftp://www.apache.org/apache/dist/patches/apply_to_1.3b5/
|
||||
#PATCHFILES= PR1847.patch PR1850.patch PR1889.patch
|
||||
#.if defined(PATCH_DEBUG)
|
||||
#PATCH_DIST_ARGS=-d ${WRKSRC}/src -E ${PATCH_STRIP}
|
||||
#.else
|
||||
#PATCH_DIST_ARGS=-d ${WRKSRC}/src --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
|
||||
|
||||
.if defined(VERS_ID)
|
||||
post-patch:
|
||||
@cd ${WRKSRC}/src && \
|
||||
mv Configuration Configuration.old && \
|
||||
sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
|
||||
< Configuration.old > Configuration
|
||||
.endif
|
||||
|
||||
post-install:
|
||||
@$(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,106 +0,0 @@
|
||||
#
|
||||
# Makefile for building and installing apache
|
||||
#
|
||||
SERVERROOT=@@PREFIX@@
|
||||
|
||||
all::
|
||||
cd src; ${MAKE} PREFIX=@@PREFIX@@ $@
|
||||
|
||||
configure::
|
||||
cd src; ./Configure
|
||||
|
||||
INSTALL_FILE=${INSTALL} -c -m 644 -o bin -g bin
|
||||
|
||||
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 \
|
||||
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= custom_errordocs.gif 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 \
|
||||
custom_errordocs.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_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_so.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 ${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 \
|
||||
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
|
||||
for file in mime.types magic ; do \
|
||||
if [ ! -f ${CONF_DIR}/$$file ] ; then \
|
||||
${INSTALL_FILE} conf/$$file ${CONF_DIR} ; \
|
||||
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,4 +0,0 @@
|
||||
MD5 (PR1847.patch) = 27c382b7924cb6fb70c07c0eaa938b02
|
||||
MD5 (PR1850.patch) = 4924fd1f8254a515246c7a2b5fb7627b
|
||||
MD5 (PR1889.patch) = 4f5e01a332392ca5d5ee8ca3fdf2c778
|
||||
MD5 (apache_1.3b5.tar.gz) = d8ce21fe9fda2673fdd749f6281f331d
|
@ -1,93 +0,0 @@
|
||||
--- 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,19 +0,0 @@
|
||||
*** 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 @@ServerRoot@@/htdocs>
|
||||
|
||||
# This may also be "None", "All", or any combination of "Indexes",
|
||||
# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
|
||||
--- 12,18 ----
|
||||
|
||||
# This should be changed to whatever you set DocumentRoot to.
|
||||
|
||||
! <Directory @@ServerRoot@@/www/docs>
|
||||
|
||||
# This may also be "None", "All", or any combination of "Indexes",
|
||||
# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
|
@ -1,15 +0,0 @@
|
||||
*** conf/magic 1997/07/07 18:18:36 1.1.1.1
|
||||
--- conf/magic 1998/01/25 12:07:04 1.2
|
||||
***************
|
||||
*** 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,20 +0,0 @@
|
||||
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
|
||||
# by the configure script to make the actual Makefile.
|
||||
|
||||
! CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
|
||||
LIBS=$(EXTRA_LIBS) $(LIBS1)
|
||||
INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH0) $(EXTRA_INCLUDES)
|
||||
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
|
||||
--- 3,9 ----
|
||||
# This is combined with the information in the "Configuration" file
|
||||
# by the configure script to make the actual Makefile.
|
||||
|
||||
! CFLAGS+=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
|
||||
LIBS=$(EXTRA_LIBS) $(LIBS1)
|
||||
INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH0) $(EXTRA_INCLUDES)
|
||||
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
|
@ -1,90 +0,0 @@
|
||||
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.
|
||||
|
||||
User nobody
|
||||
! Group #-1
|
||||
|
||||
# ServerAdmin: Your address, where problems with the server should be
|
||||
# e-mailed.
|
||||
--- 34,40 ----
|
||||
# suggested workaround is to create a user www and use that user.
|
||||
|
||||
User nobody
|
||||
! Group nogroup
|
||||
|
||||
# ServerAdmin: Your address, where problems with the server should be
|
||||
# e-mailed.
|
||||
***************
|
||||
*** 56,76 ****
|
||||
# ErrorLog: The location of the error log file. If this does not start
|
||||
# with /, ServerRoot is prepended to it.
|
||||
|
||||
! ErrorLog logs/error_log
|
||||
|
||||
# TransferLog: The location of the transfer log file. If this does not
|
||||
# start with /, ServerRoot is prepended to it.
|
||||
|
||||
! TransferLog logs/access_log
|
||||
|
||||
# PidFile: The file the server should log its pid to
|
||||
! PidFile logs/httpd.pid
|
||||
|
||||
# ScoreBoardFile: File used to store internal server process information.
|
||||
# Not all architectures require this. But if yours does (you'll know because
|
||||
# this file is created when you run Apache) then you *must* ensure that
|
||||
# no two invocations of Apache share the same scoreboard file.
|
||||
! ScoreBoardFile logs/apache_status
|
||||
|
||||
# ServerName allows you to set a host name which is sent back to clients for
|
||||
# your server if it's different than the one the program would get (i.e. use
|
||||
--- 56,78 ----
|
||||
# ErrorLog: The location of the error log file. If this does not start
|
||||
# with /, ServerRoot is prepended to it.
|
||||
|
||||
! ErrorLog /var/log/httpd-error.log
|
||||
|
||||
# TransferLog: The location of the transfer log file. If this does not
|
||||
# start with /, ServerRoot is prepended to it.
|
||||
|
||||
! TransferLog /var/log/httpd-access.log
|
||||
!
|
||||
! #LogFormat "%h %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-Agent}i\""
|
||||
|
||||
# PidFile: The file the server should log its pid to
|
||||
! PidFile /var/run/httpd.pid
|
||||
|
||||
# ScoreBoardFile: File used to store internal server process information.
|
||||
# Not all architectures require this. But if yours does (you'll know because
|
||||
# this file is created when you run Apache) then you *must* ensure that
|
||||
# no two invocations of Apache share the same scoreboard file.
|
||||
! ScoreBoardFile /var/run/apache_runtime_status
|
||||
|
||||
# ServerName allows you to set a host name which is sent back to clients for
|
||||
# your server if it's different than the one the program would get (i.e. use
|
||||
***************
|
||||
*** 175,184 ****
|
||||
|
||||
#<VirtualHost host.some_domain.com>
|
||||
#ServerAdmin webmaster@host.some_domain.com
|
||||
! #DocumentRoot /www/docs/host.some_domain.com
|
||||
#ServerName host.some_domain.com
|
||||
! #ErrorLog logs/host.some_domain.com-error_log
|
||||
! #TransferLog logs/host.some_domain.com-access_log
|
||||
#</VirtualHost>
|
||||
|
||||
|
||||
--- 177,186 ----
|
||||
|
||||
#<VirtualHost host.some_domain.com>
|
||||
#ServerAdmin webmaster@host.some_domain.com
|
||||
! #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
|
||||
#</VirtualHost>
|
||||
|
||||
|
@ -1,12 +0,0 @@
|
||||
*** src/include/conf.h 1997/11/16 15:43:15 1.1.1.1
|
||||
--- src/include/conf.h 1998/01/25 11:29:16 1.2
|
||||
***************
|
||||
*** 483,488 ****
|
||||
--- 483,489 ----
|
||||
#undef NO_KILLPG
|
||||
#undef NO_SETSID
|
||||
#define HAVE_MMAP
|
||||
+ #define HAVE_SNPRINTF
|
||||
#define USE_MMAP_FILES
|
||||
#ifndef DEFAULT_USER
|
||||
#define DEFAULT_USER "nobody"
|
@ -1,19 +0,0 @@
|
||||
*** 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 @@ServerRoot@@/htdocs
|
||||
|
||||
# UserDir: The name of the directory which is appended onto a user's home
|
||||
# directory if a ~user request is recieved.
|
||||
--- 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 @@ServerRoot@@/www/docs
|
||||
|
||||
# UserDir: The name of the directory which is appended onto a user's home
|
||||
# directory if a ~user request is recieved.
|
@ -1,22 +0,0 @@
|
||||
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,27 +0,0 @@
|
||||
--- src/ap/ap_cpystrn.c 1998/01/07 16:45:55 1.3
|
||||
+++ src/ap/ap_cpystrn.c 1998/02/20 20:02:39 1.5
|
||||
@@ -60,8 +60,8 @@
|
||||
* (2) strncpy() null fills, which is bogus, esp. when copy 8byte
|
||||
* strings into 8k blocks.
|
||||
* (3) Instead of returning the pointer to the beginning of
|
||||
- * the destination string, we return the end so we can
|
||||
- * "check" for truncation
|
||||
+ * the destination string, we return a pointer to the
|
||||
+ * terminating '\0' to allow us to "check" for truncation
|
||||
*
|
||||
* ap_cpystrn() follows the same call structure as strncpy().
|
||||
*/
|
||||
@@ -77,8 +77,11 @@
|
||||
d = dst;
|
||||
end = dst + dst_size - 1;
|
||||
|
||||
- while ((d < end) && (*d++ = *src++))
|
||||
- ; /* nop, the while does it all */
|
||||
+ for (; d < end; ++d, ++src) {
|
||||
+ if (!(*d = *src)) {
|
||||
+ return (d);
|
||||
+ }
|
||||
+ }
|
||||
|
||||
*d = '\0'; /* always null terminate */
|
||||
|
@ -1,14 +0,0 @@
|
||||
--- src/modules/standard/mod_userdir.c 1998/02/14 03:26:58 1.28
|
||||
+++ src/modules/standard/mod_userdir.c 1998/02/21 00:50:02 1.29
|
||||
@@ -313,7 +313,10 @@
|
||||
*/
|
||||
if (filename && (!*userdirs || stat(filename, &statbuf) != -1)) {
|
||||
r->filename = pstrcat(r->pool, filename, dname, NULL);
|
||||
- if (*userdirs)
|
||||
+ /* when statbuf contains info on r->filename we can save a syscall
|
||||
+ * by copying it to r->finfo
|
||||
+ */
|
||||
+ if (*userdirs && dname[0] == 0)
|
||||
r->finfo = statbuf;
|
||||
return OK;
|
||||
}
|
@ -1,85 +0,0 @@
|
||||
--- src/main/http_protocol.c 1998/02/09 01:09:40 1.188
|
||||
+++ src/main/http_protocol.c 1998/02/21 01:18:28 1.190
|
||||
@@ -625,9 +625,10 @@
|
||||
|
||||
const char *check_fulluri(request_rec *r, const char *uri)
|
||||
{
|
||||
- char *name, *host, *proto;
|
||||
- int i, plen;
|
||||
+ char *host, *proto, *slash, *colon;
|
||||
+ int plen;
|
||||
unsigned port;
|
||||
+ const char *res_uri;
|
||||
|
||||
/* This routine parses full URLs, if they match the server */
|
||||
proto = http_method(r);
|
||||
@@ -635,33 +636,49 @@
|
||||
|
||||
if (strncasecmp(uri, proto, plen) || strncasecmp(uri + plen, "://", 3))
|
||||
return uri;
|
||||
- name = pstrdup(r->pool, uri + plen);
|
||||
+ host = pstrdup(r->pool, uri + plen + 3);
|
||||
|
||||
/* Find the hostname, assuming a valid request */
|
||||
- i = ind(name, '/');
|
||||
- name[i] = '\0';
|
||||
+ slash = strchr(host, '/');
|
||||
+ if (slash) {
|
||||
+ *slash = 0;
|
||||
+ }
|
||||
+ else {
|
||||
+ slash = host + strlen(host);
|
||||
+ }
|
||||
|
||||
/* Find the port */
|
||||
- host = getword_nc(r->pool, &name, ':');
|
||||
- if (*name)
|
||||
- port = atoi(name);
|
||||
- else
|
||||
+ colon = strchr(host, ':');
|
||||
+ if (colon) {
|
||||
+ *colon = '\0';
|
||||
+ port = atoi(colon+1);
|
||||
+ if (port == 0) {
|
||||
+ return uri;
|
||||
+ }
|
||||
+ }
|
||||
+ else {
|
||||
port = default_port(r);
|
||||
+ }
|
||||
|
||||
/* Make sure ports patch */
|
||||
if (port != r->server->port)
|
||||
return uri;
|
||||
|
||||
/* Save it for later use */
|
||||
- r->hostname = pstrdup(r->pool, host);
|
||||
- r->hostlen = plen + 3 + i;
|
||||
+ r->hostname = host;
|
||||
+ r->hostlen = plen + 3 + slash - host;
|
||||
+ res_uri = uri + r->hostlen;
|
||||
+ /* deal with "http://host" */
|
||||
+ if (*res_uri == '\0') {
|
||||
+ res_uri = "/";
|
||||
+ }
|
||||
|
||||
/* The easy cases first */
|
||||
if (!strcasecmp(host, r->server->server_hostname)) {
|
||||
- return (uri + r->hostlen);
|
||||
+ return res_uri;
|
||||
}
|
||||
else if (!strcmp(host, inet_ntoa(r->connection->local_addr.sin_addr))) {
|
||||
- return (uri + r->hostlen);
|
||||
+ return res_uri;
|
||||
}
|
||||
else {
|
||||
/* Now things get a bit trickier - check the IP address(es) of
|
||||
@@ -674,7 +691,7 @@
|
||||
for (n = 0; hp->h_addr_list[n] != NULL; n++) {
|
||||
if (r->connection->local_addr.sin_addr.s_addr ==
|
||||
(((struct in_addr *) (hp->h_addr_list[n]))->s_addr)) {
|
||||
- return (uri + r->hostlen);
|
||||
+ return res_uri;
|
||||
}
|
||||
}
|
||||
}
|
@ -1 +0,0 @@
|
||||
The extremely popular Apache http server
|
@ -1,15 +0,0 @@
|
||||
Apache
|
||||
Version 1.0 (and up)
|
||||
|
||||
What is it?
|
||||
-----------
|
||||
|
||||
Apache is an HTTP server designed as a plug-in replacement for the NCSA
|
||||
server version 1.3 (or 1.4). It fixes numerous bugs in the NCSA server and
|
||||
includes many frequently requested new features, and has an API which
|
||||
allows it to be extended to meet users' needs more easily.
|
||||
|
||||
Documentation
|
||||
-------------
|
||||
|
||||
All the documentation is on-line on the WWW, via the URL http://www.apache.org
|
@ -1,225 +0,0 @@
|
||||
@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
|
||||
www/icons/alert.red.gif
|
||||
www/icons/apache_pb.gif
|
||||
www/icons/back.gif
|
||||
www/icons/ball.gray.gif
|
||||
www/icons/ball.red.gif
|
||||
www/icons/binary.gif
|
||||
www/icons/binhex.gif
|
||||
www/icons/blank.gif
|
||||
www/icons/bomb.gif
|
||||
www/icons/box1.gif
|
||||
www/icons/box2.gif
|
||||
www/icons/broken.gif
|
||||
www/icons/burst.gif
|
||||
www/icons/c.gif
|
||||
www/icons/comp.blue.gif
|
||||
www/icons/comp.gray.gif
|
||||
www/icons/compressed.gif
|
||||
www/icons/continued.gif
|
||||
www/icons/dir.gif
|
||||
www/icons/down.gif
|
||||
www/icons/dvi.gif
|
||||
www/icons/f.gif
|
||||
www/icons/folder.gif
|
||||
www/icons/folder.open.gif
|
||||
www/icons/folder.sec.gif
|
||||
www/icons/forward.gif
|
||||
www/icons/generic.gif
|
||||
www/icons/generic.red.gif
|
||||
www/icons/generic.sec.gif
|
||||
www/icons/hand.right.gif
|
||||
www/icons/hand.up.gif
|
||||
www/icons/icon.sheet.gif
|
||||
www/icons/image1.gif
|
||||
www/icons/image2.gif
|
||||
www/icons/image3.gif
|
||||
www/icons/index.gif
|
||||
www/icons/layout.gif
|
||||
www/icons/left.gif
|
||||
www/icons/link.gif
|
||||
www/icons/movie.gif
|
||||
www/icons/p.gif
|
||||
www/icons/patch.gif
|
||||
www/icons/pdf.gif
|
||||
www/icons/pie0.gif
|
||||
www/icons/pie1.gif
|
||||
www/icons/pie2.gif
|
||||
www/icons/pie3.gif
|
||||
www/icons/pie4.gif
|
||||
www/icons/pie5.gif
|
||||
www/icons/pie6.gif
|
||||
www/icons/pie7.gif
|
||||
www/icons/pie8.gif
|
||||
www/icons/portal.gif
|
||||
www/icons/ps.gif
|
||||
www/icons/quill.gif
|
||||
www/icons/right.gif
|
||||
www/icons/screw1.gif
|
||||
www/icons/screw2.gif
|
||||
www/icons/script.gif
|
||||
www/icons/sound1.gif
|
||||
www/icons/sound2.gif
|
||||
www/icons/sphere1.gif
|
||||
www/icons/sphere2.gif
|
||||
www/icons/tar.gif
|
||||
www/icons/tex.gif
|
||||
www/icons/text.gif
|
||||
www/icons/transfer.gif
|
||||
www/icons/unknown.gif
|
||||
www/icons/up.gif
|
||||
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"
|
4
www/apache/scripts/configure
vendored
4
www/apache/scripts/configure
vendored
@ -1,4 +0,0 @@
|
||||
#!/bin/sh
|
||||
echo "Making Makefile"
|
||||
sed -e "s;@@PREFIX@@;${PREFIX};" $FILESDIR/Makefile >$WRKSRC/Makefile
|
||||
cd $WRKSRC/src ; sh ./Configure
|
Loading…
Reference in New Issue
Block a user