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:45:23.618957223 +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);
13 diff -urN mod_fastcgi-2.4.2.org/fcgi_protocol.c mod_fastcgi-2.4.2/fcgi_protocol.c
14 --- mod_fastcgi-2.4.2.org/fcgi_protocol.c 2004-10-06 20:30:46.338893902 +0200
15 +++ mod_fastcgi-2.4.2/fcgi_protocol.c 2004-10-06 20:45:23.631954438 +0200
19 for ( ; i; --i, ++elt) {
20 - const char *val = ap_table_get(fr->r->headers_in, *elt);
21 + const char *val = apr_table_get(fr->r->headers_in, *elt);
23 ap_table_setn(fr->r->subprocess_env, *elt, val);
27 if (fr->fs_stderr == NULL)
29 - fr->fs_stderr = ap_palloc(p, FCGI_SERVER_MAX_STDERR_LINE_LEN + 1);
30 + fr->fs_stderr = apr_palloc(p, FCGI_SERVER_MAX_STDERR_LINE_LEN + 1);
33 /* We're gonna consume all thats here */
34 diff -urN mod_fastcgi-2.4.2.org/fcgi_util.c mod_fastcgi-2.4.2/fcgi_util.c
35 --- mod_fastcgi-2.4.2.org/fcgi_util.c 2004-10-06 20:30:46.339893687 +0200
36 +++ mod_fastcgi-2.4.2/fcgi_util.c 2004-10-06 20:45:23.635953582 +0200
41 - finfo = (struct stat *)ap_palloc(p, sizeof(struct stat));
42 + finfo = (struct stat *)apr_palloc(p, sizeof(struct stat));
43 if (stat(fs_path, finfo) < 0)
44 return ap_psprintf(p, "stat(%s) failed: %s", fs_path, strerror(errno));
46 diff -urN mod_fastcgi-2.4.2.org/mod_fastcgi.c mod_fastcgi-2.4.2/mod_fastcgi.c
47 --- mod_fastcgi-2.4.2.org/mod_fastcgi.c 2004-10-06 20:30:46.355890260 +0200
48 +++ mod_fastcgi-2.4.2/mod_fastcgi.c 2004-10-06 20:45:23.649950583 +0200
51 /* Register to reset to default values when the config pool is cleaned */
53 - ap_register_cleanup(p, NULL, fcgi_config_reset_globals, ap_null_cleanup);
54 + ap_register_cleanup(p, NULL, fcgi_config_reset_globals, apr_pool_cleanup_null);
59 * Who responds, this handler or Apache?
62 - const char *location = ap_table_get(r->headers_out, "Location");
63 + const char *location = apr_table_get(r->headers_out, "Location");
65 * Based on internal redirect handling in mod_cgi.c...
71 - ap_register_cleanup(rp, (void *)fr, cleanup, ap_null_cleanup);
72 + ap_register_cleanup(rp, (void *)fr, cleanup, apr_pool_cleanup_null);
80 - my_finfo = (struct stat *) ap_palloc(p, sizeof(struct stat));
81 + my_finfo = (struct stat *) apr_palloc(p, sizeof(struct stat));
83 if (stat(fs_path, my_finfo) < 0)
86 fr->erBufPtr = fcgi_buf_new(p, sizeof(FCGI_EndRequestBody) + 1);
87 fr->gotHeader = FALSE;
88 fr->parseHeader = SCAN_CGI_READING_HEADERS;
89 - fr->header = ap_make_array(p, 1, 1);
90 + fr->header = apr_make_array(p, 1, 1);
93 fr->readingEndRequestBody = FALSE;
96 static int apache_is_scriptaliased(request_rec *r)
98 - const char *t = ap_table_get(r->notes, "alias-forced-type");
99 + const char *t = apr_table_get(r->notes, "alias-forced-type");
100 return t && (!strcasecmp(t, "cgi-script"));
103 @@ -2556,7 +2556,7 @@
104 r->method_number = M_GET;
105 ap_table_unset(r->headers_in, "Content-length");
107 - ap_internal_redirect_handler(ap_table_get(r->headers_out, "Location"), r);
108 + ap_internal_redirect_handler(apr_table_get(r->headers_out, "Location"), r);
111 case SCAN_CGI_SRV_REDIRECT:
112 @@ -2639,16 +2639,16 @@
115 if (fr->auth_compat) {
116 - ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_compat_header,
117 + apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_compat_header,
118 (void *)r->subprocess_env, fr->authHeaders, NULL);
121 - ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_header,
122 + apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_header,
123 (void *)r->subprocess_env, fr->authHeaders, NULL);
127 - ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_failed_header,
128 + apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_failed_header,
129 (void *)r->err_headers_out, fr->authHeaders, NULL);
132 @@ -2697,7 +2697,7 @@
133 post_process_auth(fr, authenticated);
135 /* A redirect shouldn't be allowed during the authentication phase */
136 - if (ap_table_get(r->headers_out, "Location") != NULL) {
137 + if (apr_table_get(r->headers_out, "Location") != NULL) {
138 ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
139 "FastCGI: FastCgiAuthenticator \"%s\" redirected (not allowed)",
140 dir_config->authenticator);
141 @@ -2762,7 +2762,7 @@
142 post_process_auth(fr, authorized);
144 /* A redirect shouldn't be allowed during the authorization phase */
145 - if (ap_table_get(r->headers_out, "Location") != NULL) {
146 + if (apr_table_get(r->headers_out, "Location") != NULL) {
147 ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
148 "FastCGI: FastCgiAuthorizer \"%s\" redirected (not allowed)",
149 dir_config->authorizer);
150 @@ -2823,7 +2823,7 @@
151 post_process_auth(fr, access_allowed);
153 /* A redirect shouldn't be allowed during the access check phase */
154 - if (ap_table_get(r->headers_out, "Location") != NULL) {
155 + if (apr_table_get(r->headers_out, "Location") != NULL) {
156 ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
157 "FastCGI: FastCgiAccessChecker \"%s\" redirected (not allowed)",
158 dir_config->access_checker);