]>
Commit | Line | Data |
---|---|---|
4c3c1d65 AM |
1 | diff -urN mod_fastcgi-2.4.2.org/mod_fastcgi.c mod_fastcgi-2.4.2/mod_fastcgi.c |
2 | --- mod_fastcgi-2.4.2.org/mod_fastcgi.c 2004-10-06 20:30:46.355890260 +0200 | |
993e98e3 | 3 | +++ mod_fastcgi-2.4.2/mod_fastcgi.c 2004-10-06 20:40:47.534101928 +0200 |
4c3c1d65 AM |
4 | @@ -267,7 +267,7 @@ |
5 | ||
6 | /* Register to reset to default values when the config pool is cleaned */ | |
7 | ap_block_alarms(); | |
8 | - ap_register_cleanup(p, NULL, fcgi_config_reset_globals, ap_null_cleanup); | |
9 | + ap_register_cleanup(p, NULL, fcgi_config_reset_globals, apr_pool_cleanup_null); | |
10 | ap_unblock_alarms(); | |
11 | ||
12 | #ifdef APACHE2 | |
993e98e3 AM |
13 | @@ -765,7 +765,7 @@ |
14 | * Who responds, this handler or Apache? | |
15 | */ | |
16 | if (hasLocation) { | |
17 | - const char *location = ap_table_get(r->headers_out, "Location"); | |
18 | + const char *location = apr_table_get(r->headers_out, "Location"); | |
19 | /* | |
20 | * Based on internal redirect handling in mod_cgi.c... | |
21 | * | |
4c3c1d65 AM |
22 | @@ -2318,7 +2318,7 @@ |
23 | } | |
24 | ||
25 | ap_block_alarms(); | |
26 | - ap_register_cleanup(rp, (void *)fr, cleanup, ap_null_cleanup); | |
27 | + ap_register_cleanup(rp, (void *)fr, cleanup, apr_pool_cleanup_null); | |
28 | ap_unblock_alarms(); | |
29 | ||
30 | #ifdef WIN32 | |
993e98e3 AM |
31 | @@ -2531,7 +2531,7 @@ |
32 | */ | |
33 | static int apache_is_scriptaliased(request_rec *r) | |
34 | { | |
35 | - const char *t = ap_table_get(r->notes, "alias-forced-type"); | |
36 | + const char *t = apr_table_get(r->notes, "alias-forced-type"); | |
37 | return t && (!strcasecmp(t, "cgi-script")); | |
38 | } | |
39 | ||
40 | @@ -2556,7 +2556,7 @@ | |
41 | r->method_number = M_GET; | |
42 | ap_table_unset(r->headers_in, "Content-length"); | |
43 | ||
44 | - ap_internal_redirect_handler(ap_table_get(r->headers_out, "Location"), r); | |
45 | + ap_internal_redirect_handler(apr_table_get(r->headers_out, "Location"), r); | |
46 | return OK; | |
47 | ||
48 | case SCAN_CGI_SRV_REDIRECT: | |
be58b6e3 AM |
49 | @@ -2639,16 +2639,16 @@ |
50 | ||
51 | if (passed) { | |
52 | if (fr->auth_compat) { | |
53 | - ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_compat_header, | |
54 | + apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_compat_header, | |
55 | (void *)r->subprocess_env, fr->authHeaders, NULL); | |
56 | } | |
57 | else { | |
58 | - ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_header, | |
59 | + apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_header, | |
60 | (void *)r->subprocess_env, fr->authHeaders, NULL); | |
61 | } | |
62 | } | |
63 | else { | |
64 | - ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_failed_header, | |
65 | + apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_failed_header, | |
66 | (void *)r->err_headers_out, fr->authHeaders, NULL); | |
67 | } | |
68 | ||
993e98e3 AM |
69 | @@ -2697,7 +2697,7 @@ |
70 | post_process_auth(fr, authenticated); | |
71 | ||
72 | /* A redirect shouldn't be allowed during the authentication phase */ | |
73 | - if (ap_table_get(r->headers_out, "Location") != NULL) { | |
74 | + if (apr_table_get(r->headers_out, "Location") != NULL) { | |
75 | ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r, | |
76 | "FastCGI: FastCgiAuthenticator \"%s\" redirected (not allowed)", | |
77 | dir_config->authenticator); | |
78 | @@ -2762,7 +2762,7 @@ | |
79 | post_process_auth(fr, authorized); | |
80 | ||
81 | /* A redirect shouldn't be allowed during the authorization phase */ | |
82 | - if (ap_table_get(r->headers_out, "Location") != NULL) { | |
83 | + if (apr_table_get(r->headers_out, "Location") != NULL) { | |
84 | ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r, | |
85 | "FastCGI: FastCgiAuthorizer \"%s\" redirected (not allowed)", | |
86 | dir_config->authorizer); | |
87 | @@ -2823,7 +2823,7 @@ | |
88 | post_process_auth(fr, access_allowed); | |
89 | ||
90 | /* A redirect shouldn't be allowed during the access check phase */ | |
91 | - if (ap_table_get(r->headers_out, "Location") != NULL) { | |
92 | + if (apr_table_get(r->headers_out, "Location") != NULL) { | |
93 | ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r, | |
94 | "FastCGI: FastCgiAccessChecker \"%s\" redirected (not allowed)", | |
95 | dir_config->access_checker); |