]>
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 | |
3 | +++ mod_fastcgi-2.4.2/fcgi_config.c 2004-10-06 20:44:00.576747069 +0200 | |
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 | |
76020ae4 | 15 | +++ mod_fastcgi-2.4.2/fcgi_protocol.c 2004-10-06 20:44:00.588744498 +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 | } | |
4c3c1d65 AM |
25 | diff -urN mod_fastcgi-2.4.2.org/mod_fastcgi.c mod_fastcgi-2.4.2/mod_fastcgi.c |
26 | --- mod_fastcgi-2.4.2.org/mod_fastcgi.c 2004-10-06 20:30:46.355890260 +0200 | |
76020ae4 | 27 | +++ mod_fastcgi-2.4.2/mod_fastcgi.c 2004-10-06 20:44:00.605740857 +0200 |
4c3c1d65 AM |
28 | @@ -267,7 +267,7 @@ |
29 | ||
30 | /* Register to reset to default values when the config pool is cleaned */ | |
31 | ap_block_alarms(); | |
32 | - ap_register_cleanup(p, NULL, fcgi_config_reset_globals, ap_null_cleanup); | |
33 | + ap_register_cleanup(p, NULL, fcgi_config_reset_globals, apr_pool_cleanup_null); | |
34 | ap_unblock_alarms(); | |
35 | ||
36 | #ifdef APACHE2 | |
993e98e3 AM |
37 | @@ -765,7 +765,7 @@ |
38 | * Who responds, this handler or Apache? | |
39 | */ | |
40 | if (hasLocation) { | |
41 | - const char *location = ap_table_get(r->headers_out, "Location"); | |
42 | + const char *location = apr_table_get(r->headers_out, "Location"); | |
43 | /* | |
44 | * Based on internal redirect handling in mod_cgi.c... | |
45 | * | |
4c3c1d65 AM |
46 | @@ -2318,7 +2318,7 @@ |
47 | } | |
48 | ||
49 | ap_block_alarms(); | |
50 | - ap_register_cleanup(rp, (void *)fr, cleanup, ap_null_cleanup); | |
51 | + ap_register_cleanup(rp, (void *)fr, cleanup, apr_pool_cleanup_null); | |
52 | ap_unblock_alarms(); | |
53 | ||
54 | #ifdef WIN32 | |
76020ae4 AM |
55 | @@ -2476,7 +2476,7 @@ |
56 | fr->erBufPtr = fcgi_buf_new(p, sizeof(FCGI_EndRequestBody) + 1); | |
57 | fr->gotHeader = FALSE; | |
58 | fr->parseHeader = SCAN_CGI_READING_HEADERS; | |
59 | - fr->header = ap_make_array(p, 1, 1); | |
60 | + fr->header = apr_make_array(p, 1, 1); | |
61 | fr->fs_stderr = NULL; | |
62 | fr->r = r; | |
63 | fr->readingEndRequestBody = FALSE; | |
993e98e3 AM |
64 | @@ -2531,7 +2531,7 @@ |
65 | */ | |
66 | static int apache_is_scriptaliased(request_rec *r) | |
67 | { | |
68 | - const char *t = ap_table_get(r->notes, "alias-forced-type"); | |
69 | + const char *t = apr_table_get(r->notes, "alias-forced-type"); | |
70 | return t && (!strcasecmp(t, "cgi-script")); | |
71 | } | |
72 | ||
73 | @@ -2556,7 +2556,7 @@ | |
74 | r->method_number = M_GET; | |
75 | ap_table_unset(r->headers_in, "Content-length"); | |
76 | ||
77 | - ap_internal_redirect_handler(ap_table_get(r->headers_out, "Location"), r); | |
78 | + ap_internal_redirect_handler(apr_table_get(r->headers_out, "Location"), r); | |
79 | return OK; | |
80 | ||
81 | case SCAN_CGI_SRV_REDIRECT: | |
be58b6e3 AM |
82 | @@ -2639,16 +2639,16 @@ |
83 | ||
84 | if (passed) { | |
85 | if (fr->auth_compat) { | |
86 | - ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_compat_header, | |
87 | + apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_compat_header, | |
88 | (void *)r->subprocess_env, fr->authHeaders, NULL); | |
89 | } | |
90 | else { | |
91 | - ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_header, | |
92 | + apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_header, | |
93 | (void *)r->subprocess_env, fr->authHeaders, NULL); | |
94 | } | |
95 | } | |
96 | else { | |
97 | - ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_failed_header, | |
98 | + apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_failed_header, | |
99 | (void *)r->err_headers_out, fr->authHeaders, NULL); | |
100 | } | |
101 | ||
993e98e3 AM |
102 | @@ -2697,7 +2697,7 @@ |
103 | post_process_auth(fr, authenticated); | |
104 | ||
105 | /* A redirect shouldn't be allowed during the authentication phase */ | |
106 | - if (ap_table_get(r->headers_out, "Location") != NULL) { | |
107 | + if (apr_table_get(r->headers_out, "Location") != NULL) { | |
108 | ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r, | |
109 | "FastCGI: FastCgiAuthenticator \"%s\" redirected (not allowed)", | |
110 | dir_config->authenticator); | |
111 | @@ -2762,7 +2762,7 @@ | |
112 | post_process_auth(fr, authorized); | |
113 | ||
114 | /* A redirect shouldn't be allowed during the authorization phase */ | |
115 | - if (ap_table_get(r->headers_out, "Location") != NULL) { | |
116 | + if (apr_table_get(r->headers_out, "Location") != NULL) { | |
117 | ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r, | |
118 | "FastCGI: FastCgiAuthorizer \"%s\" redirected (not allowed)", | |
119 | dir_config->authorizer); | |
120 | @@ -2823,7 +2823,7 @@ | |
121 | post_process_auth(fr, access_allowed); | |
122 | ||
123 | /* A redirect shouldn't be allowed during the access check phase */ | |
124 | - if (ap_table_get(r->headers_out, "Location") != NULL) { | |
125 | + if (apr_table_get(r->headers_out, "Location") != NULL) { | |
126 | ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r, | |
127 | "FastCGI: FastCgiAccessChecker \"%s\" redirected (not allowed)", | |
128 | dir_config->access_checker); |