print STDERR "apxs:Error: no config variable $var\n";
&usage;
}
-@@ -199,11 +201,10 @@
- ($httpd = $0) =~ s:support/apxs$::;
- }
-
--unless (-x "$httpd") {
-- error("$httpd not found or not executable");
-- exit 1;
-+if (not -x "$httpd") {
-+ print STDERR "Note: $httpd not found or not executable.\n";
- }
--
-+else {
- unless (grep /mod_so/, `. $envvars && $httpd -l`) {
- error("Sorry, no shared object support for Apache");
- error("available under your platform. Make sure");
@@ -211,7 +212,7 @@
error("your server binary `$httpd'.");
exit 1;
diff -urN httpd-2.0.45.org/config.layout httpd-2.0.45/config.layout
--- httpd-2.0.45.org/config.layout Thu Apr 3 09:27:42 2003
+++ httpd-2.0.45/config.layout Thu Apr 3 09:27:59 2003
-@@ -298,3 +298,28 @@
- installbuilddir: ${prefix}/etc/apache2/build
- errordir: ${datadir}/error
+@@ -347,3 +347,27 @@
+ proxycachedir: ${localstatedir}/proxy
</Layout>
-+
+
+# PLD layout
+<Layout PLD>
+ prefix: /usr
+ proxycachedir: /var/cache/httpd
+ installbuilddir: ${libexecdir}/build
+</Layout>
+
+++ /dev/null
---- httpd-2.2.0/docs/cgi-examples/printenv.save 2005-12-26 23:09:55.000000000 +0200
-+++ httpd-2.2.0/docs/cgi-examples/printenv 2005-12-26 23:09:55.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- ##
- ## printenv -- demo CGI program which just prints its environment
- ##
struct stat dir_info; /* directory info holder */
struct stat prg_info; /* program info holder */
-@@ -270,6 +286,7 @@ int main(int argc, char *argv[])
- clean_env();
-
- prog = argv[0];
-+
- /*
- * Check existence/validity of the UID of the user
- * running this program. Error out if invalid.
@@ -382,8 +399,23 @@ int main(int argc, char *argv[])
}
else {
--- httpd-2.2.0/configure.in~ 2005-12-18 02:38:31.000000000 +0200
+++ httpd-2.2.0/configure.in 2005-12-18 02:40:04.000000000 +0200
-@@ -584,9 +584,9 @@
- [Listening sockets are non-blocking when there are more than 1])
+@@ -751,7 +751,7 @@
+ [Allow IPv4 connections on IPv6 listening sockets])
fi
-APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile)
-+APACHE_FAST_OUTPUT(Makefile modules/Makefile)
++APACHE_FAST_OUTPUT(Makefile modules/Makefile)
APACHE_FAST_OUTPUT(os/Makefile server/Makefile)
--APACHE_FAST_OUTPUT(support/Makefile srclib/pcre/Makefile)
-+APACHE_FAST_OUTPUT(support/Makefile)
+ APACHE_FAST_OUTPUT(support/Makefile)
- if test -d ./test; then
- APACHE_FAST_OUTPUT(test/Makefile)
--- httpd-2.2.0/Makefile.in 2005-12-18 02:41:25.000000000 +0200
+++ httpd-2.2.0/Makefile.in 2005-12-18 02:38:31.000000000 +0200
@@ -1,5 +1,5 @@
--- httpd-2.0.48/server/listen.c.orig Mon Mar 31 06:30:52 2003
+++ httpd-2.0.48/server/listen.c Wed Mar 3 12:05:09 2004
-@@ -120,7 +120,7 @@
+@@ -76,7 +76,7 @@
#if APR_HAVE_IPV6
if (server->bind_addr->family == APR_INET6) {
stat = apr_socket_opt_set(s, APR_IPV6_V6ONLY, v6only_setting);
- if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
+ if (stat != APR_SUCCESS && stat != APR_ENOTIMPL && stat != ENOPROTOOPT) {
- ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p, APLOGNO(00069)
"make_sock: for address %pI, apr_socket_opt_set: "
"(IPV6_V6ONLY)",
+
%bcond_with bucketeer # debug one
# this is internal macro, don't change to %%apache_modules_api
-%define _apache_modules_api 20051115
+%define _apache_modules_api 20120211
%if "%{pld_release}" == "ac"
%define openssl_ver 0.9.7d
Summary(ru.UTF-8): Самый популярный веб-сервер
Summary(tr.UTF-8): Lider WWW tarayıcı
Name: apache
-Version: 2.2.22
-Release: 4
+Version: 2.4.1
+Release: 0.1
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: d77fa5af23df96a8af68ea8114fa6ce1
+# Source0-md5: 4366afbea8149ca125af01fd59a2f8a2
Source1: %{name}.init
Source2: %{name}.logrotate
Source3: %{name}.sysconfig
Patch2: %{name}-suexec.patch
Patch3: %{name}-branding.patch
Patch4: %{name}-apr.patch
-# what about this? it isn't applied...
-Patch6: httpd-2.0.40-xfsz.patch
+
Patch7: %{name}-syslibs.patch
-Patch8: httpd-2.0.45-encode.patch
-Patch9: %{name}-paths.patch
+
Patch10: httpd-2.0.46-dav401dest.patch
-Patch12: httpd-2.0.46-sslmutex.patch
Patch14: httpd-2.0.48-corelimit.patch
Patch15: httpd-2.0.48-debuglog.patch
Patch18: %{name}-v6only-ENOPROTOOPT.patch
%patch3 -p1
%patch4 -p1
%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+
%patch10 -p1
-%patch12 -p1
+
%patch14 -p1
%patch15 -p1
%patch18 -p1
%patch20 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch28 -p1
+# ?
+#%patch25 -p1
+# ?
+#%patch26 -p1
+# probably drop
+#%patch28 -p1
%patch29 -p1
-# using system apr, apr-util and pcre
-%{__rm} -r srclib/{apr,apr-util,pcre}
-
# sanity check
MODULES_API=`awk '/#define MODULE_MAGIC_NUMBER_MAJOR/ {print $3}' include/ap_mmn.h`
if [ "$MODULES_API" != "%_apache_modules_api" ]; then
+++ /dev/null
-* don't HTML-escape the SERVER_NAME variable
-* do escape SERVER_NAME in error docs
-* remove dates from error pages (#86474), since they won't be in the right
-language
-
-diff -ur httpd-2.2.0.org/docs/error/include/bottom.html httpd-2.2.0/docs/error/include/bottom.html
---- httpd-2.2.0.org/docs/error/include/bottom.html 2004-11-20 21:16:24.000000000 +0100
-+++ httpd-2.2.0/docs/error/include/bottom.html 2005-12-02 23:04:57.540690250 +0100
-@@ -5,10 +5,8 @@
-
- <h2>Error <!--#echo encoding="none" var="REDIRECT_STATUS" --></h2>
- <address>
-- <a href="/"><!--#echo var="SERVER_NAME" --></a><br />
-- <!--#config timefmt="%c" -->
-- <span><!--#echo var="DATE_LOCAL" --><br />
-- <!--#echo var="SERVER_SOFTWARE" --></span>
-+ <a href="/"><!--#echo encoding="entity" var="SERVER_NAME" --></a><br />
-+ <span><!--#echo var="SERVER_SOFTWARE" --></span>
- </address>
- </body>
- </html>
-diff -ur httpd-2.2.0.org/server/util_script.c httpd-2.2.0/server/util_script.c
---- httpd-2.2.0.org/server/util_script.c 2005-11-10 16:20:05.000000000 +0100
-+++ httpd-2.2.0/server/util_script.c 2005-12-02 23:04:50.848272000 +0100
-@@ -224,8 +224,7 @@
-
- apr_table_addn(e, "SERVER_SIGNATURE", ap_psignature("", r));
- apr_table_addn(e, "SERVER_SOFTWARE", ap_get_server_banner());
-- apr_table_addn(e, "SERVER_NAME",
-- ap_escape_html(r->pool, ap_get_server_name(r)));
-+ apr_table_addn(e, "SERVER_NAME", ap_get_server_name(r));
- apr_table_addn(e, "SERVER_ADDR", r->connection->local_ip); /* Apache */
- apr_table_addn(e, "SERVER_PORT",
- apr_psprintf(r->pool, "%u", ap_get_server_port(r)));
+++ /dev/null
-diff -urbB httpd-2.2.0.org/modules/ssl/ssl_engine_mutex.c httpd-2.2.0/modules/ssl/ssl_engine_mutex.c
---- httpd-2.2.0.org/modules/ssl/ssl_engine_mutex.c 2005-11-10 16:20:05.000000000 +0100
-+++ httpd-2.2.0/modules/ssl/ssl_engine_mutex.c 2005-12-02 23:11:09.183916500 +0100
-@@ -45,6 +45,10 @@
- if (mc->pMutex) {
- return TRUE;
- }
-+
-+ if (mc->szMutexFile)
-+ apr_file_remove(mc->szMutexFile, p);
-+
- if ((rv = apr_global_mutex_create(&mc->pMutex, mc->szMutexFile,
- mc->nMutexMech, s->process->pool))
- != APR_SUCCESS) {
--- httpd-2.0.48/server/core.c.corelimit
+++ httpd-2.0.48/server/core.c
-@@ -4233,6 +4233,25 @@
-
- ap_set_version(pconf);
+@@ -4424,6 +4424,25 @@
+ set_banner(pconf);
ap_setup_make_content_type(pconf);
+ ap_setup_auth_internal(ptemp);
+
+#ifdef RLIMIT_CORE
+ if (ap_coredumpdir_configured) {
+ }
+#endif
+
- return OK;
- }
-
+ if (!sys_privileges) {
+ ap_log_error(APLOG_MARK, APLOG_CRIT, 0, NULL, APLOGNO(00136)
+ "Server MUST relinquish startup privileges before "
+
--- httpd-2.0.48/include/http_log.h.debuglog
+++ httpd-2.0.48/include/http_log.h
-@@ -130,7 +130,11 @@
-
- extern int AP_DECLARE_DATA ap_default_loglevel;
-
+@@ -280,7 +280,11 @@
+ * @see ap_log_rerror
+ * @see ap_log_cserror
+ */
+#ifdef AP_FNAME
-+#define APLOG_MARK AP_FNAME,__LINE__
++#define APLOG_MARK AP_FNAME,__LINE__,APLOG_MODULE_INDEX
+#else
- #define APLOG_MARK __FILE__,__LINE__
+ #define APLOG_MARK __FILE__,__LINE__,APLOG_MODULE_INDEX
+#endif
/**
* Set up for logging to stderr.
+
projects / packages / apache.git / commitdiff