Merged the simple-conf branch changes r159781:160695 into the trunk. (8d377183) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

Makefile.in

+15 −14

Original line number	Diff line number	Diff line
		@@ -32,6 +32,13 @@ install-conf:
		if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
		$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \
		fi ; \
		if [ ! -d $(DESTDIR)$(sysconfdir)/extra ]; then \
		$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/extra ; \
		fi ; \
		if [ ! -d $(DESTDIR)$(sysconfdir)/original ]; then \
		$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original ; \
		$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra ; \
		fi ; \
		cd $(top_srcdir)/docs/conf; \
		for i in mime.types magic; do \
		if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
		@@ -40,7 +47,7 @@ install-conf:
		done; \
		for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
		cd $$j ; \
		for i in -std.conf; do \
		for i in httpd.conf extra/httpd-*.conf; do \
		( \
		n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
		if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
		@@ -55,15 +62,9 @@ install-conf:
		-e 'p' \
		< $$i; \
		for j in $(DSO_MODULES) "^EOL^"; do \
		if test "x$$j" = "xssl"; then \
		echo "<IfDefine SSL>"; \
		fi; \
		if test $$j != "^EOL^"; then \
		echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
		fi; \
		if test "x$$j" = "xssl"; then \
		echo "</IfDefine>"; \
		fi; \
		done; \
		sed -e '1,/@@LoadModule@@/d' \
		-e '/@@LoadModule@@/d' \
		@@ -71,14 +72,14 @@ install-conf:
		-e 's#@@Port@@#$(PORT)#g' \
		< $$i; \
		fi \
		) > $(DESTDIR)$(sysconfdir)/$$i; \
		chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
		file=`echo $$i\|sed s/-std//`; \
		if [ "$$file" = "httpd.conf" ]; then \
		file=`echo $$file\|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
		) > $(DESTDIR)$(sysconfdir)/original/$$i; \
		chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \
		file=$$i; \
		if [ "$$i" = "httpd.conf" ]; then \
		file=`echo $$i\|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
		fi; \
		if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
		if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \
		fi; \
		done ; \
		done ; \

configure.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -638,7 +638,7 @@ dnl Ensure that the httpd version is included
		HTTPD_VERSION=`$abs_srcdir/build/get-version.sh all $abs_srcdir/include/ap_release.h AP_SERVER`
		AC_SUBST(HTTPD_VERSION)

		AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd-std.conf docs/conf/ssl-std.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk build/pkg/pkginfo,[true],[
		AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd.conf docs/conf/extra/httpd-autoindex.conf docs/conf/extra/httpd-dav.conf docs/conf/extra/httpd-default.conf docs/conf/extra/httpd-info.conf docs/conf/extra/httpd-languages.conf docs/conf/extra/httpd-manual.conf docs/conf/extra/httpd-mpm.conf docs/conf/extra/httpd-multilang-errordoc.conf docs/conf/extra/httpd-ssl.conf docs/conf/extra/httpd-userdir.conf docs/conf/extra/httpd-vhosts.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk build/pkg/pkginfo,[true],[
		APACHE_GEN_MAKEFILES
		])

docs/conf/extra/httpd-autoindex.conf.in

0 → 100644

+93 −0

