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:44:49.239106729 +0200
++++ mod_fastcgi-2.4.2/fcgi_buf.c 2004-10-06 21:51:27.044886171 +0200
@@ -50,7 +50,7 @@
{
Buffer *buf;
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:44:49.244105658 +0200
++++ mod_fastcgi-2.4.2/fcgi_config.c 2004-10-06 21:51:27.049885100 +0200
@@ -50,7 +50,7 @@
/* Convert port number */
tmp = (u_short) strtol(portStr, &cvptr, 10);
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:44:49.254103516 +0200
++++ mod_fastcgi-2.4.2/fcgi_pm.c 2004-10-06 21:51:27.059882958 +0200
@@ -365,7 +365,7 @@
if (dnEnd == NULL) {
dirName = "./";
/*
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:44:49.257102874 +0200
-@@ -110,7 +110,7 @@
++++ mod_fastcgi-2.4.2/fcgi_protocol.c 2004-10-06 21:51:27.062882315 +0200
+@@ -110,21 +110,21 @@
char *first, *last;
if (r->the_request == NULL)
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;
- 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);
}
}
/* 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:44:49.260102231 +0200
++++ mod_fastcgi-2.4.2/fcgi_util.c 2004-10-06 21:51:27.066881459 +0200
@@ -55,7 +55,7 @@
fcgi_util_socket_hash_filename(pool *p, const char *path,
const char *user, const char *group)
#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:44:49.275099019 +0200
++++ mod_fastcgi-2.4.2/mod_fastcgi.c 2004-10-06 21:51:27.080878460 +0200
@@ -267,7 +267,7 @@
/* Register to reset to default values when the config pool is cleaned */
continue;
}
-@@ -750,11 +750,11 @@
+@@ -745,16 +745,16 @@
+ goto DuplicateNotAllowed;
+ }
+ hasLocation = TRUE;
+- ap_table_set(r->headers_out, "Location", value);
++ apr_table_set(r->headers_out, "Location", value);
+ continue;
}
/* If the script wants them merged, it can do it */
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)
(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");
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");
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");
projects / packages / apache-mod_fastcgi.git / blobdiff