[SCM] Debian packaging for apache2 branch, master, updated. debian/2.4.6-2-1-gf678a56

[Stefan Fritsch]

The following commit has been merged in the master branch:
commit f678a5688fa931fae58b876e573c3b7184216f83
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Tue Jul 23 21:24:42 2013 +0200

    fix compiler warnings

diff --git a/debian/changelog b/debian/changelog
index 2e8c483..fec8b9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apache2 (2.4.6-3) UNRELEASED; urgency=low
+
+  * Fix 'implicit declaration' compiler warnings.
+
+ -- Stefan Fritsch <sf at debian.org>  Tue, 23 Jul 2013 21:24:07 +0200
+
 apache2 (2.4.6-2) unstable; urgency=low
 
   [ Stefan Fritsch ]
diff --git a/debian/patches/itk-fix-htaccess-reads-for-persistent-connections.patch b/debian/patches/itk-fix-htaccess-reads-for-persistent-connections.patch
index b24ae53..647a5d4 100644
--- a/debian/patches/itk-fix-htaccess-reads-for-persistent-connections.patch
+++ b/debian/patches/itk-fix-htaccess-reads-for-persistent-connections.patch
@@ -6,7 +6,18 @@ the same connection.
 
 --- a/server/config.c
 +++ b/server/config.c
-@@ -69,6 +69,8 @@
+@@ -52,6 +52,10 @@
+ #include "util_varbuf.h"
+ #include "mpm_common.h"
+ 
++#include "http_connection.h"
++#include <unistd.h>
++#include <sys/types.h>
++
+ #define APLOG_UNSET   (APLOG_NO_MODULE - 1)
+ /* we know core's module_index is 0 */
+ #undef APLOG_MODULE_INDEX
+@@ -69,6 +73,8 @@
  
  AP_DECLARE_DATA ap_directive_t *ap_conftree = NULL;
  
@@ -15,7 +26,7 @@ the same connection.
  APR_HOOK_STRUCT(
             APR_HOOK_LINK(header_parser)
             APR_HOOK_LINK(pre_config)
-@@ -2138,6 +2140,32 @@
+@@ -2138,6 +2144,32 @@
          else {
              if (!APR_STATUS_IS_ENOENT(status)
                  && !APR_STATUS_IS_ENOTDIR(status)) {

-- 
Debian packaging for apache2