- fix apr_set_content_type in proper place; my fault

Changed files:
    apache-mod_fastcgi-apache22.patch -> 1.5
    apache-mod_fastcgi-apr1.patch -> 1.30

diff --git a/apache-mod_fastcgi-apache22.patch b/apache-mod_fastcgi-apache22.patch
index ac272b650fec54998a6b9c10e49941cdce01c0be..8e7026bd1cc3179dfb7360fde920c1cf23a93c6d 100644 (file)
--- a/apache-mod_fastcgi-apache22.patch
+++ b/apache-mod_fastcgi-apache22.patch
@@ -12,15 +12,6 @@ diff -Nur mod_fastcgi-2.4.6.orig/mod_fastcgi.c mod_fastcgi-2.4.6.apache22/mod_fa
  #endif
  #endif
  
-@@ -738,7 +742,7 @@
-                 }
-                 hasContentType = TRUE;
- #ifdef APACHE2                
--                apr_set_content_type(r, value);
-+                ap_set_content_type(r, value);
- #else
-                 r->content_type = apr_pstrdup(r->pool, value);
- #endif                
 @@ -2697,10 +2701,15 @@
      r->status_line = NULL;
  }

diff --git a/apache-mod_fastcgi-apr1.patch b/apache-mod_fastcgi-apr1.patch
index 357b9c0946bee13927ef4a91e1ec35838dc97586..6c15d6cd31f65d014703782aee63cc3556453e52 100644 (file)
--- a/apache-mod_fastcgi-apr1.patch
+++ b/apache-mod_fastcgi-apr1.patch
@@ -1072,12 +1072,9 @@ diff -urN mod_fastcgi-2.4.2.org/mod_fastcgi.c mod_fastcgi-2.4.2/mod_fastcgi.c
              continue;
          }
  
-@@ -738,9 +738,9 @@
-                 }
-                 hasContentType = TRUE;
+@@ -738,7 +738,7 @@
  #ifdef APACHE2                
--                ap_set_content_type(r, value);
-+                apr_set_content_type(r, value);
+                 ap_set_content_type(r, value);
  #else
 -                r->content_type = ap_pstrdup(r->pool, value);
 +                r->content_type = apr_pstrdup(r->pool, value);