- update

Changed files:
    apache-mod_fastcgi-apr1.patch -> 1.14

diff --git a/apache-mod_fastcgi-apr1.patch b/apache-mod_fastcgi-apr1.patch
index b11b7198398e8872608a31b5ff01c2032a6f7b6e..16fee3c746153042fccf154b7652c3dc44a9a83e 100644 (file)
--- a/apache-mod_fastcgi-apr1.patch
+++ b/apache-mod_fastcgi-apr1.patch
@@ -1,6 +1,6 @@
 diff -urN mod_fastcgi-2.4.2.org/fcgi_config.c mod_fastcgi-2.4.2/fcgi_config.c
 --- mod_fastcgi-2.4.2.org/fcgi_config.c        2004-10-06 20:30:46.336894330 +0200
-+++ mod_fastcgi-2.4.2/fcgi_config.c    2004-10-06 21:21:53.093913562 +0200
++++ mod_fastcgi-2.4.2/fcgi_config.c    2004-10-06 21:32:46.621910516 +0200
 @@ -50,7 +50,7 @@
      /* Convert port number */
      tmp = (u_short) strtol(portStr, &cvptr, 10);
@@ -55,6 +55,15 @@ diff -urN mod_fastcgi-2.4.2.org/fcgi_config.c mod_fastcgi-2.4.2/fcgi_config.c
      }
      else {
          *(envp + *envc) = var;
+@@ -191,7 +191,7 @@
+     const char **header;
+ 
+     if (!*array) {
+-        *array = ap_make_array(p, 10, sizeof(char*));
++        *array = apr_make_array(p, 10, sizeof(char*));
+     }
+ 
+     header = (const char **)ap_push_array(*array);
 @@ -379,7 +379,7 @@
      const char *err;
      pool *tp;
@@ -109,7 +118,7 @@ diff -urN mod_fastcgi-2.4.2.org/fcgi_config.c mod_fastcgi-2.4.2/fcgi_config.c
  #ifdef APACHE2
 diff -urN mod_fastcgi-2.4.2.org/fcgi_pm.c mod_fastcgi-2.4.2/fcgi_pm.c
 --- mod_fastcgi-2.4.2.org/fcgi_pm.c    2004-10-06 20:30:46.337894116 +0200
-+++ mod_fastcgi-2.4.2/fcgi_pm.c        2004-10-06 21:21:53.103911421 +0200
++++ mod_fastcgi-2.4.2/fcgi_pm.c        2004-10-06 21:32:46.631908374 +0200
 @@ -576,7 +576,7 @@
          fs->envp[i - 1] = NULL;
      }
@@ -169,7 +178,7 @@ diff -urN mod_fastcgi-2.4.2.org/fcgi_pm.c mod_fastcgi-2.4.2/fcgi_pm.c
  /*
 diff -urN mod_fastcgi-2.4.2.org/fcgi_protocol.c mod_fastcgi-2.4.2/fcgi_protocol.c
 --- mod_fastcgi-2.4.2.org/fcgi_protocol.c      2004-10-06 20:30:46.338893902 +0200
-+++ mod_fastcgi-2.4.2/fcgi_protocol.c  2004-10-06 21:21:53.106910778 +0200
++++ mod_fastcgi-2.4.2/fcgi_protocol.c  2004-10-06 21:32:46.634907732 +0200
 @@ -135,18 +135,18 @@
  {
      table *e = r->subprocess_env;
@@ -241,7 +250,7 @@ diff -urN mod_fastcgi-2.4.2.org/fcgi_protocol.c mod_fastcgi-2.4.2/fcgi_protocol.
                  /* We're gonna consume all thats here */
 diff -urN mod_fastcgi-2.4.2.org/fcgi_util.c mod_fastcgi-2.4.2/fcgi_util.c
 --- mod_fastcgi-2.4.2.org/fcgi_util.c  2004-10-06 20:30:46.339893687 +0200
-+++ mod_fastcgi-2.4.2/fcgi_util.c      2004-10-06 21:21:53.110909921 +0200
++++ mod_fastcgi-2.4.2/fcgi_util.c      2004-10-06 21:32:46.638906875 +0200
 @@ -55,7 +55,7 @@
  fcgi_util_socket_hash_filename(pool *p, const char *path,
          const char *user, const char *group)
@@ -315,7 +324,7 @@ diff -urN mod_fastcgi-2.4.2.org/fcgi_util.c mod_fastcgi-2.4.2/fcgi_util.c
      }
 diff -urN mod_fastcgi-2.4.2.org/mod_fastcgi.c mod_fastcgi-2.4.2/mod_fastcgi.c
 --- mod_fastcgi-2.4.2.org/mod_fastcgi.c        2004-10-06 20:30:46.355890260 +0200
-+++ mod_fastcgi-2.4.2/mod_fastcgi.c    2004-10-06 21:21:53.124906923 +0200
++++ mod_fastcgi-2.4.2/mod_fastcgi.c    2004-10-06 21:32:46.652903877 +0200
 @@ -267,7 +267,7 @@
  
      /* Register to reset to default values when the config pool is cleaned */
@@ -361,6 +370,15 @@ diff -urN mod_fastcgi-2.4.2.org/mod_fastcgi.c mod_fastcgi-2.4.2/mod_fastcgi.c
              
              if (stat(fs_path, my_finfo) < 0) 
              {
+@@ -2476,7 +2476,7 @@
+     fr->erBufPtr = fcgi_buf_new(p, sizeof(FCGI_EndRequestBody) + 1);
+     fr->gotHeader = FALSE;
+     fr->parseHeader = SCAN_CGI_READING_HEADERS;
+-    fr->header = ap_make_array(p, 1, 1);
++    fr->header = apr_make_array(p, 1, 1);
+     fr->fs_stderr = NULL;
+     fr->r = r;
+     fr->readingEndRequestBody = FALSE;
 @@ -2531,7 +2531,7 @@
   */
  static int apache_is_scriptaliased(request_rec *r)