rpm/apache2
SHA256
1
0
Fork 0
forked from pool/apache2
Code Pull Requests Activity

Accepting request 252506 from home:pgajdos

Browse Source 
- more 2.2 -> 2.4 [bnc#862058]

OBS-URL: https://build.opensuse.org/request/show/252506
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=406
This commit is contained in:
Kristyna Streitova 2014-09-26 15:16:44 +00:00 committed by Git OBS Bridge
parent e897f2962b
commit 4b31aea044
18 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apache2-README
View File

@ -48,14 +48,14 @@ The following nice article has a more in depth answer:
http://www.onlamp.com/pub/a/apache/2004/06/17/apacheckbk.html http://www.onlamp.com/pub/a/apache/2004/06/17/apacheckbk.html
See See
http://httpd.apache.org/docs-2.2/mpm.html and http:///httpd.apache.org/docs/2.4/mpm.html and
http://httpd.apache.org/docs-2.2/misc/perf-tuning.html#compiletime http:///httpd.apache.org/docs/2.4/misc/perf-tuning.html#compiletime
for more technical details. for more technical details.
In general, using a threaded MPM (worker) requires that all libraries that are In general, using a threaded MPM (worker) requires that all libraries that are
loaded into apache (and libraries loaded by them in turn) be threadsafe as well. loaded into apache (and libraries loaded by them in turn) be threadsafe as well.
See See
http://httpd.apache.org/docs-2.2/developer/thread_safety.html for a status on http:///httpd.apache.org/docs/2.4/developer/thread_safety.html for a status on
some libraries. some libraries.

2
apache2-default-server.conf
View File

@ -17,7 +17,7 @@ DocumentRoot "/srv/www/htdocs"
# doesn't give it to you. # doesn't give it to you.
# #
# The Options directive is both complicated and important. Please see # The Options directive is both complicated and important. Please see
# http://httpd.apache.org/docs-2.2/mod/core.html#options # http:///httpd.apache.org/docs/2.4/mod/core.html#options
# for more information. # for more information.
Options None Options None
# AllowOverride controls what directives may be placed in .htaccess files. # AllowOverride controls what directives may be placed in .htaccess files.

2
apache2-default-vhost-ssl.conf
View File

@ -2,7 +2,7 @@
# This is the Apache server configuration file providing SSL support. # This is the Apache server configuration file providing SSL support.
# It contains the configuration directives to instruct the server how to # It contains the configuration directives to instruct the server how to
# serve pages over an https connection. For detailing information about these # serve pages over an https connection. For detailing information about these
# directives see <URL:http://httpd.apache.org/docs-2.2/mod/mod_ssl.html> # directives see <URL:http:///httpd.apache.org/docs/2.4/mod/mod_ssl.html>
# #
# Do NOT simply read the instructions in here without understanding # Do NOT simply read the instructions in here without understanding
# what they do. They're here only as hints or reminders. If you are unsure # what they do. They're here only as hints or reminders. If you are unsure

2
apache2-default-vhost.conf
View File

@ -92,7 +92,7 @@
# doesn't give it to you. # doesn't give it to you.
# #
# The Options directive is both complicated and important. Please see # The Options directive is both complicated and important. Please see
# http://httpd.apache.org/docs-2.2/mod/core.html#options # http:///httpd.apache.org/docs/2.4/mod/core.html#options
# for more information. # for more information.
# #
Options +Indexes +MultiViews +FollowSymLinks Options +Indexes +MultiViews +FollowSymLinks

4
apache2-httpd.conf
View File

@ -3,7 +3,7 @@
# #
# This is the main Apache server configuration file. It contains the # This is the main Apache server configuration file. It contains the
# configuration directives that give the server its instructions. # configuration directives that give the server its instructions.
# See <URL:http://httpd.apache.org/docs-2.2/> for detailed information about # See <URL:http:///httpd.apache.org/docs/2.4/> for detailed information about
# the directives. # the directives.
# Based upon the default apache configuration file that ships with apache, # Based upon the default apache configuration file that ships with apache,
@ -193,7 +193,7 @@ Include /etc/apache2/sysconfig.d/include.conf
# IP addresses. This is indicated by the asterisks in the directives below. # IP addresses. This is indicated by the asterisks in the directives below.
# #
# Please see the documentation at # Please see the documentation at
# <URL:http://httpd.apache.org/docs-2.2/vhosts/> # <URL:http:///httpd.apache.org/docs/2.4/vhosts/>
# for further details before you try to setup virtual hosts. # for further details before you try to setup virtual hosts.
# #
# You may use the command line option '-S' to verify your virtual host # You may use the command line option '-S' to verify your virtual host

2
apache2-listen.conf
View File

@ -1,7 +1,7 @@
# Listen: Allows you to bind Apache to specific IP addresses and/or # Listen: Allows you to bind Apache to specific IP addresses and/or
# ports. See also the <VirtualHost> directive. # ports. See also the <VirtualHost> directive.
# #
# http://httpd.apache.org/docs-2.2/mod/mpm_common.html#listen # http:///httpd.apache.org/docs/2.4/mod/mpm_common.html#listen
# #
# Change this to Listen on specific IP addresses as shown below to # Change this to Listen on specific IP addresses as shown below to
# prevent Apache from glomming onto all bound IP addresses (0.0.0.0) # prevent Apache from glomming onto all bound IP addresses (0.0.0.0)

2
apache2-mod_autoindex-defaults.conf
View File

@ -1,7 +1,7 @@
# #
# Directives controlling the display of server-generated directory listings. # Directives controlling the display of server-generated directory listings.
# #
# see http://httpd.apache.org/docs-2.2/mod/mod_autoindex.html # see http:///httpd.apache.org/docs/2.4/mod/mod_autoindex.html
# #
<IfModule mod_autoindex.c> <IfModule mod_autoindex.c>

2
apache2-mod_info.conf
View File

@ -2,7 +2,7 @@
# Allow remote server configuration reports, with the URL of # Allow remote server configuration reports, with the URL of
# http://servername/server-info (requires that mod_info.c be loaded). # http://servername/server-info (requires that mod_info.c be loaded).
# #
# see http://httpd.apache.org/docs-2.2/mod/mod_info.html # see http:///httpd.apache.org/docs/2.4/mod/mod_info.html
# #
<IfModule mod_info.c> <IfModule mod_info.c>
<Location /server-info> <Location /server-info>

2
apache2-mod_log_config.conf
View File

@ -2,7 +2,7 @@
# The following directives define some format nicknames for use with # The following directives define some format nicknames for use with
# a CustomLog directive. # a CustomLog directive.
# #
# http://httpd.apache.org/docs-2.2/mod/mod_log_config.html # http:///httpd.apache.org/docs/2.4/mod/mod_log_config.html
# #
# #

4
apache2-mod_mime-defaults.conf
View File

@ -2,7 +2,7 @@
# mod_mime configuration: # mod_mime configuration:
# associate various bits of "meta information" with files by their filename extensions # associate various bits of "meta information" with files by their filename extensions
# #
# see http://httpd.apache.org/docs-2.2/mod/mod_mime.html # see http:///httpd.apache.org/docs/2.4/mod/mod_mime.html
# #
# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl) # Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl)
@ -152,7 +152,7 @@ AddHandler type-map var
# Guess the MIME type of a file by looking at a few bytes of its contents # Guess the MIME type of a file by looking at a few bytes of its contents
# http://httpd.apache.org/docs-2.2/mod/mod_mime_magic.html # http:///httpd.apache.org/docs/2.4/mod/mod_mime_magic.html
<IfModule mod_mime_magic.c> <IfModule mod_mime_magic.c>
MIMEMagicFile /etc/apache2/magic MIMEMagicFile /etc/apache2/magic
</IfModule> </IfModule>

2
apache2-mod_status.conf
View File

@ -2,7 +2,7 @@
# Allow server status reports generated by mod_status, # Allow server status reports generated by mod_status,
# with the URL of http://servername/server-status # with the URL of http://servername/server-status
# #
# see http://httpd.apache.org/docs-2.2/mod/mod_status.html # see http:///httpd.apache.org/docs/2.4/mod/mod_status.html
# #
<IfModule mod_status.c> <IfModule mod_status.c>
<Location /server-status> <Location /server-status>

4
apache2-server-tuning.conf
View File

@ -103,7 +103,7 @@ KeepAliveTimeout 15
# The default is on; turn this off if you serve from NFS-mounted # The default is on; turn this off if you serve from NFS-mounted
# filesystems. On some systems, turning it off (regardless of # filesystems. On some systems, turning it off (regardless of
# filesystem) can improve performance; for details, please see # filesystem) can improve performance; for details, please see
# http://httpd.apache.org/docs-2.2/mod/core.html#enablemmap # http:///httpd.apache.org/docs/2.4/mod/core.html#enablemmap
# #
#EnableMMAP off #EnableMMAP off
@ -112,7 +112,7 @@ KeepAliveTimeout 15
# used to deliver files (assuming that the OS supports it). # used to deliver files (assuming that the OS supports it).
# The default is on; turn this off if you serve from NFS-mounted # The default is on; turn this off if you serve from NFS-mounted
# filesystems. Please see # filesystems. Please see
# http://httpd.apache.org/docs-2.2/mod/core.html#enablesendfile # http:///httpd.apache.org/docs/2.4/mod/core.html#enablesendfile
# #
EnableSendfile on EnableSendfile on

2
apache2-ssl-global.conf
View File

@ -7,7 +7,7 @@
# These are the configuration directives to instruct the server how to # These are the configuration directives to instruct the server how to
# serve pages over an https connection. For detailing information about these # serve pages over an https connection. For detailing information about these
# directives see <URL:http://httpd.apache.org/docs-2.2/mod/mod_ssl.html> # directives see <URL:http:///httpd.apache.org/docs/2.4/mod/mod_ssl.html>
# #
# Do NOT simply read the instructions in here without understanding # Do NOT simply read the instructions in here without understanding
# what they do. They're here only as hints or reminders. If you are unsure # what they do. They're here only as hints or reminders. If you are unsure

2
apache2-vhost.template
View File

@ -100,7 +100,7 @@
# doesn't give it to you. # doesn't give it to you.
# #
# The Options directive is both complicated and important. Please see # The Options directive is both complicated and important. Please see
# http://httpd.apache.org/docs-2.2/mod/core.html#options # http:///httpd.apache.org/docs/2.4/mod/core.html#options
# for more information. # for more information.
# #
Options Indexes FollowSymLinks Options Indexes FollowSymLinks

5
apache2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 26 15:00:45 UTC 2014 - pgajdos@suse.com
- more 2.2 -> 2.4 [bnc#862058]
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 25 14:39:05 UTC 2014 - pgajdos@suse.com Thu Sep 25 14:39:05 UTC 2014 - pgajdos@suse.com

2
apache2.spec
View File

@ -295,7 +295,7 @@ See http://mpm-itk.sesse.net/
%endif %endif
%package devel %package devel
Summary: Apache 2.2 Header and Include Files Summary: Apache 2 Header and Include Files
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: %{pname}-MPM Requires: %{pname}-MPM

2
rc.apache2
View File

@ -21,7 +21,7 @@
# Default-Start: 3 5 # Default-Start: 3 5
# Default-Stop: 0 1 2 6 # Default-Stop: 0 1 2 6
# X-Interactive: true # X-Interactive: true
# Short-Description: Apache 2.2 HTTP Server # Short-Description: Apache 2 HTTP Server
# Description: Start the Apache HTTP daemon # Description: Start the Apache HTTP daemon
### END INIT INFO ### END INIT INFO

4
sysconfig.apache2
View File

@ -41,7 +41,7 @@ APACHE_CONF_INCLUDE_DIRS=""
# #
@@all_modules@@ @@all_modules@@
# #
# see http://httpd.apache.org/docs-2.2/mod/ ! # see http:///httpd.apache.org/docs/2.4/mod/ !
# #
# * It pays to use IfDefine statements... like # * It pays to use IfDefine statements... like
# <IfModule mod_xyz.c> # <IfModule mod_xyz.c>
@ -249,7 +249,7 @@ APACHE_USE_CANONICAL_NAME="off"
# #
# How much information the server response header field contains about the server. # How much information the server response header field contains about the server.
# (installed modules, versions, etc.) # (installed modules, versions, etc.)
# see http://httpd.apache.org/docs-2.2/mod/core.html#servertokens # see http:///httpd.apache.org/docs/2.4/mod/core.html#servertokens
# #
APACHE_SERVERTOKENS="ProductOnly" APACHE_SERVERTOKENS="ProductOnly"