- apr1 patch uneeded

[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 317e096d25d88fd6826f3f46319fea207b522169..6c15d6cd31f65d014703782aee63cc3556453e52 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_buf.c mod_fastcgi-2.4.2/fcgi_buf.c
 --- mod_fastcgi-2.4.2.org/fcgi_buf.c   2004-10-06 20:30:46.335894544 +0200
-+++ mod_fastcgi-2.4.2/fcgi_buf.c       2004-10-06 21:50:10.947188318 +0200
++++ mod_fastcgi-2.4.2/fcgi_buf.c       2004-10-06 21:53:04.248062670 +0200
 @@ -50,7 +50,7 @@
  {
      Buffer *buf;
@@ -21,7 +21,7 @@ diff -urN mod_fastcgi-2.4.2.org/fcgi_buf.c mod_fastcgi-2.4.2/fcgi_buf.c
          arr->elts = new_elts;
 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:50:10.952187247 +0200
++++ mod_fastcgi-2.4.2/fcgi_config.c    2004-10-06 21:53:04.253061599 +0200
 @@ -50,7 +50,7 @@
      /* Convert port number */
      tmp = (u_short) strtol(portStr, &cvptr, 10);
@@ -618,7 +618,16 @@ diff -urN mod_fastcgi-2.4.2.org/fcgi_config.c mod_fastcgi-2.4.2/fcgi_config.c
          case FCGI_AUTH_TYPE_AUTHENTICATOR:
 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:50:10.963184891 +0200
++++ mod_fastcgi-2.4.2/fcgi_pm.c        2004-10-06 21:53:04.263059457 +0200
+@@ -225,7 +225,7 @@
+ #ifdef WIN32
+         errno = WSAGetLastError();
+ #endif
+-        ap_snprintf(port, sizeof(port), "port=%d", 
++        apr_snprintf(port, sizeof(port), "port=%d", 
+             ((struct sockaddr_in *)fs->socket_addr)->sin_port);
+ 
+         ap_log_error(FCGI_LOG_CRIT_ERRNO, fcgi_apache_main_server,
 @@ -365,7 +365,7 @@
      if (dnEnd == NULL) {
          dirName = "./";
@@ -766,7 +775,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:50:10.965184462 +0200
++++ mod_fastcgi-2.4.2/fcgi_protocol.c  2004-10-06 21:53:04.266058814 +0200
 @@ -110,21 +110,21 @@
      char *first, *last;
  
@@ -865,7 +874,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:50:10.969183606 +0200
++++ mod_fastcgi-2.4.2/fcgi_util.c      2004-10-06 21:53:04.270057958 +0200
 @@ -55,7 +55,7 @@
  fcgi_util_socket_hash_filename(pool *p, const char *path,
          const char *user, const char *group)
@@ -952,7 +961,7 @@ diff -urN mod_fastcgi-2.4.2.org/fcgi_util.c mod_fastcgi-2.4.2/fcgi_util.c
      ap_no2slash(path);
      
      for (s = fcgi_servers; s != NULL; s = s->next) {
-@@ -367,21 +367,21 @@
+@@ -367,16 +367,16 @@
      const char *err;
  
      if (finfo == NULL) {
@@ -962,12 +971,6 @@ diff -urN mod_fastcgi-2.4.2.org/fcgi_util.c mod_fastcgi-2.4.2/fcgi_util.c
 -            return ap_psprintf(p, "stat(%s) failed: %s", fs_path, strerror(errno));
 +            return apr_psprintf(p, "stat(%s) failed: %s", fs_path, strerror(errno));
      }
- 
-     /* No Parse Header scripts aren't allowed.
-      * @@@ Well... we really could quite easily */ 
-     if (strncmp(strrchr(fs_path, '/'), "/nph-", 5) == 0)
--        return ap_psprintf(p, "NPH scripts cannot be run as FastCGI");
-+        return apr_psprintf(p, "NPH scripts cannot be run as FastCGI");
      
      if (finfo->st_mode == 0) 
 -        return ap_psprintf(p, "script not found or unable to stat()");
@@ -1036,7 +1039,7 @@ diff -urN mod_fastcgi-2.4.2.org/fcgi_util.c mod_fastcgi-2.4.2/fcgi_util.c
  #ifdef WIN32
 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:50:10.983180607 +0200
++++ mod_fastcgi-2.4.2/mod_fastcgi.c    2004-10-06 21:53:04.284054959 +0200
 @@ -267,7 +267,7 @@
  
      /* Register to reset to default values when the config pool is cleaned */
@@ -1069,15 +1072,15 @@ diff -urN mod_fastcgi-2.4.2.org/mod_fastcgi.c mod_fastcgi-2.4.2/mod_fastcgi.c
              continue;
          }
  
-@@ -736,7 +736,7 @@
-                     goto DuplicateNotAllowed;
-                 }
-                 hasContentType = TRUE;
+@@ -738,7 +738,7 @@
+ #ifdef APACHE2                
+                 ap_set_content_type(r, value);
+ #else
 -                r->content_type = ap_pstrdup(r->pool, value);
 +                r->content_type = apr_pstrdup(r->pool, value);
+ #endif                
                  continue;
              }
- 
 @@ -745,16 +745,16 @@
                      goto DuplicateNotAllowed;
                  }
@@ -1189,6 +1192,15 @@ diff -urN mod_fastcgi-2.4.2.org/mod_fastcgi.c mod_fastcgi-2.4.2/mod_fastcgi.c
      fr->fs_stderr = NULL;
      fr->r = r;
      fr->readingEndRequestBody = FALSE;
+@@ -2489,7 +2489,7 @@
+     fr->keepReadingFromFcgiApp = TRUE;
+     fr->fs = fs;
+     fr->fs_path = fs_path;
+-    fr->authHeaders = ap_make_table(p, 10);
++    fr->authHeaders = apr_table_make(p, 10);
+ #ifdef WIN32
+     fr->fd = INVALID_SOCKET;
+     fr->dynamic = ((fs == NULL) || (fs->directive == APP_CLASS_DYNAMIC)) ? TRUE : FALSE;
 @@ -2531,7 +2531,7 @@
   */
  static int apache_is_scriptaliased(request_rec *r)