- mod_authn/z_core provide mod_authn/z_default to smooth upgrade

[packages/apache.git] / apache-v6only-ENOPROTOOPT.patch

diff --git a/apache-v6only-ENOPROTOOPT.patch b/apache-v6only-ENOPROTOOPT.patch
index 887911d30517f0e97fc47833f1b843e1f11af7b3..ab21ad4ea6931f69e00cca9eaea09d7df917b798 100644 (file)
--- a/apache-v6only-ENOPROTOOPT.patch
+++ b/apache-v6only-ENOPROTOOPT.patch
@@ -1,11 +1,11 @@
---- 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 @@
+--- httpd-2.4.1/server/listen.c.orig   2011-12-05 01:08:01.000000000 +0100
++++ httpd-2.4.1/server/listen.c        2012-02-22 00:22:21.899829142 +0100
+@@ -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,
++      if (stat != APR_SUCCESS && stat != APR_ENOTIMPL && stat != ENOPROTOOPT) {
+             ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p, APLOGNO(00069)
                            "make_sock: for address %pI, apr_socket_opt_set: "
                            "(IPV6_V6ONLY)",