]>
Commit | Line | Data |
---|---|---|
76020ae4 AM |
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 | |
73152fff | 3 | +++ mod_fastcgi-2.4.2/fcgi_config.c 2004-10-06 20:45:23.618957223 +0200 |
76020ae4 AM |
4 | @@ -191,7 +191,7 @@ |
5 | const char **header; | |
6 | ||
7 | if (!*array) { | |
8 | - *array = ap_make_array(p, 10, sizeof(char*)); | |
9 | + *array = apr_make_array(p, 10, sizeof(char*)); | |
10 | } | |
11 | ||
12 | header = (const char **)ap_push_array(*array); | |
9148e31a AM |
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 | |
73152fff | 15 | +++ mod_fastcgi-2.4.2/fcgi_protocol.c 2004-10-06 20:45:23.631954438 +0200 |
9148e31a AM |
16 | @@ -178,7 +178,7 @@ |
17 | int i = ph->nelts; | |
18 | ||
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); | |
22 | if (val) { | |
23 | ap_table_setn(fr->r->subprocess_env, *elt, val); | |
24 | } | |
73152fff AM |
25 | @@ -373,7 +373,7 @@ |
26 | ||
27 | if (fr->fs_stderr == NULL) | |
28 | { | |
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); | |
31 | } | |
32 | ||
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 | |
37 | @@ -367,7 +367,7 @@ | |
38 | const char *err; | |
39 | ||
40 | if (finfo == NULL) { | |
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)); | |
45 | } | |
4c3c1d65 AM |
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 | |
73152fff | 48 | +++ mod_fastcgi-2.4.2/mod_fastcgi.c 2004-10-06 20:45:23.649950583 +0200 |
4c3c1d65 AM |
49 | @@ -267,7 +267,7 @@ |
50 | ||
51 | /* Register to reset to default values when the config pool is cleaned */ | |
52 | ap_block_alarms(); | |
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); | |
55 | ap_unblock_alarms(); | |
56 | ||
57 | #ifdef APACHE2 | |
993e98e3 AM |
58 | @@ -765,7 +765,7 @@ |
59 | * Who responds, this handler or Apache? | |
60 | */ | |
61 | if (hasLocation) { | |
62 | - const char *location = ap_table_get(r->headers_out, "Location"); | |
63 | + const char *location = apr_table_get(r->headers_out, "Location"); | |
64 | /* | |
65 | * Based on internal redirect handling in mod_cgi.c... | |
66 | * | |
4c3c1d65 AM |
67 | @@ -2318,7 +2318,7 @@ |
68 | } | |
69 | ||
70 | ap_block_alarms(); | |
71 | - ap_register_cleanup(rp, (void *)fr, cleanup, ap_null_cleanup); | |
72 | + ap_register_cleanup(rp, (void *)fr, cleanup, apr_pool_cleanup_null); | |
73 | ap_unblock_alarms(); | |
74 | ||
75 | #ifdef WIN32 | |
73152fff AM |
76 | @@ -2450,7 +2450,7 @@ |
77 | else | |
78 | #endif | |
79 | { | |
80 | - my_finfo = (struct stat *) ap_palloc(p, sizeof(struct stat)); | |
81 | + my_finfo = (struct stat *) apr_palloc(p, sizeof(struct stat)); | |
82 | ||
83 | if (stat(fs_path, my_finfo) < 0) | |
84 | { | |
76020ae4 AM |
85 | @@ -2476,7 +2476,7 @@ |
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); | |
91 | fr->fs_stderr = NULL; | |
92 | fr->r = r; | |
93 | fr->readingEndRequestBody = FALSE; | |
993e98e3 AM |
94 | @@ -2531,7 +2531,7 @@ |
95 | */ | |
96 | static int apache_is_scriptaliased(request_rec *r) | |
97 | { | |
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")); | |
101 | } | |
102 | ||
103 | @@ -2556,7 +2556,7 @@ | |
104 | r->method_number = M_GET; | |
105 | ap_table_unset(r->headers_in, "Content-length"); | |
106 | ||
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); | |
109 | return OK; | |
110 | ||
111 | case SCAN_CGI_SRV_REDIRECT: | |
be58b6e3 AM |
112 | @@ -2639,16 +2639,16 @@ |
113 | ||
114 | if (passed) { | |
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); | |
119 | } | |
120 | else { | |
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); | |
124 | } | |
125 | } | |
126 | else { | |
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); | |
130 | } | |
131 | ||
993e98e3 AM |
132 | @@ -2697,7 +2697,7 @@ |
133 | post_process_auth(fr, authenticated); | |
134 | ||
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); | |
143 | ||
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); | |
152 | ||
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); |