1 diff -urN mod_fastcgi-2.4.2.org/fcgi_config.c mod_fastcgi-2.4.2/fcgi_config.c
2 --- mod_fastcgi-2.4.2.org/fcgi_config.c 2004-10-06 20:30:46.336894330 +0200
3 +++ mod_fastcgi-2.4.2/fcgi_config.c 2004-10-06 20:47:33.355164283 +0200
8 - *array = ap_make_array(p, 10, sizeof(char*));
9 + *array = apr_make_array(p, 10, sizeof(char*));
12 header = (const char **)ap_push_array(*array);
15 dp = ap_popendir(tp, fcgi_dynamic_dir);
17 - ap_destroy_pool(tp);
18 + apr_destroy_pool(tp);
19 return ap_psprintf(p, "can't open dynamic directory \"%s\": %s",
20 fcgi_dynamic_dir, strerror(errno));
26 - ap_destroy_pool(tp);
27 + apr_destroy_pool(tp);
31 diff -urN mod_fastcgi-2.4.2.org/fcgi_pm.c mod_fastcgi-2.4.2/fcgi_pm.c
32 --- mod_fastcgi-2.4.2.org/fcgi_pm.c 2004-10-06 20:30:46.337894116 +0200
33 +++ mod_fastcgi-2.4.2/fcgi_pm.c 2004-10-06 20:47:33.365162141 +0200
35 fs->envp[i - 1] = NULL;
38 - ap_destroy_pool(tp);
39 + apr_destroy_pool(tp);
44 "FastCGI: %s is not executable; ensure interpreted scripts have "
45 "\"#!\" as their first line",
47 - ap_destroy_pool(tp);
48 + apr_destroy_pool(tp);
53 CloseHandle(listen_handle);
56 - ap_destroy_pool(tp);
57 + apr_destroy_pool(tp);
65 - if (sp) ap_destroy_pool(sp);
66 + if (sp) apr_destroy_pool(sp);
74 - ap_destroy_pool(tp);
75 + apr_destroy_pool(tp);
79 diff -urN mod_fastcgi-2.4.2.org/fcgi_protocol.c mod_fastcgi-2.4.2/fcgi_protocol.c
80 --- mod_fastcgi-2.4.2.org/fcgi_protocol.c 2004-10-06 20:30:46.338893902 +0200
81 +++ mod_fastcgi-2.4.2/fcgi_protocol.c 2004-10-06 20:47:33.368161499 +0200
85 for ( ; i; --i, ++elt) {
86 - const char *val = ap_table_get(fr->r->headers_in, *elt);
87 + const char *val = apr_table_get(fr->r->headers_in, *elt);
89 ap_table_setn(fr->r->subprocess_env, *elt, val);
93 if (fr->fs_stderr == NULL)
95 - fr->fs_stderr = ap_palloc(p, FCGI_SERVER_MAX_STDERR_LINE_LEN + 1);
96 + fr->fs_stderr = apr_palloc(p, FCGI_SERVER_MAX_STDERR_LINE_LEN + 1);
99 /* We're gonna consume all thats here */
100 diff -urN mod_fastcgi-2.4.2.org/fcgi_util.c mod_fastcgi-2.4.2/fcgi_util.c
101 --- mod_fastcgi-2.4.2.org/fcgi_util.c 2004-10-06 20:30:46.339893687 +0200
102 +++ mod_fastcgi-2.4.2/fcgi_util.c 2004-10-06 20:47:33.372160642 +0200
107 - finfo = (struct stat *)ap_palloc(p, sizeof(struct stat));
108 + finfo = (struct stat *)apr_palloc(p, sizeof(struct stat));
109 if (stat(fs_path, finfo) < 0)
110 return ap_psprintf(p, "stat(%s) failed: %s", fs_path, strerror(errno));
112 diff -urN mod_fastcgi-2.4.2.org/mod_fastcgi.c mod_fastcgi-2.4.2/mod_fastcgi.c
113 --- mod_fastcgi-2.4.2.org/mod_fastcgi.c 2004-10-06 20:30:46.355890260 +0200
114 +++ mod_fastcgi-2.4.2/mod_fastcgi.c 2004-10-06 20:47:33.386157643 +0200
117 /* Register to reset to default values when the config pool is cleaned */
119 - ap_register_cleanup(p, NULL, fcgi_config_reset_globals, ap_null_cleanup);
120 + ap_register_cleanup(p, NULL, fcgi_config_reset_globals, apr_pool_cleanup_null);
125 * Who responds, this handler or Apache?
128 - const char *location = ap_table_get(r->headers_out, "Location");
129 + const char *location = apr_table_get(r->headers_out, "Location");
131 * Based on internal redirect handling in mod_cgi.c...
133 @@ -2318,7 +2318,7 @@
137 - ap_register_cleanup(rp, (void *)fr, cleanup, ap_null_cleanup);
138 + ap_register_cleanup(rp, (void *)fr, cleanup, apr_pool_cleanup_null);
142 @@ -2450,7 +2450,7 @@
146 - my_finfo = (struct stat *) ap_palloc(p, sizeof(struct stat));
147 + my_finfo = (struct stat *) apr_palloc(p, sizeof(struct stat));
149 if (stat(fs_path, my_finfo) < 0)
151 @@ -2476,7 +2476,7 @@
152 fr->erBufPtr = fcgi_buf_new(p, sizeof(FCGI_EndRequestBody) + 1);
153 fr->gotHeader = FALSE;
154 fr->parseHeader = SCAN_CGI_READING_HEADERS;
155 - fr->header = ap_make_array(p, 1, 1);
156 + fr->header = apr_make_array(p, 1, 1);
157 fr->fs_stderr = NULL;
159 fr->readingEndRequestBody = FALSE;
160 @@ -2531,7 +2531,7 @@
162 static int apache_is_scriptaliased(request_rec *r)
164 - const char *t = ap_table_get(r->notes, "alias-forced-type");
165 + const char *t = apr_table_get(r->notes, "alias-forced-type");
166 return t && (!strcasecmp(t, "cgi-script"));
169 @@ -2556,7 +2556,7 @@
170 r->method_number = M_GET;
171 ap_table_unset(r->headers_in, "Content-length");
173 - ap_internal_redirect_handler(ap_table_get(r->headers_out, "Location"), r);
174 + ap_internal_redirect_handler(apr_table_get(r->headers_out, "Location"), r);
177 case SCAN_CGI_SRV_REDIRECT:
178 @@ -2639,16 +2639,16 @@
181 if (fr->auth_compat) {
182 - ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_compat_header,
183 + apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_compat_header,
184 (void *)r->subprocess_env, fr->authHeaders, NULL);
187 - ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_header,
188 + apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_header,
189 (void *)r->subprocess_env, fr->authHeaders, NULL);
193 - ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_failed_header,
194 + apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_failed_header,
195 (void *)r->err_headers_out, fr->authHeaders, NULL);
198 @@ -2697,7 +2697,7 @@
199 post_process_auth(fr, authenticated);
201 /* A redirect shouldn't be allowed during the authentication phase */
202 - if (ap_table_get(r->headers_out, "Location") != NULL) {
203 + if (apr_table_get(r->headers_out, "Location") != NULL) {
204 ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
205 "FastCGI: FastCgiAuthenticator \"%s\" redirected (not allowed)",
206 dir_config->authenticator);
207 @@ -2762,7 +2762,7 @@
208 post_process_auth(fr, authorized);
210 /* A redirect shouldn't be allowed during the authorization phase */
211 - if (ap_table_get(r->headers_out, "Location") != NULL) {
212 + if (apr_table_get(r->headers_out, "Location") != NULL) {
213 ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
214 "FastCGI: FastCgiAuthorizer \"%s\" redirected (not allowed)",
215 dir_config->authorizer);
216 @@ -2823,7 +2823,7 @@
217 post_process_auth(fr, access_allowed);
219 /* A redirect shouldn't be allowed during the access check phase */
220 - if (ap_table_get(r->headers_out, "Location") != NULL) {
221 + if (apr_table_get(r->headers_out, "Location") != NULL) {
222 ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
223 "FastCGI: FastCgiAccessChecker \"%s\" redirected (not allowed)",
224 dir_config->access_checker);