]> git.pld-linux.org Git - packages/apache-mod_fastcgi.git/blame - apache-mod_fastcgi-apr1.patch
projects / packages / apache-mod_fastcgi.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- update
[packages/apache-mod_fastcgi.git] / apache-mod_fastcgi-apr1.patch
CommitLineData
76020ae4
AM		 1diff -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
f3a4bc7a 3+++ mod_fastcgi-2.4.2/fcgi_config.c 2004-10-06 21:21:53.093913562 +0200
b266052a
AM		 4@@ -50,7 +50,7 @@
5 /* Convert port number */
6 tmp = (u_short) strtol(portStr, &cvptr, 10);
7 if (*cvptr != '\0' || tmp < 1 || tmp > USHRT_MAX)
8- return ap_pstrcat(p, "bad port number \"", portStr, "\"", NULL);
9+ return apr_pstrcat(p, "bad port number \"", portStr, "\"", NULL);
10
11 *port = (unsigned short) tmp;
12
13@@ -75,7 +75,7 @@
14 tmp = strtol(txt, &ptr, 10);
15
16 if (*ptr != '\0') {
17- return ap_pstrcat(p, "\"", txt, "\" must be a positive integer", NULL);
18+ return apr_pstrcat(p, "\"", txt, "\" must be a positive integer", NULL);
19 }
20
21 if (tmp < min || tmp > USHRT_MAX) {
22@@ -101,7 +101,7 @@
23
24 if (*cp != '\0')
25 {
26- return ap_pstrcat(p, "can't parse ", "\"", val, "\"", NULL);
27+ return apr_pstrcat(p, "can't parse ", "\"", val, "\"", NULL);
28 }
29 else if (*num < min)
30 {
31@@ -126,7 +126,7 @@
32 *num = (u_int)strtol(val, &ptr, 10);
33
34 if (*ptr != '\0')
35- return ap_pstrcat(p, "\"", val, "\" must be a positive integer", NULL);
36+ return apr_pstrcat(p, "\"", val, "\" must be a positive integer", NULL);
37 else if (*num < min)
38 return ap_psprintf(p, "\"%u\" must be >= %u", *num, min);
39 return NULL;
40@@ -147,7 +147,7 @@
41 *num = (float) strtod(val, &ptr);
42
43 if (*ptr != '\0')
44- return ap_pstrcat(p, "\"", val, "\" is not a floating point number", NULL);
45+ return apr_pstrcat(p, "\"", val, "\" is not a floating point number", NULL);
46 if (*num < min || *num > max)
47 return ap_psprintf(p, "\"%f\" is not between %f and %f", *num, min, max);
48 return NULL;
49@@ -160,7 +160,7 @@
50 }
51
52 if (strchr(var, '=') == NULL) {
53- *(envp + *envc) = ap_pstrcat(p, var, "=", getenv(var), NULL);
54+ *(envp + *envc) = apr_pstrcat(p, var, "=", getenv(var), NULL);
55 }
56 else {
57 *(envp + *envc) = var;
b266052a
AM		 58@@ -379,7 +379,7 @@
59 const char *err;
60 pool *tp;
61
62- fcgi_dynamic_dir = ap_pstrcat(p, fcgi_socket_dir, "/dynamic", NULL);
63+ fcgi_dynamic_dir = apr_pstrcat(p, fcgi_socket_dir, "/dynamic", NULL);
64
65 if ((err = fcgi_config_make_dir(p, fcgi_dynamic_dir)))
66 return ap_psprintf(p, "can't create dynamic directory \"%s\": %s", fcgi_dynamic_dir, err);
da9b5889
AM		 67@@ -419,7 +419,7 @@
68
69 dp = ap_popendir(tp, fcgi_dynamic_dir);
70 if (dp == NULL) {
71- ap_destroy_pool(tp);
72+ apr_destroy_pool(tp);
73 return ap_psprintf(p, "can't open dynamic directory \"%s\": %s",
74 fcgi_dynamic_dir, strerror(errno));
75 }
b266052a
AM		 76@@ -431,13 +431,13 @@
77 if (strcmp(dirp->d_name, ".") == 0 || strcmp(dirp->d_name, "..") == 0)
78 continue;
79
80- unlink(ap_pstrcat(tp, fcgi_dynamic_dir, "/", dirp->d_name, NULL));
81+ unlink(apr_pstrcat(tp, fcgi_dynamic_dir, "/", dirp->d_name, NULL));
82 }
83 }
da9b5889
AM		 84
85 #endif /* !APACHE2 */
86
87- ap_destroy_pool(tp);
88+ apr_destroy_pool(tp);
89
90 return NULL;
91 }
b266052a
AM		 92@@ -498,7 +498,7 @@
93 fcgi_socket_dir = arg_nc;
94
95 #ifdef WIN32
96- fcgi_dynamic_dir = ap_pstrcat(cmd->pool, fcgi_socket_dir, "dynamic", NULL);
97+ fcgi_dynamic_dir = apr_pstrcat(cmd->pool, fcgi_socket_dir, "dynamic", NULL);
98 #else
99 err = fcgi_config_make_dir(tp, fcgi_socket_dir);
100 if (err != NULL)
101@@ -853,7 +853,7 @@
102 }
103
104 if (!*fs_path) {
105- return ap_pstrcat(tp, name, " requires a path and either a -socket or -host option", NULL);
106+ return apr_pstrcat(tp, name, " requires a path and either a -socket or -host option", NULL);
107 }
108
109 #ifdef APACHE2
da9b5889
AM		 110diff -urN mod_fastcgi-2.4.2.org/fcgi_pm.c mod_fastcgi-2.4.2/fcgi_pm.c
111--- mod_fastcgi-2.4.2.org/fcgi_pm.c 2004-10-06 20:30:46.337894116 +0200
f3a4bc7a 112+++ mod_fastcgi-2.4.2/fcgi_pm.c 2004-10-06 21:21:53.103911421 +0200
da9b5889
AM		 113@@ -576,7 +576,7 @@
114 fs->envp[i - 1] = NULL;
115 }
116
117- ap_destroy_pool(tp);
118+ apr_destroy_pool(tp);
119
120 return proc.pid;
121
122@@ -659,7 +659,7 @@
123 "FastCGI: %s is not executable; ensure interpreted scripts have "
124 "\"#!\" as their first line",
125 fs->fs_path);
126- ap_destroy_pool(tp);
127+ apr_destroy_pool(tp);
128 goto CLEANUP;
129 }
130
b266052a
AM		 131@@ -668,9 +668,9 @@
132 * the arguments (if there are any).
133 * Build the command string to pass to CreateProcess.
134 */
135- quoted_filename = ap_pstrcat(tp, "\"", fs->fs_path, "\"", NULL);
136+ quoted_filename = apr_pstrcat(tp, "\"", fs->fs_path, "\"", NULL);
137 if (interpreter && *interpreter) {
138- pCommand = ap_pstrcat(tp, interpreter, " ", quoted_filename, NULL);
139+ pCommand = apr_pstrcat(tp, interpreter, " ", quoted_filename, NULL);
140 }
141 else {
142 pCommand = quoted_filename;
da9b5889
AM		 143@@ -744,7 +744,7 @@
144 CloseHandle(listen_handle);
145 }
146
147- ap_destroy_pool(tp);
148+ apr_destroy_pool(tp);
149
150 return pid;
151
152@@ -1340,7 +1340,7 @@
153 continue;
154
155 BagNewServer:
156- if (sp) ap_destroy_pool(sp);
157+ if (sp) apr_destroy_pool(sp);
158
159 #ifdef WIN32
160 free(cjob->fs_path);
161@@ -1362,7 +1362,7 @@
162 }
163 #endif
164
165- ap_destroy_pool(tp);
166+ apr_destroy_pool(tp);
167 }
168
169 /*
9148e31a
AM		 170diff -urN mod_fastcgi-2.4.2.org/fcgi_protocol.c mod_fastcgi-2.4.2/fcgi_protocol.c
171--- mod_fastcgi-2.4.2.org/fcgi_protocol.c 2004-10-06 20:30:46.338893902 +0200
f3a4bc7a 172+++ mod_fastcgi-2.4.2/fcgi_protocol.c 2004-10-06 21:21:53.106910778 +0200
18820dd5 173@@ -135,18 +135,18 @@
b8ef0a1b
AM		 174 {
175 table *e = r->subprocess_env;
176
177- ap_table_setn(e, "GATEWAY_INTERFACE", "CGI/1.1");
178- ap_table_setn(e, "SERVER_PROTOCOL", r->protocol);
179- ap_table_setn(e, "REQUEST_METHOD", r->method);
180- ap_table_setn(e, "QUERY_STRING", r->args ? r->args : "");
181- ap_table_setn(e, "REQUEST_URI", apache_original_uri(r));
182+ apr_table_setn(e, "GATEWAY_INTERFACE", "CGI/1.1");
183+ apr_table_setn(e, "SERVER_PROTOCOL", r->protocol);
184+ apr_table_setn(e, "REQUEST_METHOD", r->method);
185+ apr_table_setn(e, "QUERY_STRING", r->args ? r->args : "");
186+ apr_table_setn(e, "REQUEST_URI", apache_original_uri(r));
187
188 /* The FastCGI spec precludes sending of CONTENT_LENGTH, PATH_INFO,
189 * PATH_TRANSLATED, and SCRIPT_NAME (for some reason?). PATH_TRANSLATED we
18820dd5
AM		 190 * don't have, its the variable that causes Apache to break trying to set
191 * up (and thus the reason this fn exists vs. using ap_add_cgi_vars()). */
192 if (compat) {
193- ap_table_unset(e, "CONTENT_LENGTH");
194+ apr_table_unset(e, "CONTENT_LENGTH");
195 return;
196 }
197
b8ef0a1b
AM		 198@@ -155,17 +155,17 @@
199 * args and path_info of the original request, and not any that may have
200 * come with the script URI in the include command. Ugh. */
201 if (!strcmp(r->protocol, "INCLUDED")) {
202- ap_table_setn(e, "SCRIPT_NAME", r->uri);
203+ apr_table_setn(e, "SCRIPT_NAME", r->uri);
204 if (r->path_info && *r->path_info)
205- ap_table_setn(e, "PATH_INFO", r->path_info);
206+ apr_table_setn(e, "PATH_INFO", r->path_info);
207 }
208 else if (!r->path_info || !*r->path_info)
209- ap_table_setn(e, "SCRIPT_NAME", r->uri);
210+ apr_table_setn(e, "SCRIPT_NAME", r->uri);
211 else {
212 int path_info_start = ap_find_path_info(r->uri, r->path_info);
213
214- ap_table_setn(e, "SCRIPT_NAME", ap_pstrndup(r->pool, r->uri, path_info_start));
215- ap_table_setn(e, "PATH_INFO", r->path_info);
216+ apr_table_setn(e, "SCRIPT_NAME", ap_pstrndup(r->pool, r->uri, path_info_start));
217+ apr_table_setn(e, "PATH_INFO", r->path_info);
218 }
219 }
220
221@@ -178,9 +178,9 @@
9148e31a
AM		 222 int i = ph->nelts;
223
224 for ( ; i; --i, ++elt) {
225- const char *val = ap_table_get(fr->r->headers_in, *elt);
226+ const char *val = apr_table_get(fr->r->headers_in, *elt);
227 if (val) {
b8ef0a1b
AM		 228- ap_table_setn(fr->r->subprocess_env, *elt, val);
229+ apr_table_setn(fr->r->subprocess_env, *elt, val);
9148e31a 230 }
b8ef0a1b
AM		 231 }
232 }
73152fff
AM		 233@@ -373,7 +373,7 @@
234
235 if (fr->fs_stderr == NULL)
236 {
237- fr->fs_stderr = ap_palloc(p, FCGI_SERVER_MAX_STDERR_LINE_LEN + 1);
238+ fr->fs_stderr = apr_palloc(p, FCGI_SERVER_MAX_STDERR_LINE_LEN + 1);
239 }
240
241 /* We're gonna consume all thats here */
242diff -urN mod_fastcgi-2.4.2.org/fcgi_util.c mod_fastcgi-2.4.2/fcgi_util.c
243--- mod_fastcgi-2.4.2.org/fcgi_util.c 2004-10-06 20:30:46.339893687 +0200
f3a4bc7a 244+++ mod_fastcgi-2.4.2/fcgi_util.c 2004-10-06 21:21:53.110909921 +0200
b266052a
AM		 245@@ -55,7 +55,7 @@
246 fcgi_util_socket_hash_filename(pool *p, const char *path,
247 const char *user, const char *group)
248 {
249- char *buf = ap_pstrcat(p, path, user, group, NULL);
250+ char *buf = apr_pstrcat(p, path, user, group, NULL);
251
252 /* Canonicalize the path (remove "//", ".", "..") */
253 ap_getparents(buf);
254@@ -77,13 +77,13 @@
255 x = strlen(src1);
256
257 if (x == 0) {
258- p = ap_pstrcat(a, "\\", src2, NULL);
259+ p = apr_pstrcat(a, "\\", src2, NULL);
260 }
261 else if (src1[x - 1] != '\\' && src1[x - 1] != '/') {
262- p = ap_pstrcat(a, src1, "\\", src2, NULL);
263+ p = apr_pstrcat(a, src1, "\\", src2, NULL);
264 }
265 else {
266- p = ap_pstrcat(a, src1, src2, NULL);
267+ p = apr_pstrcat(a, src1, src2, NULL);
268 }
269
270 q = p ;
271@@ -137,7 +137,7 @@
272 int socket_pathLen = strlen(socket_path);
273
274 if (socket_pathLen >= sizeof((*socket_addr)->sun_path)) {
275- return ap_pstrcat(p, "path \"", socket_path,
276+ return apr_pstrcat(p, "path \"", socket_path,
277 "\" is too long for a Domain socket", NULL);
278 }
279
280@@ -204,7 +204,7 @@
281 /* Get an in_addr represention of the host */
282 if (host != NULL) {
283 if (convert_string_to_in_addr(host, &(*socket_addr)->sin_addr) != 1) {
284- return ap_pstrcat(p, "failed to resolve \"", host,
285+ return apr_pstrcat(p, "failed to resolve \"", host,
286 "\" to exactly one IP address", NULL);
287 }
288 } else {
f3a4bc7a
AM		 289@@ -311,7 +311,7 @@
290 fcgi_server *s;
291
292 /* @@@ This should now be done in the loop below */
293- ap_cpystrn(path, ePath, FCGI_MAXPATH);
294+ apr_cpystrn(path, ePath, FCGI_MAXPATH);
295 ap_no2slash(path);
296
297 for (s = fcgi_servers; s != NULL; s = s->next) {
298@@ -343,7 +343,7 @@
299 char path[FCGI_MAXPATH];
300 fcgi_server *s;
301
302- ap_cpystrn(path, ePath, FCGI_MAXPATH);
303+ apr_cpystrn(path, ePath, FCGI_MAXPATH);
304 ap_no2slash(path);
305
306 for (s = fcgi_servers; s != NULL; s = s->next) {
73152fff
AM		 307@@ -367,7 +367,7 @@
308 const char *err;
309
310 if (finfo == NULL) {
311- finfo = (struct stat *)ap_palloc(p, sizeof(struct stat));
312+ finfo = (struct stat *)apr_palloc(p, sizeof(struct stat));
313 if (stat(fs_path, finfo) < 0)
314 return ap_psprintf(p, "stat(%s) failed: %s", fs_path, strerror(errno));
315 }
4c3c1d65
AM		 316diff -urN mod_fastcgi-2.4.2.org/mod_fastcgi.c mod_fastcgi-2.4.2/mod_fastcgi.c
317--- mod_fastcgi-2.4.2.org/mod_fastcgi.c 2004-10-06 20:30:46.355890260 +0200
f3a4bc7a 318+++ mod_fastcgi-2.4.2/mod_fastcgi.c 2004-10-06 21:21:53.124906923 +0200
4c3c1d65
AM		 319@@ -267,7 +267,7 @@
320
321 /* Register to reset to default values when the config pool is cleaned */
322 ap_block_alarms();
323- ap_register_cleanup(p, NULL, fcgi_config_reset_globals, ap_null_cleanup);
324+ ap_register_cleanup(p, NULL, fcgi_config_reset_globals, apr_pool_cleanup_null);
325 ap_unblock_alarms();
326
327 #ifdef APACHE2
b266052a
AM		 328@@ -285,7 +285,7 @@
329 #ifdef WIN32
330 if (fcgi_socket_dir == NULL)
331 fcgi_socket_dir = DEFAULT_SOCK_DIR;
332- fcgi_dynamic_dir = ap_pstrcat(p, fcgi_socket_dir, "dynamic", NULL);
333+ fcgi_dynamic_dir = apr_pstrcat(p, fcgi_socket_dir, "dynamic", NULL);
334 #else
335
336 if (fcgi_socket_dir == NULL)
993e98e3
AM		 337@@ -765,7 +765,7 @@
338 * Who responds, this handler or Apache?
339 */
340 if (hasLocation) {
341- const char *location = ap_table_get(r->headers_out, "Location");
342+ const char *location = apr_table_get(r->headers_out, "Location");
343 /*
344 * Based on internal redirect handling in mod_cgi.c...
345 *
4c3c1d65
AM		 346@@ -2318,7 +2318,7 @@
347 }
348
349 ap_block_alarms();
350- ap_register_cleanup(rp, (void *)fr, cleanup, ap_null_cleanup);
351+ ap_register_cleanup(rp, (void *)fr, cleanup, apr_pool_cleanup_null);
352 ap_unblock_alarms();
353
354 #ifdef WIN32
73152fff
AM		 355@@ -2450,7 +2450,7 @@
356 else
357 #endif
358 {
359- my_finfo = (struct stat *) ap_palloc(p, sizeof(struct stat));
360+ my_finfo = (struct stat *) apr_palloc(p, sizeof(struct stat));
361
362 if (stat(fs_path, my_finfo) < 0)
363 {
993e98e3
AM		 364@@ -2531,7 +2531,7 @@
365 */
366 static int apache_is_scriptaliased(request_rec *r)
367 {
368- const char *t = ap_table_get(r->notes, "alias-forced-type");
369+ const char *t = apr_table_get(r->notes, "alias-forced-type");
370 return t && (!strcasecmp(t, "cgi-script"));
371 }
372
18820dd5
AM		 373@@ -2554,9 +2554,9 @@
374 */
375 r->method = "GET";
993e98e3 376 r->method_number = M_GET;
18820dd5
AM		 377- ap_table_unset(r->headers_in, "Content-length");
378+ apr_table_unset(r->headers_in, "Content-length");
993e98e3
AM		 379
380- ap_internal_redirect_handler(ap_table_get(r->headers_out, "Location"), r);
381+ ap_internal_redirect_handler(apr_table_get(r->headers_out, "Location"), r);
382 return OK;
383
384 case SCAN_CGI_SRV_REDIRECT:
b8ef0a1b
AM		 385@@ -2612,21 +2612,21 @@
386 if (strncasecmp(key, "Variable-", 9) == 0)
387 key += 9;
388
389- ap_table_setn(t, key, val);
390+ apr_table_setn(t, key, val);
391 return 1;
392 }
393
394 static int post_process_auth_passed_compat_header(table *t, const char *key, const char * const val)
395 {
396 if (strncasecmp(key, "Variable-", 9) == 0)
397- ap_table_setn(t, key + 9, val);
398+ apr_table_setn(t, key + 9, val);
399
400 return 1;
401 }
402
403 static int post_process_auth_failed_header(table * const t, const char * const key, const char * const val)
404 {
405- ap_table_setn(t, key, val);
406+ apr_table_setn(t, key, val);
407 return 1;
408 }
409
be58b6e3
AM		 410@@ -2639,16 +2639,16 @@
411
412 if (passed) {
413 if (fr->auth_compat) {
414- ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_compat_header,
415+ apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_compat_header,
416 (void *)r->subprocess_env, fr->authHeaders, NULL);
417 }
418 else {
419- ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_header,
420+ apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_header,
421 (void *)r->subprocess_env, fr->authHeaders, NULL);
422 }
423 }
424 else {
425- ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_failed_header,
426+ apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_failed_header,
427 (void *)r->err_headers_out, fr->authHeaders, NULL);
428 }
429
b8ef0a1b
AM		 430@@ -2681,8 +2681,8 @@
431 /* Save the existing subprocess_env, because we're gonna muddy it up */
432 fr->saved_subprocess_env = ap_copy_table(r->pool, r->subprocess_env);
433
434- ap_table_setn(r->subprocess_env, "REMOTE_PASSWD", password);
435- ap_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "AUTHENTICATOR");
436+ apr_table_setn(r->subprocess_env, "REMOTE_PASSWD", password);
437+ apr_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "AUTHENTICATOR");
438
439 /* The FastCGI Protocol doesn't differentiate authentication */
440 fr->role = FCGI_AUTHORIZER;
993e98e3
AM		 441@@ -2697,7 +2697,7 @@
442 post_process_auth(fr, authenticated);
443
444 /* A redirect shouldn't be allowed during the authentication phase */
445- if (ap_table_get(r->headers_out, "Location") != NULL) {
446+ if (apr_table_get(r->headers_out, "Location") != NULL) {
447 ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
448 "FastCGI: FastCgiAuthenticator \"%s\" redirected (not allowed)",
449 dir_config->authenticator);
b8ef0a1b
AM		 450@@ -2748,7 +2748,7 @@
451 /* Save the existing subprocess_env, because we're gonna muddy it up */
452 fr->saved_subprocess_env = ap_copy_table(r->pool, r->subprocess_env);
453
454- ap_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "AUTHORIZER");
455+ apr_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "AUTHORIZER");
456
457 fr->role = FCGI_AUTHORIZER;
458
993e98e3
AM		 459@@ -2762,7 +2762,7 @@
460 post_process_auth(fr, authorized);
461
462 /* A redirect shouldn't be allowed during the authorization phase */
463- if (ap_table_get(r->headers_out, "Location") != NULL) {
464+ if (apr_table_get(r->headers_out, "Location") != NULL) {
465 ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
466 "FastCGI: FastCgiAuthorizer \"%s\" redirected (not allowed)",
467 dir_config->authorizer);
b8ef0a1b
AM		 468@@ -2808,7 +2808,7 @@
469 /* Save the existing subprocess_env, because we're gonna muddy it up */
470 fr->saved_subprocess_env = ap_copy_table(r->pool, r->subprocess_env);
471
472- ap_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "ACCESS_CHECKER");
473+ apr_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "ACCESS_CHECKER");
474
475 /* The FastCGI Protocol doesn't differentiate access control */
476 fr->role = FCGI_AUTHORIZER;
993e98e3
AM		 477@@ -2823,7 +2823,7 @@
478 post_process_auth(fr, access_allowed);
479
480 /* A redirect shouldn't be allowed during the access check phase */
481- if (ap_table_get(r->headers_out, "Location") != NULL) {
482+ if (apr_table_get(r->headers_out, "Location") != NULL) {
483 ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
484 "FastCGI: FastCgiAccessChecker \"%s\" redirected (not allowed)",
485 dir_config->access_checker);
Support for the FastCGI protocol for apache webserver
This page took 0.417666 seconds and 4 git commands to generate.