s->uid = (uid_t)atol(user);
pw = getpwuid(s->uid);
if (!pw) {
-+ s->username = ap_psprintf(sp, "%ld", (long)s->uid);
++ s->username = apr_psprintf(sp, "%ld", (long)s->uid);
+ /*
ap_log_error(FCGI_LOG_CRIT, fcgi_apache_main_server,
"FastCGI: can't create (dynamic) server \"%s\": can't get uid/gid for wrapper: getwpuid(%ld) failed",
- }
+ */
+ } else
-+ s->username = ap_pstrdup(sp, pw->pw_name);
- s->user = ap_pstrdup(sp, user);
-- s->username = ap_pstrdup(sp, pw->pw_name);
++ s->username = apr_pstrdup(sp, pw->pw_name);
+ s->user = apr_pstrdup(sp, user);
+- s->username = apr_pstrdup(sp, pw->pw_name);
s->gid = (gid_t)atol(group);
- s->group = ap_pstrdup(sp, group);
+ s->group = apr_pstrdup(sp, group);
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-03-07 18:43:25.803230257 +0100
+++ mod_fastcgi-2.4.2/fcgi_util.c 2004-03-07 22:39:30.637790026 +0100
s->uid = uid;
pw = getpwuid(uid);
if (pw == NULL) {
-+ s->user = ap_psprintf(p, "%ld", uid);
++ s->user = apr_psprintf(p, "%ld", uid);
+ if (s->user == NULL)
- return ap_psprintf(p,
+ return apr_psprintf(p,
"getpwuid() couldn't determine the username for uid '%ld', "
"you probably need to modify the User directive: %s",
(long)uid, strerror(errno));
- }
-- s->user = ap_pstrdup(p, pw->pw_name);
+- s->user = apr_pstrdup(p, pw->pw_name);
+ } else
-+ s->user = ap_pstrdup(p, pw->pw_name);
++ s->user = apr_pstrdup(p, pw->pw_name);
s->username = s->user;
s->gid = gid;
gr = getgrgid(gid);
if (gr == NULL) {
-+ s->group = ap_psprintf(p, "%ld", gid);
++ s->group = apr_psprintf(p, "%ld", gid);
+ if (s->group == NULL)
- return ap_psprintf(p,
+ return apr_psprintf(p,
"getgrgid() couldn't determine the group name for gid '%ld', "
"you probably need to modify the Group directive: %s",
(long)gid, strerror(errno));
- }
-- s->group = ap_pstrdup(p, gr->gr_name);
+- s->group = apr_pstrdup(p, gr->gr_name);
+ } else
-+ s->group = ap_pstrdup(p, gr->gr_name);
++ s->group = apr_pstrdup(p, gr->gr_name);
#endif /* !WIN32 */
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:38:37.730693694 +0200
++++ mod_fastcgi-2.4.2/fcgi_buf.c 2004-10-06 21:40:20.580660501 +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:38:37.736692409 +0200
++++ mod_fastcgi-2.4.2/fcgi_config.c 2004-10-06 21:40:20.585659430 +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:38:37.746690267 +0200
++++ mod_fastcgi-2.4.2/fcgi_pm.c 2004-10-06 21:40:20.595657288 +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:38:37.749689624 +0200
++++ mod_fastcgi-2.4.2/fcgi_protocol.c 2004-10-06 21:40:20.598656645 +0200
@@ -110,7 +110,7 @@
char *first, *last;
/* 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:38:37.753688768 +0200
++++ mod_fastcgi-2.4.2/fcgi_util.c 2004-10-06 21:40:20.602655789 +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:38:37.767685769 +0200
++++ mod_fastcgi-2.4.2/mod_fastcgi.c 2004-10-06 21:40:20.616652790 +0200
@@ -267,7 +267,7 @@
/* Register to reset to default values when the config pool is cleaned */
continue;
}
+@@ -750,11 +750,11 @@
+ }
+
+ /* If the script wants them merged, it can do it */
+- ap_table_add(r->err_headers_out, name, value);
++ apr_table_add(r->err_headers_out, name, value);
+ continue;
+ }
+ else {
+- ap_table_add(fr->authHeaders, name, value);
++ apr_table_add(fr->authHeaders, name, value);
+ }
+ }
+
@@ -765,7 +765,7 @@
* Who responds, this handler or Apache?
*/