0.6.1.20061108-1 release

[manu/suphp.git] / debian / patches / 04_apache2.2.dpatch

diff --git a/debian/patches/04_apache2.2.dpatch b/debian/patches/04_apache2.2.dpatch
deleted file mode 100644 (file)
index 1fb9741..0000000
--- a/debian/patches/04_apache2.2.dpatch
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_apache2.2.dpatch by  <elacour@home-dn.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Apr1.x compatibility
-
-@DPATCH@
---- ./src/apache2/mod_suphp.c  2006-10-10 11:38:48.000000000 +0200
-+++ ./src/apache2/mod_suphp.c  2006-10-10 11:48:43.000000000 +0200
-@@ -488,7 +488,8 @@
-   const char *buf;
-   apr_size_t len;
-   apr_status_t rv;
--  APR_BRIGADE_FOREACH(b, bb) {
-+  b = APR_BRIGADE_FIRST(bb);
-+  while (b != APR_BRIGADE_SENTINEL(bb)) {
-       if (APR_BUCKET_IS_EOS(b)) {
-           break;
-       }
-@@ -496,6 +497,7 @@
-       if (rv != APR_SUCCESS) {
-           break;
-       }
-+      b = APR_BUCKET_NEXT(b);
-   }
- }
- 
-@@ -763,8 +765,8 @@
-             return rv;
-         }
-         
--        APR_BRIGADE_FOREACH(bucket, bb)
--        {
-+        bucket = APR_BRIGADE_FIRST(bb);
-+            while (bucket != APR_BRIGADE_SENTINEL(bb)) {
-             const char *data;
-             apr_size_t len;
-             int child_stopped_reading = 0;
-@@ -787,6 +789,7 @@
-             {
-                 child_stopped_reading = 1;
-             }
-+            bucket = APR_BUCKET_NEXT(bucket);
-         }
-         apr_brigade_cleanup(bb);
-     }
---- ./configure.ac     2006-10-10 13:18:41.000000000 +0200
-+++ ./configure.ac     2006-10-10 13:21:22.000000000 +0200
-@@ -69,6 +69,9 @@
-     if test "$major_version" = "2.0"; then
-       APACHE_VERSION_2=true
-       APACHE_VERSION_1_3=false
-+    elif test "$major_version" = "2.2"; then
-+      APACHE_VERSION_2=true
-+      APACHE_VERSION_1_3=false
-     else
-       APACHE_VERSION_2=false
-       APACHE_VERSION_1_3=true
---- ./configure        2006-10-10 13:18:51.000000000 +0200
-+++ ./configure        2006-10-10 13:21:06.000000000 +0200
-@@ -20428,6 +20428,9 @@
-     if test "$major_version" = "2.0"; then
-       APACHE_VERSION_2=true
-       APACHE_VERSION_1_3=false
-+    elif test "$major_version" = "2.2"; then
-+      APACHE_VERSION_2=true
-+      APACHE_VERSION_1_3=false
-     else
-       APACHE_VERSION_2=false
-       APACHE_VERSION_1_3=true