]> git.pld-linux.org Git - packages/apache-mod_fastcgi.git/blobdiff - apache-mod_fastcgi-apr1.patch
projects / packages / apache-mod_fastcgi.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- 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 1bce6374b891054f833436e8ef1dfa7913c986a5..b1b30f48879f18cbc4d7940afb027e67e8ee0991 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:43:03.369786748 +0200
++++ mod_fastcgi-2.4.2/fcgi_buf.c       2004-10-06 21:48:15.300962809 +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:43:03.374785677 +0200
++++ mod_fastcgi-2.4.2/fcgi_config.c    2004-10-06 21:48:15.306961524 +0200
 @@ -50,7 +50,7 @@
      /* Convert port number */
      tmp = (u_short) strtol(portStr, &cvptr, 10);
@@ -92,7 +92,7 @@ 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 @@
+@@ -191,10 +191,10 @@
      const char **header;
  
      if (!*array) {
@@ -100,7 +100,11 @@ diff -urN mod_fastcgi-2.4.2.org/fcgi_config.c mod_fastcgi-2.4.2/fcgi_config.c
 +        *array = apr_array_make(p, 10, sizeof(char*));
      }
  
-     header = (const char **)ap_push_array(*array);
+-    header = (const char **)ap_push_array(*array);
++    header = (const char **)apr_array_push(*array);
+     *header = ap_getword_conf(p, arg);
+ 
+     return header ? NULL : "\"\"";
 @@ -206,7 +206,7 @@
  static const char *invalid_value(pool *p, const char *cmd, const char *id,
          const char *opt, const char *err)
@@ -614,7 +618,7 @@ 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:43:03.385783321 +0200
++++ mod_fastcgi-2.4.2/fcgi_pm.c        2004-10-06 21:48:15.317959168 +0200
 @@ -365,7 +365,7 @@
      if (dnEnd == NULL) {
          dirName = "./";
@@ -762,8 +766,8 @@ 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:43:03.388782679 +0200
-@@ -110,7 +110,7 @@
++++ mod_fastcgi-2.4.2/fcgi_protocol.c  2004-10-06 21:48:15.319958740 +0200
+@@ -110,21 +110,21 @@
      char *first, *last;
  
      if (r->the_request == NULL)
@@ -772,6 +776,24 @@ diff -urN mod_fastcgi-2.4.2.org/fcgi_protocol.c mod_fastcgi-2.4.2/fcgi_protocol.
  
      first = r->the_request;   /* use the request-line */
  
+-    while (*first && !ap_isspace(*first))
++    while (*first && !apr_isspace(*first))
+         ++first;                  /* skip over the method */
+ 
+-    while (ap_isspace(*first))
++    while (apr_isspace(*first))
+         ++first;                  /* and the space(s) */
+ 
+     last = first;
+-    while (*last && !ap_isspace(*last))
++    while (*last && !apr_isspace(*last))
+         ++last;                           /* end at next whitespace */
+ 
+-    return ap_pstrndup(r->pool, first, last - first);
++    return apr_pstrndup(r->pool, first, last - first);
+ }
+ 
+ /* Based on Apache's ap_add_cgi_vars() in util_script.c.
 @@ -135,18 +135,18 @@
  {
      table *e = r->subprocess_env;
@@ -815,7 +837,7 @@ diff -urN mod_fastcgi-2.4.2.org/fcgi_protocol.c mod_fastcgi-2.4.2/fcgi_protocol.
  
 -        ap_table_setn(e, "SCRIPT_NAME", ap_pstrndup(r->pool, r->uri, path_info_start));
 -        ap_table_setn(e, "PATH_INFO", r->path_info);
-+        apr_table_setn(e, "SCRIPT_NAME", ap_pstrndup(r->pool, r->uri, path_info_start));
++        apr_table_setn(e, "SCRIPT_NAME", apr_pstrndup(r->pool, r->uri, path_info_start));
 +        apr_table_setn(e, "PATH_INFO", r->path_info);
      }
  }
@@ -843,7 +865,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:43:03.392781822 +0200
++++ mod_fastcgi-2.4.2/fcgi_util.c      2004-10-06 21:48:15.323957883 +0200
 @@ -55,7 +55,7 @@
  fcgi_util_socket_hash_filename(pool *p, const char *path,
          const char *user, const char *group)
@@ -1014,7 +1036,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:43:03.406778823 +0200
++++ mod_fastcgi-2.4.2/mod_fastcgi.c    2004-10-06 21:48:15.337954885 +0200
 @@ -267,7 +267,7 @@
  
      /* Register to reset to default values when the config pool is cleaned */
@@ -1227,9 +1249,12 @@ diff -urN mod_fastcgi-2.4.2.org/mod_fastcgi.c mod_fastcgi-2.4.2/mod_fastcgi.c
               (void *)r->err_headers_out, fr->authHeaders, NULL);
      }
  
-@@ -2681,8 +2681,8 @@
+@@ -2679,10 +2679,10 @@
+     }
+ 
      /* Save the existing subprocess_env, because we're gonna muddy it up */
-     fr->saved_subprocess_env = ap_copy_table(r->pool, r->subprocess_env);
+-    fr->saved_subprocess_env = ap_copy_table(r->pool, r->subprocess_env);
++    fr->saved_subprocess_env = apr_table_copy(r->pool, r->subprocess_env);
  
 -    ap_table_setn(r->subprocess_env, "REMOTE_PASSWD", password);
 -    ap_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "AUTHENTICATOR");
@@ -1247,9 +1272,12 @@ diff -urN mod_fastcgi-2.4.2.org/mod_fastcgi.c mod_fastcgi-2.4.2/mod_fastcgi.c
          ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
              "FastCGI: FastCgiAuthenticator \"%s\" redirected (not allowed)",
              dir_config->authenticator);
-@@ -2748,7 +2748,7 @@
+@@ -2746,9 +2746,9 @@
+     }
+ 
      /* Save the existing subprocess_env, because we're gonna muddy it up */
-     fr->saved_subprocess_env = ap_copy_table(r->pool, r->subprocess_env);
+-    fr->saved_subprocess_env = ap_copy_table(r->pool, r->subprocess_env);
++    fr->saved_subprocess_env = apr_table_copy(r->pool, r->subprocess_env);
  
 -    ap_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "AUTHORIZER");
 +    apr_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "AUTHORIZER");
@@ -1265,9 +1293,12 @@ diff -urN mod_fastcgi-2.4.2.org/mod_fastcgi.c mod_fastcgi-2.4.2/mod_fastcgi.c
          ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
              "FastCGI: FastCgiAuthorizer \"%s\" redirected (not allowed)",
              dir_config->authorizer);
-@@ -2808,7 +2808,7 @@
+@@ -2806,9 +2806,9 @@
+     }
+ 
      /* Save the existing subprocess_env, because we're gonna muddy it up */
-     fr->saved_subprocess_env = ap_copy_table(r->pool, r->subprocess_env);
+-    fr->saved_subprocess_env = ap_copy_table(r->pool, r->subprocess_env);
++    fr->saved_subprocess_env = apr_table_copy(r->pool, r->subprocess_env);
  
 -    ap_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "ACCESS_CHECKER");
 +    apr_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "ACCESS_CHECKER");
Support for the FastCGI protocol for apache webserver
This page took 0.036995 seconds and 4 git commands to generate.