Original line number	Diff line number	Diff line
		#
		# Directives controlling the display of server-generated directory listings.
		#
		# Required modules: mod_autoindex, mod_alias
		#
		# To see the listing of a directory, the Options directive for the
		# directory must include "Indexes", and the directory must not contain
		# a file matching those listed in the DirectoryIndex directive.
		#

		#
		# IndexOptions: Controls the appearance of server-generated directory
		# listings.
		#
		IndexOptions FancyIndexing VersionSort

		# We include the /icons/ alias for FancyIndexed directory listings. If
		# you do not use FancyIndexing, you may comment this out.
		#
		Alias /icons/ "@exp_iconsdir@/"

		<Directory "@exp_iconsdir@">
		Options Indexes MultiViews
		AllowOverride None
		Order allow,deny
		Allow from all
		</Directory>

		#
		# AddIcon* directives tell the server which icon to show for different
		# files or filename extensions. These are only displayed for
		# FancyIndexed directories.
		#
		AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip

		AddIconByType (TXT,/icons/text.gif) text/*
		AddIconByType (IMG,/icons/image2.gif) image/*
		AddIconByType (SND,/icons/sound2.gif) audio/*
		AddIconByType (VID,/icons/movie.gif) video/*

		AddIcon /icons/binary.gif .bin .exe
		AddIcon /icons/binhex.gif .hqx
		AddIcon /icons/tar.gif .tar
		AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
		AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
		AddIcon /icons/a.gif .ps .ai .eps
		AddIcon /icons/layout.gif .html .shtml .htm .pdf
		AddIcon /icons/text.gif .txt
		AddIcon /icons/c.gif .c
		AddIcon /icons/p.gif .pl .py
		AddIcon /icons/f.gif .for
		AddIcon /icons/dvi.gif .dvi
		AddIcon /icons/uuencoded.gif .uu
		AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
		AddIcon /icons/tex.gif .tex
		AddIcon /icons/bomb.gif core

		AddIcon /icons/back.gif ..
		AddIcon /icons/hand.right.gif README
		AddIcon /icons/folder.gif ^^DIRECTORY^^
		AddIcon /icons/blank.gif ^^BLANKICON^^

		#
		# DefaultIcon is which icon to show for files which do not have an icon
		# explicitly set.
		#
		DefaultIcon /icons/unknown.gif

		#
		# AddDescription allows you to place a short description after a file in
		# server-generated indexes. These are only displayed for FancyIndexed
		# directories.
		# Format: AddDescription "description" filename
		#
		#AddDescription "GZIP compressed document" .gz
		#AddDescription "tar archive" .tar
		#AddDescription "GZIP compressed tar archive" .tgz

		#
		# ReadmeName is the name of the README file the server will look for by
		# default, and append to directory listings.
		#
		# HeaderName is the name of a file which should be prepended to
		# directory indexes.
		ReadmeName README.html
		HeaderName HEADER.html

		#
		# IndexIgnore is a set of filenames which directory indexing should ignore
		# and not include in the listing. Shell-style wildcarding is permitted.
		#
		IndexIgnore .??* ~ # HEADER* README* RCS CVS ,v ,t

docs/conf/extra/httpd-dav.conf.in

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		#
		# Distributed authoring and versioning (WebDAV)
		#
		# Required modules: mod_dav, mod_dav_fs, mod_setenvif, mod_alias
		# mod_auth_digest, mod_authn_file
		#

		# The following example gives DAV write access to a directory called
		# "uploads" under the ServerRoot directory.
		#
		# The User/Group specified in httpd.conf needs to have write permissions
		# on the directory where the DavLockDB is placed and on any directory where
		# "Dav On" is specified.

		DavLockDB "@@ServerRoot@@/var/DavLock"

		Alias /uploads "@@ServerRoot@@/uploads"

		<Directory "@@ServerRoot@@/uploads">
		Dav On

		AuthType Digest
		AuthName DAV-upload
		# You can use the htdigest program to create the password database:
		# htdigest -c "@@ServerRoot@@/user.passwd" DAV-upload admin
		AuthUserFile "@@ServerRoot@@/user.passwd"

		# Allow universal read-access, but writes are restricted
		# to the admin user.
		<LimitExcept GET OPTIONS>
		require user admin
		</LimitExcept>
		</Directory>

		#
		# The following directives disable redirects on non-GET requests for
		# a directory that does not include the trailing slash. This fixes a
		# problem with several clients that do not appropriately handle
		# redirects for folders with DAV methods.
		#
		BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
		BrowserMatch "^WebDrive" redirect-carefully
		BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
		BrowserMatch "^gnome-vfs/1.0" redirect-carefully
		BrowserMatch "^XML Spy" redirect-carefully
		No newline at end of file

docs/conf/extra/httpd-default.conf.in

0 → 100644

+75 −0

Original line number	Diff line number	Diff line
		#
		# This configuration file reflects default settings for Apache HTTP Server.
		#
		# You may change these, but chances are that you may not need to.
		#

		#
		# Timeout: The number of seconds before receives and sends time out.
		#
		Timeout 300

		#
		# KeepAlive: Whether or not to allow persistent connections (more than
		# one request per connection). Set to "Off" to deactivate.
		#
		KeepAlive On

		#
		# MaxKeepAliveRequests: The maximum number of requests to allow
		# during a persistent connection. Set to 0 to allow an unlimited amount.
		# We recommend you leave this number high, for maximum performance.
		#
		MaxKeepAliveRequests 100

		#
		# KeepAliveTimeout: Number of seconds to wait for the next request from the
		# same client on the same connection.
		#
		KeepAliveTimeout 15

		#
		# UseCanonicalName: Determines how Apache constructs self-referencing
		# URLs and the SERVER_NAME and SERVER_PORT variables.
		# When set "Off", Apache will use the Hostname and Port supplied
		# by the client. When set "On", Apache will use the value of the
		# ServerName directive.
		#
		UseCanonicalName Off

		#
		# AccessFileName: The name of the file to look for in each directory
		# for additional configuration directives. See also the AllowOverride
		# directive.
		#
		AccessFileName .htaccess

		#
		# ServerTokens
		# This directive configures what you return as the Server HTTP response
		# Header. The default is 'Full' which sends information about the OS-Type
		# and compiled in modules.
		# Set to one of: Full \| OS \| Minor \| Minimal \| Major \| Prod
		# where Full conveys the most information, and Prod the least.
		#
		ServerTokens Full

		#
		# Optionally add a line containing the server version and virtual host
		# name to server-generated pages (internal error documents, FTP directory
		# listings, mod_status and mod_info output etc., but not CGI generated
		# documents or custom error documents).
		# Set to "EMail" to also include a mailto: link to the ServerAdmin.
		# Set to one of: On \| Off \| EMail
		#
		ServerSignature On

		#
		# HostnameLookups: Log the names of clients or just their IP addresses
		# e.g., www.apache.org (on) or 204.62.129.132 (off).
		# The default is off because it'd be overall better for the net if people
		# had to knowingly turn this feature on, since enabling it means that
		# each client request will result in AT LEAST one lookup request to the
		# nameserver.
		#
		HostnameLookups Off