From 4b31aea0441d6cbd46e4154ff07ad51caeb05187dad85c7689d03e42d47cd36c Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Fri, 26 Sep 2014 15:16:44 +0000 Subject: [PATCH] Accepting request 252506 from home:pgajdos - 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 --- apache2-README | 6 +++--- apache2-default-server.conf | 2 +- apache2-default-vhost-ssl.conf | 2 +- apache2-default-vhost.conf | 2 +- apache2-httpd.conf | 4 ++-- apache2-listen.conf | 2 +- apache2-mod_autoindex-defaults.conf | 2 +- apache2-mod_info.conf | 2 +- apache2-mod_log_config.conf | 2 +- apache2-mod_mime-defaults.conf | 4 ++-- apache2-mod_status.conf | 2 +- apache2-server-tuning.conf | 4 ++-- apache2-ssl-global.conf | 2 +- apache2-vhost.template | 2 +- apache2.changes | 5 +++++ apache2.spec | 2 +- rc.apache2 | 2 +- sysconfig.apache2 | 4 ++-- 18 files changed, 28 insertions(+), 23 deletions(-) diff --git a/apache2-README b/apache2-README index 9e51ca2..402904c 100644 --- a/apache2-README +++ b/apache2-README @@ -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 See -http://httpd.apache.org/docs-2.2/mpm.html and -http://httpd.apache.org/docs-2.2/misc/perf-tuning.html#compiletime +http:///httpd.apache.org/docs/2.4/mpm.html and +http:///httpd.apache.org/docs/2.4/misc/perf-tuning.html#compiletime for more technical details. 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. 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. diff --git a/apache2-default-server.conf b/apache2-default-server.conf index ce1c59d..599e244 100644 --- a/apache2-default-server.conf +++ b/apache2-default-server.conf @@ -17,7 +17,7 @@ DocumentRoot "/srv/www/htdocs" # doesn't give it to you. # # 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. Options None # AllowOverride controls what directives may be placed in .htaccess files. diff --git a/apache2-default-vhost-ssl.conf b/apache2-default-vhost-ssl.conf index 26c6f17..f504bcb 100644 --- a/apache2-default-vhost-ssl.conf +++ b/apache2-default-vhost-ssl.conf @@ -2,7 +2,7 @@ # This is the Apache server configuration file providing SSL support. # It contains the configuration directives to instruct the server how to # serve pages over an https connection. For detailing information about these -# directives see +# directives see # # 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 diff --git a/apache2-default-vhost.conf b/apache2-default-vhost.conf index cdfeb7b..ace6f0b 100644 --- a/apache2-default-vhost.conf +++ b/apache2-default-vhost.conf @@ -92,7 +92,7 @@ # doesn't give it to you. # # 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. # Options +Indexes +MultiViews +FollowSymLinks diff --git a/apache2-httpd.conf b/apache2-httpd.conf index d445209..7f03f7f 100644 --- a/apache2-httpd.conf +++ b/apache2-httpd.conf @@ -3,7 +3,7 @@ # # This is the main Apache server configuration file. It contains the # configuration directives that give the server its instructions. -# See for detailed information about +# See for detailed information about # the directives. # 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. # # Please see the documentation at -# +# # for further details before you try to setup virtual hosts. # # You may use the command line option '-S' to verify your virtual host diff --git a/apache2-listen.conf b/apache2-listen.conf index 4780a8d..9c0bea5 100644 --- a/apache2-listen.conf +++ b/apache2-listen.conf @@ -1,7 +1,7 @@ # Listen: Allows you to bind Apache to specific IP addresses and/or # ports. See also the 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 # prevent Apache from glomming onto all bound IP addresses (0.0.0.0) diff --git a/apache2-mod_autoindex-defaults.conf b/apache2-mod_autoindex-defaults.conf index a78d8f2..e507501 100644 --- a/apache2-mod_autoindex-defaults.conf +++ b/apache2-mod_autoindex-defaults.conf @@ -1,7 +1,7 @@ # # 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 # diff --git a/apache2-mod_info.conf b/apache2-mod_info.conf index 4c469ec..56472e2 100644 --- a/apache2-mod_info.conf +++ b/apache2-mod_info.conf @@ -2,7 +2,7 @@ # Allow remote server configuration reports, with the URL of # 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 # diff --git a/apache2-mod_log_config.conf b/apache2-mod_log_config.conf index 709b487..7562d50 100644 --- a/apache2-mod_log_config.conf +++ b/apache2-mod_log_config.conf @@ -2,7 +2,7 @@ # The following directives define some format nicknames for use with # 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 # # diff --git a/apache2-mod_mime-defaults.conf b/apache2-mod_mime-defaults.conf index 46ac63a..829c816 100644 --- a/apache2-mod_mime-defaults.conf +++ b/apache2-mod_mime-defaults.conf @@ -2,7 +2,7 @@ # mod_mime configuration: # 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) @@ -152,7 +152,7 @@ AddHandler type-map var # 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 MIMEMagicFile /etc/apache2/magic diff --git a/apache2-mod_status.conf b/apache2-mod_status.conf index 5fd8487..56d4015 100644 --- a/apache2-mod_status.conf +++ b/apache2-mod_status.conf @@ -2,7 +2,7 @@ # Allow server status reports generated by mod_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 # diff --git a/apache2-server-tuning.conf b/apache2-server-tuning.conf index a9c8ac5..5d5ba10 100644 --- a/apache2-server-tuning.conf +++ b/apache2-server-tuning.conf @@ -103,7 +103,7 @@ KeepAliveTimeout 15 # The default is on; turn this off if you serve from NFS-mounted # filesystems. On some systems, turning it off (regardless of # 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 @@ -112,7 +112,7 @@ KeepAliveTimeout 15 # used to deliver files (assuming that the OS supports it). # The default is on; turn this off if you serve from NFS-mounted # 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 diff --git a/apache2-ssl-global.conf b/apache2-ssl-global.conf index 5e1eed4..e13f139 100644 --- a/apache2-ssl-global.conf +++ b/apache2-ssl-global.conf @@ -7,7 +7,7 @@ # These are the configuration directives to instruct the server how to # serve pages over an https connection. For detailing information about these -# directives see +# directives see # # 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 diff --git a/apache2-vhost.template b/apache2-vhost.template index 02e2ed8..e0ca677 100644 --- a/apache2-vhost.template +++ b/apache2-vhost.template @@ -100,7 +100,7 @@ # doesn't give it to you. # # 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. # Options Indexes FollowSymLinks diff --git a/apache2.changes b/apache2.changes index 3f66faf..4b4d29f 100644 --- a/apache2.changes +++ b/apache2.changes @@ -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 diff --git a/apache2.spec b/apache2.spec index 2b70c76..1681bf4 100644 --- a/apache2.spec +++ b/apache2.spec @@ -295,7 +295,7 @@ See http://mpm-itk.sesse.net/ %endif %package devel -Summary: Apache 2.2 Header and Include Files +Summary: Apache 2 Header and Include Files Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: %{pname}-MPM diff --git a/rc.apache2 b/rc.apache2 index a83f564..ba3807b 100644 --- a/rc.apache2 +++ b/rc.apache2 @@ -21,7 +21,7 @@ # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # X-Interactive: true -# Short-Description: Apache 2.2 HTTP Server +# Short-Description: Apache 2 HTTP Server # Description: Start the Apache HTTP daemon ### END INIT INFO diff --git a/sysconfig.apache2 b/sysconfig.apache2 index f29982d..33221f6 100644 --- a/sysconfig.apache2 +++ b/sysconfig.apache2 @@ -41,7 +41,7 @@ APACHE_CONF_INCLUDE_DIRS="" # @@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 # @@ -249,7 +249,7 @@ APACHE_USE_CANONICAL_NAME="off" # # How much information the server response header field contains about the server. # (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"