- update

[packages/apache-mod_fastcgi.git] / apache-mod_fastcgi-apr1.patch

diff --git a/apache-mod_fastcgi-apr1.patch b/apache-mod_fastcgi-apr1.patch
index 37268e58e3c29ee6a24258987bb2d7a7099a0475..860ce48d46b270b17fc5d3b898df406e4d8da55b 100644 (file)
--- a/apache-mod_fastcgi-apr1.patch
+++ b/apache-mod_fastcgi-apr1.patch
@@ -1,6 +1,117 @@
+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 20:47:33.355164283 +0200
+@@ -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);
+@@ -419,7 +419,7 @@
+ 
+         dp = ap_popendir(tp, fcgi_dynamic_dir);
+         if (dp == NULL) {
+-            ap_destroy_pool(tp);
++            apr_destroy_pool(tp);
+             return ap_psprintf(p, "can't open dynamic directory \"%s\": %s",
+                 fcgi_dynamic_dir, strerror(errno));
+         }
+@@ -437,7 +437,7 @@
+ 
+ #endif /* !APACHE2 */
+ 
+-    ap_destroy_pool(tp);
++    apr_destroy_pool(tp);
+ 
+     return NULL;
+ }
+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 20:47:33.365162141 +0200
+@@ -576,7 +576,7 @@
+         fs->envp[i - 1] = NULL;
+     }
+ 
+-    ap_destroy_pool(tp);
++    apr_destroy_pool(tp);
+ 
+     return proc.pid;
+ 
+@@ -659,7 +659,7 @@
+             "FastCGI: %s is not executable; ensure interpreted scripts have "
+             "\"#!\" as their first line", 
+             fs->fs_path);
+-        ap_destroy_pool(tp);
++        apr_destroy_pool(tp);
+         goto CLEANUP;
+     }
+ 
+@@ -744,7 +744,7 @@
+         CloseHandle(listen_handle);
+     }
+ 
+-    ap_destroy_pool(tp);
++    apr_destroy_pool(tp);
+ 
+     return pid;
+ 
+@@ -1340,7 +1340,7 @@
+         continue;
+ 
+ BagNewServer:
+-        if (sp) ap_destroy_pool(sp);
++        if (sp) apr_destroy_pool(sp);
+ 
+ #ifdef WIN32
+     free(cjob->fs_path);
+@@ -1362,7 +1362,7 @@
+     }
+ #endif
+ 
+-    ap_destroy_pool(tp);
++    apr_destroy_pool(tp);
+ }
+ 
+ /*
+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 20:47:33.368161499 +0200
+@@ -178,7 +178,7 @@
+         int i = ph->nelts;
+ 
+         for ( ; i; --i, ++elt) {
+-            const char *val = ap_table_get(fr->r->headers_in, *elt);
++            const char *val = apr_table_get(fr->r->headers_in, *elt);
+             if (val) {
+                 ap_table_setn(fr->r->subprocess_env, *elt, val);
+             }
+@@ -373,7 +373,7 @@
+ 
+                 if (fr->fs_stderr == NULL)
+                 {
+-                    fr->fs_stderr = ap_palloc(p, FCGI_SERVER_MAX_STDERR_LINE_LEN + 1);
++                    fr->fs_stderr = apr_palloc(p, FCGI_SERVER_MAX_STDERR_LINE_LEN + 1);
+                 }
+ 
+                 /* 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 20:47:33.372160642 +0200
+@@ -367,7 +367,7 @@
+     const char *err;
+ 
+     if (finfo == NULL) {
+-        finfo = (struct stat *)ap_palloc(p, sizeof(struct stat));             
++        finfo = (struct stat *)apr_palloc(p, sizeof(struct stat));            
+         if (stat(fs_path, finfo) < 0)
+             return ap_psprintf(p, "stat(%s) failed: %s", fs_path, strerror(errno));
+     }
 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 20:40:47.534101928 +0200
++++ mod_fastcgi-2.4.2/mod_fastcgi.c    2004-10-06 20:47:33.386157643 +0200
 @@ -267,7 +267,7 @@
  
      /* Register to reset to default values when the config pool is cleaned */
@@ -28,6 +139,24 @@ diff -urN mod_fastcgi-2.4.2.org/mod_fastcgi.c mod_fastcgi-2.4.2/mod_fastcgi.c
      ap_unblock_alarms();
  
  #ifdef WIN32
+@@ -2450,7 +2450,7 @@
+         else
+ #endif
+         {
+-            my_finfo = (struct stat *) ap_palloc(p, sizeof(struct stat));
++            my_finfo = (struct stat *) apr_palloc(p, sizeof(struct stat));
+             
+             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)