]> 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
08b8dbf5
AM		 1diff -urN mod_fastcgi-2.4.2.org/fcgi_buf.c mod_fastcgi-2.4.2/fcgi_buf.c
2--- mod_fastcgi-2.4.2.org/fcgi_buf.c 2004-10-06 20:30:46.335894544 +0200
383fd18f 3+++ mod_fastcgi-2.4.2/fcgi_buf.c 2004-10-06 21:46:02.348444768 +0200
08b8dbf5
AM		 4@@ -50,7 +50,7 @@
5 {
6 Buffer *buf;
7
8- buf = (Buffer *)ap_pcalloc(p, sizeof(Buffer) + size);
9+ buf = (Buffer *)apr_pcalloc(p, sizeof(Buffer) + size);
10 buf->size = size;
11 fcgi_buf_reset(buf);
12 return buf;
13@@ -487,7 +487,7 @@
14 char *new_elts;
15 int new_nalloc = (arr->nalloc <= 0) ? n : arr->nelts + n;
16
17- new_elts = ap_pcalloc(arr->pool, arr->elt_size * new_nalloc);
18+ new_elts = apr_pcalloc(arr->pool, arr->elt_size * new_nalloc);
19 memcpy(new_elts, arr->elts, arr->nelts * arr->elt_size);
20
21 arr->elts = new_elts;
76020ae4
AM		 22diff -urN mod_fastcgi-2.4.2.org/fcgi_config.c mod_fastcgi-2.4.2/fcgi_config.c
23--- mod_fastcgi-2.4.2.org/fcgi_config.c 2004-10-06 20:30:46.336894330 +0200
383fd18f 24+++ mod_fastcgi-2.4.2/fcgi_config.c 2004-10-06 21:46:02.353443697 +0200
b266052a
AM		 25@@ -50,7 +50,7 @@
26 /* Convert port number */
27 tmp = (u_short) strtol(portStr, &cvptr, 10);
28 if (*cvptr != '\0' || tmp < 1 || tmp > USHRT_MAX)
29- return ap_pstrcat(p, "bad port number \"", portStr, "\"", NULL);
30+ return apr_pstrcat(p, "bad port number \"", portStr, "\"", NULL);
31
32 *port = (unsigned short) tmp;
33
25a8184f 34@@ -75,11 +75,11 @@
b266052a
AM		 35 tmp = strtol(txt, &ptr, 10);
36
37 if (*ptr != '\0') {
38- return ap_pstrcat(p, "\"", txt, "\" must be a positive integer", NULL);
39+ return apr_pstrcat(p, "\"", txt, "\" must be a positive integer", NULL);
40 }
41
42 if (tmp < min || tmp > USHRT_MAX) {
25a8184f
AM		 43- return ap_psprintf(p, "\"%u\" must be >= %u and < %u", *num, min, USHRT_MAX);
44+ return apr_psprintf(p, "\"%u\" must be >= %u and < %u", *num, min, USHRT_MAX);
45 }
46
47 *num = (u_short) tmp;
48@@ -101,11 +101,11 @@
b266052a
AM		 49
50 if (*cp != '\0')
51 {
52- return ap_pstrcat(p, "can't parse ", "\"", val, "\"", NULL);
53+ return apr_pstrcat(p, "can't parse ", "\"", val, "\"", NULL);
54 }
55 else if (*num < min)
56 {
25a8184f
AM		 57- return ap_psprintf(p, "\"%d\" must be >= %d", *num, min);
58+ return apr_psprintf(p, "\"%d\" must be >= %d", *num, min);
59 }
60
61 return NULL;
62@@ -126,9 +126,9 @@
b266052a
AM		 63 *num = (u_int)strtol(val, &ptr, 10);
64
65 if (*ptr != '\0')
66- return ap_pstrcat(p, "\"", val, "\" must be a positive integer", NULL);
67+ return apr_pstrcat(p, "\"", val, "\" must be a positive integer", NULL);
68 else if (*num < min)
25a8184f
AM		 69- return ap_psprintf(p, "\"%u\" must be >= %u", *num, min);
70+ return apr_psprintf(p, "\"%u\" must be >= %u", *num, min);
b266052a 71 return NULL;
25a8184f
AM		 72 }
73
74@@ -147,9 +147,9 @@
b266052a
AM		 75 *num = (float) strtod(val, &ptr);
76
77 if (*ptr != '\0')
78- return ap_pstrcat(p, "\"", val, "\" is not a floating point number", NULL);
79+ return apr_pstrcat(p, "\"", val, "\" is not a floating point number", NULL);
80 if (*num < min || *num > max)
25a8184f
AM		 81- return ap_psprintf(p, "\"%f\" is not between %f and %f", *num, min, max);
82+ return apr_psprintf(p, "\"%f\" is not between %f and %f", *num, min, max);
b266052a 83 return NULL;
25a8184f
AM		 84 }
85
b266052a
AM		 86@@ -160,7 +160,7 @@
87 }
88
89 if (strchr(var, '=') == NULL) {
90- *(envp + *envc) = ap_pstrcat(p, var, "=", getenv(var), NULL);
91+ *(envp + *envc) = apr_pstrcat(p, var, "=", getenv(var), NULL);
92 }
93 else {
94 *(envp + *envc) = var;
ffa7aacf 95@@ -191,10 +191,10 @@
2ff9aba2
AM		 96 const char **header;
97
98 if (!*array) {
99- *array = ap_make_array(p, 10, sizeof(char*));
9a987e9c 100+ *array = apr_array_make(p, 10, sizeof(char*));
2ff9aba2
AM		 101 }
102
ffa7aacf
AM		 103- header = (const char **)ap_push_array(*array);
104+ header = (const char **)apr_array_push(*array);
105 *header = ap_getword_conf(p, arg);
106
107 return header ? NULL : "\"\"";
25a8184f
AM		 108@@ -206,7 +206,7 @@
109 static const char *invalid_value(pool *p, const char *cmd, const char *id,
110 const char *opt, const char *err)
111 {
112- return ap_psprintf(p, "%s%s%s: invalid value for %s: %s",
113+ return apr_psprintf(p, "%s%s%s: invalid value for %s: %s",
114 cmd, id ? " " : "", id ? id : "", opt, err);
115 }
116
117@@ -334,7 +334,7 @@
118 if (mkdir(path, S_IRWXU) != 0)
119 #endif
120 {
121- return ap_psprintf(tp,
122+ return apr_psprintf(tp,
123 "doesn't exist and can't be created: %s",
124 strerror(errno));
125 }
126@@ -342,7 +342,7 @@
127 #ifndef WIN32
128 /* If we're root, we're gonna setuid/setgid so we need to chown */
129 if (geteuid() == 0 && chown(path, ap_user_id, ap_group_id) != 0) {
130- return ap_psprintf(tp,
131+ return apr_psprintf(tp,
132 "can't chown() to the server (uid %ld, gid %ld): %s",
133 (long)ap_user_id, (long)ap_group_id, strerror(errno));
134 }
135@@ -361,7 +361,7 @@
136 fcgi_user_id, fcgi_group_id);
137 #endif
138 if (err != NULL) {
139- return ap_psprintf(tp,
140+ return apr_psprintf(tp,
141 "access for server (uid %ld, gid %ld) failed: %s",
142 (long)fcgi_user_id, (long)fcgi_group_id, err);
143 }
144@@ -379,10 +379,10 @@
b266052a
AM		 145 const char *err;
146 pool *tp;
147
148- fcgi_dynamic_dir = ap_pstrcat(p, fcgi_socket_dir, "/dynamic", NULL);
149+ fcgi_dynamic_dir = apr_pstrcat(p, fcgi_socket_dir, "/dynamic", NULL);
150
151 if ((err = fcgi_config_make_dir(p, fcgi_dynamic_dir)))
25a8184f
AM		 152- return ap_psprintf(p, "can't create dynamic directory \"%s\": %s", fcgi_dynamic_dir, err);
153+ return apr_psprintf(p, "can't create dynamic directory \"%s\": %s", fcgi_dynamic_dir, err);
154
155 /* Don't step on a running server unless its OK. */
156 if (!wax)
157@@ -419,8 +419,8 @@
da9b5889
AM		 158
159 dp = ap_popendir(tp, fcgi_dynamic_dir);
160 if (dp == NULL) {
161- ap_destroy_pool(tp);
25a8184f 162- return ap_psprintf(p, "can't open dynamic directory \"%s\": %s",
16e18e7f 163+ apr_pool_destroy(tp);
25a8184f 164+ return apr_psprintf(p, "can't open dynamic directory \"%s\": %s",
da9b5889
AM		 165 fcgi_dynamic_dir, strerror(errno));
166 }
25a8184f 167
b266052a
AM		 168@@ -431,13 +431,13 @@
169 if (strcmp(dirp->d_name, ".") == 0 || strcmp(dirp->d_name, "..") == 0)
170 continue;
171
172- unlink(ap_pstrcat(tp, fcgi_dynamic_dir, "/", dirp->d_name, NULL));
173+ unlink(apr_pstrcat(tp, fcgi_dynamic_dir, "/", dirp->d_name, NULL));
174 }
175 }
da9b5889
AM		 176
177 #endif /* !APACHE2 */
178
179- ap_destroy_pool(tp);
16e18e7f 180+ apr_pool_destroy(tp);
da9b5889
AM		 181
182 return NULL;
183 }
25a8184f
AM		 184@@ -461,27 +461,27 @@
185 }
186
187 if (fcgi_socket_dir) {
188- return ap_psprintf(tp, "%s %s: already defined as \"%s\"",
189+ return apr_psprintf(tp, "%s %s: already defined as \"%s\"",
190 name, arg, fcgi_socket_dir);
191 }
192
193 err = fcgi_config_set_fcgi_uid_n_gid(1);
194 if (err != NULL)
195- return ap_psprintf(tp, "%s %s: %s", name, arg, err);
196+ return apr_psprintf(tp, "%s %s: %s", name, arg, err);
197
198 if (fcgi_servers != NULL) {
199- return ap_psprintf(tp,
200+ return apr_psprintf(tp,
201 "The %s command must preceed static FastCGI server definitions",
90890b93
AM		 202 name);
203 }
204
205- arg_nc = ap_pstrdup(cmd->pool, arg);
206+ arg_nc = apr_pstrdup(cmd->pool, arg);
207
208 #ifndef WIN32
209
25a8184f
AM		 210 #ifdef APACHE2
211 if (apr_filepath_merge(&arg_nc, "", arg, 0, cmd->pool))
212- return ap_psprintf(tp, "%s %s: invalid filepath", name, arg);
213+ return apr_psprintf(tp, "%s %s: invalid filepath", name, arg);
214 #else
215 arg_nc = ap_os_canonical_filename(cmd->pool, arg_nc);
216 #endif
217@@ -491,22 +491,22 @@
218 #else /* WIN32 */
219
220 if (strncmp(arg_nc, "\\\\.\\pipe\\", 9) != 0)
221- return ap_psprintf(tp, "%s %s is invalid format",name, arg_nc);
222+ return apr_psprintf(tp, "%s %s is invalid format",name, arg_nc);
223
224 #endif
225
b266052a
AM		 226 fcgi_socket_dir = arg_nc;
227
228 #ifdef WIN32
229- fcgi_dynamic_dir = ap_pstrcat(cmd->pool, fcgi_socket_dir, "dynamic", NULL);
230+ fcgi_dynamic_dir = apr_pstrcat(cmd->pool, fcgi_socket_dir, "dynamic", NULL);
231 #else
232 err = fcgi_config_make_dir(tp, fcgi_socket_dir);
233 if (err != NULL)
25a8184f
AM		 234- return ap_psprintf(tp, "%s %s: %s", name, arg_nc, err);
235+ return apr_psprintf(tp, "%s %s: %s", name, arg_nc, err);
236
237 err = fcgi_config_make_dynamic_dir(cmd->pool, 0);
238 if (err != NULL)
239- return ap_psprintf(tp, "%s %s: %s", name, arg_nc, err);
240+ return apr_psprintf(tp, "%s %s: %s", name, arg_nc, err);
241 #endif
242
243 return NULL;
244@@ -519,7 +519,7 @@
245 const char *fcgi_config_set_wrapper(cmd_parms *cmd, void *dummy, const char *arg)
246 {
247 #ifdef WIN32
248- return ap_psprintf(cmd->temp_pool,
249+ return apr_psprintf(cmd->temp_pool,
250 "the %s directive is not supported on WIN", cmd->cmd->name);
251 #else
252
253@@ -536,16 +536,16 @@
254
255 if (fcgi_wrapper)
256 {
257- return ap_psprintf(tp, "%s was already set to \"%s\"",
258+ return apr_psprintf(tp, "%s was already set to \"%s\"",
259 name, fcgi_wrapper);
260 }
261
262 err = fcgi_config_set_fcgi_uid_n_gid(1);
263 if (err != NULL)
264- return ap_psprintf(tp, "%s %s: %s", name, arg, err);
265+ return apr_psprintf(tp, "%s %s: %s", name, arg, err);
266
267 if (fcgi_servers != NULL) {
268- return ap_psprintf(tp,
269+ return apr_psprintf(tp,
270 "The %s command must preceed static FastCGI server definitions", name);
271 }
272
273@@ -562,7 +562,7 @@
274 {
275 #ifdef APACHE2
276 if (apr_filepath_merge(&wrapper, "", arg, 0, cmd->pool))
277- return ap_psprintf(tp, "%s %s: invalid filepath", name, arg);
278+ return apr_psprintf(tp, "%s %s: invalid filepath", name, arg);
279 #else
280 wrapper = ap_os_canonical_filename(cmd->pool, (char *) arg);
281 #endif
282@@ -573,7 +573,7 @@
283 err = fcgi_util_check_access(tp, wrapper, NULL, X_OK, fcgi_user_id, fcgi_group_id);
284 if (err)
285 {
286- return ap_psprintf(tp, "%s: \"%s\" execute access for server "
287+ return apr_psprintf(tp, "%s: \"%s\" execute access for server "
288 "(uid %ld, gid %ld) failed: %s", name, wrapper,
289 (long) fcgi_user_id, (long) fcgi_group_id, err);
290 }
08b8dbf5
AM		 291@@ -596,7 +596,7 @@
292 const char *option, *err;
293
294 /* Allocate temp storage for the array of initial environment variables */
295- char **envp = ap_pcalloc(tp, sizeof(char *) * (MAX_INIT_ENV_VARS + 3));
296+ char **envp = apr_pcalloc(tp, sizeof(char *) * (MAX_INIT_ENV_VARS + 3));
297 unsigned int envc = 0;
298
299 #ifdef WIN32
25a8184f
AM		 300@@ -613,11 +613,11 @@
301 return "AppClass requires a pathname!?";
302
303 if ((err = fcgi_config_set_fcgi_uid_n_gid(1)) != NULL)
304- return ap_psprintf(tp, "%s %s: %s", name, fs_path, err);
305+ return apr_psprintf(tp, "%s %s: %s", name, fs_path, err);
306
307 #ifdef APACHE2
308 if (apr_filepath_merge(&fs_path, "", fs_path, 0, p))
309- return ap_psprintf(tp, "%s %s: invalid filepath", name, fs_path);
310+ return apr_psprintf(tp, "%s %s: invalid filepath", name, fs_path);
311 #else
312 fs_path = ap_os_canonical_filename(p, fs_path);
313 #endif
314@@ -631,14 +631,14 @@
315 fcgi_util_get_server_gid(cmd->server));
316 if (s != NULL) {
317 if (fcgi_wrapper) {
318- return ap_psprintf(tp,
319+ return apr_psprintf(tp,
320 "%s: redefinition of a previously defined FastCGI "
321 "server \"%s\" with uid=%ld and gid=%ld",
322 name, fs_path, (long) fcgi_util_get_server_uid(cmd->server),
323 (long) fcgi_util_get_server_gid(cmd->server));
324 }
325 else {
326- return ap_psprintf(tp,
327+ return apr_psprintf(tp,
328 "%s: redefinition of a previously defined FastCGI server \"%s\"",
329 name, fs_path);
330 }
331@@ -646,7 +646,7 @@
332
333 err = fcgi_util_fs_is_path_ok(tp, fs_path, NULL);
334 if (err != NULL) {
335- return ap_psprintf(tp, "%s: \"%s\" %s", name, fs_path, err);
336+ return apr_psprintf(tp, "%s: \"%s\" %s", name, fs_path, err);
337 }
338
339 s = fcgi_util_fs_new(p);
340@@ -672,7 +672,7 @@
341
342 SetHandleInformation(mutex, HANDLE_FLAG_INHERIT, TRUE);
343
344- s->mutex_env_string = ap_psprintf(p, "_FCGI_MUTEX_=%ld", mutex);
345+ s->mutex_env_string = apr_psprintf(p, "_FCGI_MUTEX_=%ld", mutex);
346
347 #endif
348
349@@ -730,7 +730,7 @@
350 }
351 else if (strcasecmp(option, "-user") == 0) {
352 #ifdef WIN32
353- return ap_psprintf(tp,
354+ return apr_psprintf(tp,
355 "%s %s: the -user option isn't supported on WIN", name, fs_path);
356 #else
357 s->user = ap_getword_conf(tp, &arg);
358@@ -740,7 +740,7 @@
359 }
360 else if (strcasecmp(option, "-group") == 0) {
361 #ifdef WIN32
362- return ap_psprintf(tp,
363+ return apr_psprintf(tp,
364 "%s %s: the -group option isn't supported on WIN", name, fs_path);
365 #else
366 s->group = ap_getword_conf(tp, &arg);
367@@ -749,7 +749,7 @@
368 #endif
369 }
370 else {
371- return ap_psprintf(tp, "%s %s: invalid option: %s", name, fs_path, option);
372+ return apr_psprintf(tp, "%s %s: invalid option: %s", name, fs_path, option);
373 }
374 } /* while */
375
376@@ -758,12 +758,12 @@
377 {
378 if (s->group == NULL)
379 {
380- s->group = ap_psprintf(tp, "#%ld", fcgi_util_get_server_gid(cmd->server));
381+ s->group = apr_psprintf(tp, "#%ld", fcgi_util_get_server_gid(cmd->server));
382 }
383
384 if (s->user == NULL)
385 {
386- s->user = ap_psprintf(p, "#%ld", fcgi_util_get_server_uid(cmd->server));
387+ s->user = apr_psprintf(p, "#%ld", fcgi_util_get_server_uid(cmd->server));
388 }
389
390 s->uid = ap_uname2id(s->user);
391@@ -777,19 +777,19 @@
392
393 if ((err = fcgi_util_fs_set_uid_n_gid(p, s, s->uid, s->gid)))
394 {
395- return ap_psprintf(tp,
396+ return apr_psprintf(tp,
397 "%s %s: invalid user or group: %s", name, fs_path, err);
398 }
399 #endif /* !WIN32 */
400
401 if (s->socket_path != NULL && s->port != 0) {
402- return ap_psprintf(tp,
403+ return apr_psprintf(tp,
404 "%s %s: -port and -socket are mutually exclusive options",
405 name, fs_path);
08b8dbf5
AM		 406 }
407
408 /* Move env array to a surviving pool */
409- s->envp = (char **)ap_pcalloc(p, sizeof(char *) * (envc + 4));
410+ s->envp = (char **)apr_pcalloc(p, sizeof(char *) * (envc + 4));
411 memcpy(s->envp, envp, sizeof(char *) * envc);
412
413 /* Initialize process structs */
25a8184f
AM		 414@@ -800,12 +800,12 @@
415 err = fcgi_util_socket_make_inet_addr(p, (struct sockaddr_in **)&s->socket_addr,
416 &s->socket_addr_len, NULL, s->port);
417 if (err != NULL)
418- return ap_psprintf(tp, "%s %s: %s", name, fs_path, err);
419+ return apr_psprintf(tp, "%s %s: %s", name, fs_path, err);
420 #ifdef WIN32
421 err = fcgi_util_socket_make_inet_addr(p, (struct sockaddr_in **)&s->dest_addr,
422 &s->socket_addr_len, "localhost", s->port);
423 if (err != NULL)
424- return ap_psprintf(tp, "%s %s: %s", name, fs_path, err);
425+ return apr_psprintf(tp, "%s %s: %s", name, fs_path, err);
426 #endif
427 } else {
428 if (s->socket_path == NULL)
429@@ -825,7 +825,7 @@
430 err = fcgi_util_socket_make_domain_addr(p, (struct sockaddr_un **)&s->socket_addr,
431 &s->socket_addr_len, s->socket_path);
432 if (err != NULL)
433- return ap_psprintf(tp, "%s %s: %s", name, fs_path, err);
434+ return apr_psprintf(tp, "%s %s: %s", name, fs_path, err);
435 #endif
436 }
437
438@@ -853,12 +853,12 @@
b266052a
AM		 439 }
440
441 if (!*fs_path) {
442- return ap_pstrcat(tp, name, " requires a path and either a -socket or -host option", NULL);
443+ return apr_pstrcat(tp, name, " requires a path and either a -socket or -host option", NULL);
444 }
445
446 #ifdef APACHE2
25a8184f
AM		 447 if (apr_filepath_merge(&fs_path, "", fs_path, 0, p))
448- return ap_psprintf(tp, "%s %s: invalid filepath", name, fs_path);
449+ return apr_psprintf(tp, "%s %s: invalid filepath", name, fs_path);
450 #else
451 fs_path = ap_os_canonical_filename(p, fs_path);
452 #endif
453@@ -873,7 +873,7 @@
454 fcgi_util_get_server_gid(cmd->server));
455 if (s != NULL) {
456 if (fcgi_wrapper) {
457- return ap_psprintf(tp,
458+ return apr_psprintf(tp,
459 "%s: redefinition of a previously defined class \"%s\" "
460 "with uid=%ld and gid=%ld",
461 name, fs_path, (long) fcgi_util_get_server_uid(cmd->server),
462@@ -881,7 +881,7 @@
463 }
464 else
465 {
466- return ap_psprintf(tp,
467+ return apr_psprintf(tp,
468 "%s: redefinition of previously defined class \"%s\"", name, fs_path);
469 }
470 }
471@@ -920,7 +920,7 @@
472 }
473 else if (strcasecmp(option, "-user") == 0) {
474 #ifdef WIN32
475- return ap_psprintf(tp,
476+ return apr_psprintf(tp,
477 "%s %s: the -user option isn't supported on WIN", name, fs_path);
478 #else
479 s->user = ap_getword_conf(tp, &arg);
480@@ -930,7 +930,7 @@
481 }
482 else if (strcasecmp(option, "-group") == 0) {
483 #ifdef WIN32
484- return ap_psprintf(tp,
485+ return apr_psprintf(tp,
486 "%s %s: the -group option isn't supported on WIN", name, fs_path);
487 #else
488 s->group = ap_getword_conf(tp, &arg);
489@@ -939,7 +939,7 @@
490 #endif
491 }
492 else {
493- return ap_psprintf(tp, "%s %s: invalid option: %s", name, fs_path, option);
494+ return apr_psprintf(tp, "%s %s: invalid option: %s", name, fs_path, option);
495 }
496 } /* while */
497
498@@ -949,12 +949,12 @@
499 {
500 if (s->group == NULL)
501 {
502- s->group = ap_psprintf(tp, "#%ld", fcgi_util_get_server_gid(cmd->server));
503+ s->group = apr_psprintf(tp, "#%ld", fcgi_util_get_server_gid(cmd->server));
504 }
505
506 if (s->user == NULL)
507 {
508- s->user = ap_psprintf(p, "#%ld", fcgi_util_get_server_uid(cmd->server));
509+ s->user = apr_psprintf(p, "#%ld", fcgi_util_get_server_uid(cmd->server));
510 }
511
512 s->uid = ap_uname2id(s->user);
513@@ -968,19 +968,19 @@
514
515 if ((err = fcgi_util_fs_set_uid_n_gid(p, s, s->uid, s->gid)))
516 {
517- return ap_psprintf(tp,
518+ return apr_psprintf(tp,
519 "%s %s: invalid user or group: %s", name, fs_path, err);
520 }
521 #endif /* !WIN32 */
522
523 /* Require one of -socket or -host, but not both */
524 if (s->socket_path != NULL && s->port != 0) {
525- return ap_psprintf(tp,
526+ return apr_psprintf(tp,
527 "%s %s: -host and -socket are mutually exclusive options",
528 name, fs_path);
529 }
530 if (s->socket_path == NULL && s->port == 0) {
531- return ap_psprintf(tp,
532+ return apr_psprintf(tp,
533 "%s %s: -socket or -host option missing", name, fs_path);
534 }
535
536@@ -989,7 +989,7 @@
537 err = fcgi_util_socket_make_inet_addr(p, (struct sockaddr_in **)&s->socket_addr,
538 &s->socket_addr_len, s->host, s->port);
539 if (err != NULL)
540- return ap_psprintf(tp, "%s %s: %s", name, fs_path, err);
541+ return apr_psprintf(tp, "%s %s: %s", name, fs_path, err);
542 } else {
543
544 if (fcgi_socket_dir == NULL)
545@@ -1006,7 +1006,7 @@
546 err = fcgi_util_socket_make_domain_addr(p, (struct sockaddr_un **)&s->socket_addr,
547 &s->socket_addr_len, s->socket_path);
548 if (err != NULL)
549- return ap_psprintf(tp, "%s %s: %s", name, fs_path, err);
550+ return apr_psprintf(tp, "%s %s: %s", name, fs_path, err);
551 #endif
552 }
553
08b8dbf5
AM		 554@@ -1037,7 +1037,7 @@
555
556 /* Allocate temp storage for an initial environment */
557 unsigned int envc = 0;
558- char **envp = (char **)ap_pcalloc(tp, sizeof(char *) * (MAX_INIT_ENV_VARS + 3));
559+ char **envp = (char **)apr_pcalloc(tp, sizeof(char *) * (MAX_INIT_ENV_VARS + 3));
560
561 err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
562 if (err)
25a8184f
AM		 563@@ -1131,20 +1131,20 @@
564 dynamicFlush = TRUE;
565 }
566 else {
567- return ap_psprintf(tp, "%s: invalid option: %s", name, option);
568+ return apr_psprintf(tp, "%s: invalid option: %s", name, option);
569 }
570 } /* while */
571
572 if (dynamicProcessSlack >= dynamicMaxProcs + 1) {
573 /* the kill policy would work unexpectedly */
574- return ap_psprintf(tp,
575+ return apr_psprintf(tp,
576 "%s: processSlack (%u) must be less than maxProcesses (%u) + 1",
577 name, dynamicProcessSlack, dynamicMaxProcs);
578 }
08b8dbf5
AM		 579
580 /* Move env array to a surviving pool, leave 2 extra slots for
581 * WIN32 _FCGI_MUTEX_ and _FCGI_SHUTDOWN_EVENT_ */
582- dynamicEnvp = (char **)ap_pcalloc(p, sizeof(char *) * (envc + 4));
583+ dynamicEnvp = (char **)apr_pcalloc(p, sizeof(char *) * (envc + 4));
584 memcpy(dynamicEnvp, envp, sizeof(char *) * envc);
585
586 return NULL;
587@@ -1152,7 +1152,7 @@
588
589 void *fcgi_config_create_dir_config(pool *p, char *dummy)
590 {
591- fcgi_dir_config *dir_config = ap_pcalloc(p, sizeof(fcgi_dir_config));
592+ fcgi_dir_config *dir_config = apr_pcalloc(p, sizeof(fcgi_dir_config));
593
594 dir_config->authenticator_options = FCGI_AUTHORITATIVE;
595 dir_config->authorizer_options = FCGI_AUTHORITATIVE;
25a8184f
AM		 596@@ -1171,7 +1171,7 @@
597
598 #ifdef APACHE2
599 if (apr_filepath_merge(&auth_server, "", fs_path, 0, cmd->pool))
600- return ap_psprintf(tp, "%s %s: invalid filepath", cmd->cmd->name, fs_path);
601+ return apr_psprintf(tp, "%s %s: invalid filepath", cmd->cmd->name, fs_path);
602 #else
603 auth_server = (char *) ap_os_canonical_filename(cmd->pool, fs_path);
604 #endif
605@@ -1184,11 +1184,11 @@
606 {
607 const char *err = fcgi_util_fs_is_path_ok(tp, auth_server, NULL);
608 if (err)
609- return ap_psprintf(tp, "%s: \"%s\" %s", cmd->cmd->name, auth_server, err);
610+ return apr_psprintf(tp, "%s: \"%s\" %s", cmd->cmd->name, auth_server, err);
611 }
612
613 if (compat && strcasecmp(compat, "-compat"))
614- return ap_psprintf(cmd->temp_pool, "%s: unknown option: \"%s\"", cmd->cmd->name, compat);
615+ return apr_psprintf(cmd->temp_pool, "%s: unknown option: \"%s\"", cmd->cmd->name, compat);
616
617 switch((int)cmd->info) {
618 case FCGI_AUTH_TYPE_AUTHENTICATOR:
da9b5889
AM		 619diff -urN mod_fastcgi-2.4.2.org/fcgi_pm.c mod_fastcgi-2.4.2/fcgi_pm.c
620--- mod_fastcgi-2.4.2.org/fcgi_pm.c 2004-10-06 20:30:46.337894116 +0200
383fd18f 621+++ mod_fastcgi-2.4.2/fcgi_pm.c 2004-10-06 21:46:02.363441555 +0200
08b8dbf5
AM		 622@@ -365,7 +365,7 @@
623 if (dnEnd == NULL) {
624 dirName = "./";
625 } else {
626- dirName = ap_pcalloc(fcgi_config_pool, dnEnd - fs->fs_path + 1);
627+ dirName = apr_pcalloc(fcgi_config_pool, dnEnd - fs->fs_path + 1);
628 dirName = memcpy(dirName, fs->fs_path, dnEnd - fs->fs_path);
629 }
630 if (chdir(dirName) < 0) {
25a8184f
AM		 631@@ -489,7 +489,7 @@
632
633 SetHandleInformation(process->terminationEvent, HANDLE_FLAG_INHERIT, TRUE);
634
635- termination_env_string = ap_psprintf(tp,
636+ termination_env_string = apr_psprintf(tp,
637 "_FCGI_SHUTDOWN_EVENT_=%ld", process->terminationEvent);
638
639 while (fs->envp[i]) i++;
da9b5889
AM		 640@@ -576,7 +576,7 @@
641 fs->envp[i - 1] = NULL;
642 }
643
644- ap_destroy_pool(tp);
16e18e7f 645+ apr_pool_destroy(tp);
da9b5889
AM		 646
647 return proc.pid;
648
25a8184f
AM		 649@@ -614,7 +614,7 @@
650 }
651 SetHandleInformation(process->terminationEvent, HANDLE_FLAG_INHERIT, TRUE);
652
653- termination_env_string = ap_psprintf(tp,
654+ termination_env_string = apr_psprintf(tp,
655 "_FCGI_SHUTDOWN_EVENT_=%ld", process->terminationEvent);
656
657 if (fs->socket_path)
da9b5889
AM		 658@@ -659,7 +659,7 @@
659 "FastCGI: %s is not executable; ensure interpreted scripts have "
660 "\"#!\" as their first line",
661 fs->fs_path);
662- ap_destroy_pool(tp);
16e18e7f 663+ apr_pool_destroy(tp);
da9b5889
AM		 664 goto CLEANUP;
665 }
666
b266052a
AM		 667@@ -668,9 +668,9 @@
668 * the arguments (if there are any).
669 * Build the command string to pass to CreateProcess.
670 */
671- quoted_filename = ap_pstrcat(tp, "\"", fs->fs_path, "\"", NULL);
672+ quoted_filename = apr_pstrcat(tp, "\"", fs->fs_path, "\"", NULL);
673 if (interpreter && *interpreter) {
674- pCommand = ap_pstrcat(tp, interpreter, " ", quoted_filename, NULL);
675+ pCommand = apr_pstrcat(tp, interpreter, " ", quoted_filename, NULL);
676 }
677 else {
678 pCommand = quoted_filename;
08b8dbf5
AM		 679@@ -704,7 +704,7 @@
680 iEnvBlockLen += strlen(termination_env_string) + 1;
681 iEnvBlockLen += strlen(fs->mutex_env_string) + 1;
682
683- pEnvBlock = (char *) ap_pcalloc(tp, iEnvBlockLen);
684+ pEnvBlock = (char *) apr_pcalloc(tp, iEnvBlockLen);
685
686 i = 0;
687 pNext = pEnvBlock;
da9b5889
AM		 688@@ -744,7 +744,7 @@
689 CloseHandle(listen_handle);
690 }
691
692- ap_destroy_pool(tp);
16e18e7f 693+ apr_pool_destroy(tp);
da9b5889
AM		 694
695 return pid;
696
25a8184f
AM		 697@@ -1071,10 +1071,10 @@
698 s->flush = dynamicFlush;
90890b93
AM		 699
700 #ifdef WIN32
25a8184f 701- s->mutex_env_string = ap_psprintf(sp, "_FCGI_MUTEX_=%ld", mutex);
90890b93 702- s->fs_path = ap_pstrdup(sp, cjob->fs_path);
25a8184f 703+ s->mutex_env_string = apr_psprintf(sp, "_FCGI_MUTEX_=%ld", mutex);
90890b93
AM		 704+ s->fs_path = apr_pstrdup(sp, cjob->fs_path);
705 #else
706- s->fs_path = ap_pstrdup(sp, execName);
707+ s->fs_path = apr_pstrdup(sp, execName);
708 #endif
709 ap_getparents(s->fs_path);
710 ap_no2slash(s->fs_path);
08b8dbf5
AM		 711@@ -1094,7 +1094,7 @@
712 s->socket_path = fcgi_util_socket_make_path_absolute(sp, s->socket_path, 1);
713
714 /* Create sockaddr, prealloc it so it won't get created in tp */
715- s->socket_addr = ap_pcalloc(sp, sizeof(struct sockaddr_un));
716+ s->socket_addr = apr_pcalloc(sp, sizeof(struct sockaddr_un));
717 err = fcgi_util_socket_make_domain_addr(tp, (struct sockaddr_un **)&s->socket_addr,
718 &s->socket_addr_len, s->socket_path);
719 if (err) {
25a8184f 720@@ -1120,11 +1120,11 @@
90890b93
AM		 721 goto BagNewServer;
722 }
723 s->uid = pw->pw_uid;
724- s->user = ap_pstrdup(sp, user);
725+ s->user = apr_pstrdup(sp, user);
726 s->username = s->user;
727
728 s->gid = pw->pw_gid;
25a8184f
AM		 729- s->group = ap_psprintf(sp, "%ld", (long)s->gid);
730+ s->group = apr_psprintf(sp, "%ld", (long)s->gid);
731 }
732 else {
733 struct passwd *pw;
90890b93
AM		 734@@ -1137,11 +1137,11 @@
735 execName, (long)s->uid);
736 goto BagNewServer;
737 }
738- s->user = ap_pstrdup(sp, user);
739- s->username = ap_pstrdup(sp, pw->pw_name);
740+ s->user = apr_pstrdup(sp, user);
741+ s->username = apr_pstrdup(sp, pw->pw_name);
742
743 s->gid = (gid_t)atol(group);
744- s->group = ap_pstrdup(sp, group);
745+ s->group = apr_pstrdup(sp, group);
746 }
747 }
748 #else
da9b5889
AM		 749@@ -1340,7 +1340,7 @@
750 continue;
751
752 BagNewServer:
753- if (sp) ap_destroy_pool(sp);
16e18e7f 754+ if (sp) apr_pool_destroy(sp);
da9b5889
AM		 755
756 #ifdef WIN32
757 free(cjob->fs_path);
758@@ -1362,7 +1362,7 @@
759 }
760 #endif
761
762- ap_destroy_pool(tp);
16e18e7f 763+ apr_pool_destroy(tp);
da9b5889
AM		 764 }
765
766 /*
9148e31a
AM		 767diff -urN mod_fastcgi-2.4.2.org/fcgi_protocol.c mod_fastcgi-2.4.2/fcgi_protocol.c
768--- mod_fastcgi-2.4.2.org/fcgi_protocol.c 2004-10-06 20:30:46.338893902 +0200
383fd18f 769+++ mod_fastcgi-2.4.2/fcgi_protocol.c 2004-10-06 21:46:02.366440913 +0200
08b8dbf5
AM		 770@@ -110,7 +110,7 @@
771 char *first, *last;
772
773 if (r->the_request == NULL)
774- return (char *) ap_pcalloc(r->pool, 1);
775+ return (char *) apr_pcalloc(r->pool, 1);
776
777 first = r->the_request; /* use the request-line */
778
18820dd5 779@@ -135,18 +135,18 @@
b8ef0a1b
AM		 780 {
781 table *e = r->subprocess_env;
782
783- ap_table_setn(e, "GATEWAY_INTERFACE", "CGI/1.1");
784- ap_table_setn(e, "SERVER_PROTOCOL", r->protocol);
785- ap_table_setn(e, "REQUEST_METHOD", r->method);
786- ap_table_setn(e, "QUERY_STRING", r->args ? r->args : "");
787- ap_table_setn(e, "REQUEST_URI", apache_original_uri(r));
788+ apr_table_setn(e, "GATEWAY_INTERFACE", "CGI/1.1");
789+ apr_table_setn(e, "SERVER_PROTOCOL", r->protocol);
790+ apr_table_setn(e, "REQUEST_METHOD", r->method);
791+ apr_table_setn(e, "QUERY_STRING", r->args ? r->args : "");
792+ apr_table_setn(e, "REQUEST_URI", apache_original_uri(r));
793
794 /* The FastCGI spec precludes sending of CONTENT_LENGTH, PATH_INFO,
795 * PATH_TRANSLATED, and SCRIPT_NAME (for some reason?). PATH_TRANSLATED we
18820dd5
AM		 796 * don't have, its the variable that causes Apache to break trying to set
797 * up (and thus the reason this fn exists vs. using ap_add_cgi_vars()). */
798 if (compat) {
799- ap_table_unset(e, "CONTENT_LENGTH");
800+ apr_table_unset(e, "CONTENT_LENGTH");
801 return;
802 }
803
b8ef0a1b
AM		 804@@ -155,17 +155,17 @@
805 * args and path_info of the original request, and not any that may have
806 * come with the script URI in the include command. Ugh. */
807 if (!strcmp(r->protocol, "INCLUDED")) {
808- ap_table_setn(e, "SCRIPT_NAME", r->uri);
809+ apr_table_setn(e, "SCRIPT_NAME", r->uri);
810 if (r->path_info && *r->path_info)
811- ap_table_setn(e, "PATH_INFO", r->path_info);
812+ apr_table_setn(e, "PATH_INFO", r->path_info);
813 }
814 else if (!r->path_info || !*r->path_info)
815- ap_table_setn(e, "SCRIPT_NAME", r->uri);
816+ apr_table_setn(e, "SCRIPT_NAME", r->uri);
817 else {
818 int path_info_start = ap_find_path_info(r->uri, r->path_info);
819
820- ap_table_setn(e, "SCRIPT_NAME", ap_pstrndup(r->pool, r->uri, path_info_start));
821- ap_table_setn(e, "PATH_INFO", r->path_info);
822+ apr_table_setn(e, "SCRIPT_NAME", ap_pstrndup(r->pool, r->uri, path_info_start));
823+ apr_table_setn(e, "PATH_INFO", r->path_info);
824 }
825 }
826
827@@ -178,9 +178,9 @@
9148e31a
AM		 828 int i = ph->nelts;
829
830 for ( ; i; --i, ++elt) {
831- const char *val = ap_table_get(fr->r->headers_in, *elt);
832+ const char *val = apr_table_get(fr->r->headers_in, *elt);
833 if (val) {
b8ef0a1b
AM		 834- ap_table_setn(fr->r->subprocess_env, *elt, val);
835+ apr_table_setn(fr->r->subprocess_env, *elt, val);
9148e31a 836 }
b8ef0a1b
AM		 837 }
838 }
73152fff
AM		 839@@ -373,7 +373,7 @@
840
841 if (fr->fs_stderr == NULL)
842 {
843- fr->fs_stderr = ap_palloc(p, FCGI_SERVER_MAX_STDERR_LINE_LEN + 1);
844+ fr->fs_stderr = apr_palloc(p, FCGI_SERVER_MAX_STDERR_LINE_LEN + 1);
845 }
846
847 /* We're gonna consume all thats here */
848diff -urN mod_fastcgi-2.4.2.org/fcgi_util.c mod_fastcgi-2.4.2/fcgi_util.c
849--- mod_fastcgi-2.4.2.org/fcgi_util.c 2004-10-06 20:30:46.339893687 +0200
383fd18f 850+++ mod_fastcgi-2.4.2/fcgi_util.c 2004-10-06 21:46:02.370440056 +0200
b266052a
AM		 851@@ -55,7 +55,7 @@
852 fcgi_util_socket_hash_filename(pool *p, const char *path,
853 const char *user, const char *group)
854 {
855- char *buf = ap_pstrcat(p, path, user, group, NULL);
856+ char *buf = apr_pstrcat(p, path, user, group, NULL);
857
858 /* Canonicalize the path (remove "//", ".", "..") */
859 ap_getparents(buf);
860@@ -77,13 +77,13 @@
861 x = strlen(src1);
862
863 if (x == 0) {
864- p = ap_pstrcat(a, "\\", src2, NULL);
865+ p = apr_pstrcat(a, "\\", src2, NULL);
866 }
867 else if (src1[x - 1] != '\\' && src1[x - 1] != '/') {
868- p = ap_pstrcat(a, src1, "\\", src2, NULL);
869+ p = apr_pstrcat(a, src1, "\\", src2, NULL);
870 }
871 else {
872- p = ap_pstrcat(a, src1, src2, NULL);
873+ p = apr_pstrcat(a, src1, src2, NULL);
874 }
875
876 q = p ;
08b8dbf5 877@@ -137,12 +137,12 @@
b266052a
AM		 878 int socket_pathLen = strlen(socket_path);
879
880 if (socket_pathLen >= sizeof((*socket_addr)->sun_path)) {
881- return ap_pstrcat(p, "path \"", socket_path,
882+ return apr_pstrcat(p, "path \"", socket_path,
883 "\" is too long for a Domain socket", NULL);
884 }
885
08b8dbf5
AM		 886 if (*socket_addr == NULL)
887- *socket_addr = ap_pcalloc(p, sizeof(struct sockaddr_un));
888+ *socket_addr = apr_pcalloc(p, sizeof(struct sockaddr_un));
889 else
890 memset(*socket_addr, 0, sizeof(struct sockaddr_un));
891
892@@ -194,7 +194,7 @@
893 int *socket_addr_len, const char *host, unsigned short port)
894 {
895 if (*socket_addr == NULL)
896- *socket_addr = ap_pcalloc(p, sizeof(struct sockaddr_in));
897+ *socket_addr = apr_pcalloc(p, sizeof(struct sockaddr_in));
898 else
899 memset(*socket_addr, 0, sizeof(struct sockaddr_in));
900
b266052a
AM		 901@@ -204,7 +204,7 @@
902 /* Get an in_addr represention of the host */
903 if (host != NULL) {
904 if (convert_string_to_in_addr(host, &(*socket_addr)->sin_addr) != 1) {
905- return ap_pstrcat(p, "failed to resolve \"", host,
906+ return apr_pstrcat(p, "failed to resolve \"", host,
907 "\" to exactly one IP address", NULL);
908 }
909 } else {
25a8184f
AM		 910@@ -227,7 +227,7 @@
911
912 if (statBuf == NULL) {
913 if (stat(path, &myStatBuf) < 0)
914- return ap_psprintf(tp, "stat(%s) failed: %s", path, strerror(errno));
915+ return apr_psprintf(tp, "stat(%s) failed: %s", path, strerror(errno));
916 statBuf = &myStatBuf;
917 }
918
f3a4bc7a
AM		 919@@ -311,7 +311,7 @@
920 fcgi_server *s;
921
922 /* @@@ This should now be done in the loop below */
923- ap_cpystrn(path, ePath, FCGI_MAXPATH);
924+ apr_cpystrn(path, ePath, FCGI_MAXPATH);
925 ap_no2slash(path);
926
927 for (s = fcgi_servers; s != NULL; s = s->next) {
928@@ -343,7 +343,7 @@
929 char path[FCGI_MAXPATH];
930 fcgi_server *s;
931
932- ap_cpystrn(path, ePath, FCGI_MAXPATH);
933+ apr_cpystrn(path, ePath, FCGI_MAXPATH);
934 ap_no2slash(path);
935
936 for (s = fcgi_servers; s != NULL; s = s->next) {
25a8184f 937@@ -367,21 +367,21 @@
73152fff
AM		 938 const char *err;
939
940 if (finfo == NULL) {
941- finfo = (struct stat *)ap_palloc(p, sizeof(struct stat));
942+ finfo = (struct stat *)apr_palloc(p, sizeof(struct stat));
943 if (stat(fs_path, finfo) < 0)
25a8184f
AM		 944- return ap_psprintf(p, "stat(%s) failed: %s", fs_path, strerror(errno));
945+ return apr_psprintf(p, "stat(%s) failed: %s", fs_path, strerror(errno));
73152fff 946 }
25a8184f
AM		 947
948 /* No Parse Header scripts aren't allowed.
949 * @@@ Well... we really could quite easily */
950 if (strncmp(strrchr(fs_path, '/'), "/nph-", 5) == 0)
951- return ap_psprintf(p, "NPH scripts cannot be run as FastCGI");
952+ return apr_psprintf(p, "NPH scripts cannot be run as FastCGI");
953
954 if (finfo->st_mode == 0)
955- return ap_psprintf(p, "script not found or unable to stat()");
956+ return apr_psprintf(p, "script not found or unable to stat()");
957
958 if (S_ISDIR(finfo->st_mode))
959- return ap_psprintf(p, "script is a directory!");
960+ return apr_psprintf(p, "script is a directory!");
961
962 /* Let the wrapper determine what it can and can't execute */
963 if (! fcgi_wrapper)
964@@ -392,7 +392,7 @@
965 err = fcgi_util_check_access(p, fs_path, finfo, X_OK, fcgi_user_id, fcgi_group_id);
966 #endif
967 if (err) {
968- return ap_psprintf(p,
969+ return apr_psprintf(p,
970 "access for server (uid %ld, gid %ld) not allowed: %s",
971 (long)fcgi_user_id, (long)fcgi_group_id, err);
972 }
08b8dbf5
AM		 973@@ -409,7 +409,7 @@
974 fcgi_server *
975 fcgi_util_fs_new(pool *p)
976 {
977- fcgi_server *s = (fcgi_server *) ap_pcalloc(p, sizeof(fcgi_server));
978+ fcgi_server *s = (fcgi_server *) apr_pcalloc(p, sizeof(fcgi_server));
979
980 /* Initialize anything who's init state is not zeroizzzzed */
981 s->listenQueueDepth = FCGI_DEFAULT_LISTEN_Q;
25a8184f
AM		 982@@ -462,23 +462,23 @@
983 s->uid = uid;
984 pw = getpwuid(uid);
985 if (pw == NULL) {
986- return ap_psprintf(p,
987+ return apr_psprintf(p,
988 "getpwuid() couldn't determine the username for uid '%ld', "
90890b93
AM		 989 "you probably need to modify the User directive: %s",
990 (long)uid, strerror(errno));
991 }
992- s->user = ap_pstrdup(p, pw->pw_name);
993+ s->user = apr_pstrdup(p, pw->pw_name);
994 s->username = s->user;
995
996 s->gid = gid;
25a8184f
AM		 997 gr = getgrgid(gid);
998 if (gr == NULL) {
999- return ap_psprintf(p,
1000+ return apr_psprintf(p,
1001 "getgrgid() couldn't determine the group name for gid '%ld', "
90890b93
AM		 1002 "you probably need to modify the Group directive: %s",
1003 (long)gid, strerror(errno));
1004 }
1005- s->group = ap_pstrdup(p, gr->gr_name);
1006+ s->group = apr_pstrdup(p, gr->gr_name);
1007
1008 #endif /* !WIN32 */
1009
08b8dbf5
AM		 1010@@ -492,7 +492,7 @@
1011 fcgi_util_fs_create_procs(pool *p, int num)
1012 {
1013 int i;
1014- ServerProcess *proc = (ServerProcess *)ap_pcalloc(p, sizeof(ServerProcess) * num);
1015+ ServerProcess *proc = (ServerProcess *)apr_pcalloc(p, sizeof(ServerProcess) * num);
1016
1017 for (i = 0; i < num; i++) {
1018 #ifdef WIN32
4c3c1d65
AM		 1019diff -urN mod_fastcgi-2.4.2.org/mod_fastcgi.c mod_fastcgi-2.4.2/mod_fastcgi.c
1020--- mod_fastcgi-2.4.2.org/mod_fastcgi.c 2004-10-06 20:30:46.355890260 +0200
383fd18f 1021+++ mod_fastcgi-2.4.2/mod_fastcgi.c 2004-10-06 21:46:02.383437272 +0200
4c3c1d65
AM		 1022@@ -267,7 +267,7 @@
1023
1024 /* Register to reset to default values when the config pool is cleaned */
1025 ap_block_alarms();
1026- ap_register_cleanup(p, NULL, fcgi_config_reset_globals, ap_null_cleanup);
1f402f3f 1027+ apr_pool_cleanup_register(p, NULL, fcgi_config_reset_globals, apr_pool_cleanup_null);
4c3c1d65
AM		 1028 ap_unblock_alarms();
1029
1030 #ifdef APACHE2
b266052a
AM		 1031@@ -285,7 +285,7 @@
1032 #ifdef WIN32
1033 if (fcgi_socket_dir == NULL)
1034 fcgi_socket_dir = DEFAULT_SOCK_DIR;
1035- fcgi_dynamic_dir = ap_pstrcat(p, fcgi_socket_dir, "dynamic", NULL);
1036+ fcgi_dynamic_dir = apr_pstrcat(p, fcgi_socket_dir, "dynamic", NULL);
1037 #else
1038
1039 if (fcgi_socket_dir == NULL)
25a8184f
AM		 1040@@ -722,11 +722,11 @@
1041 }
1042 if (statusValue < 0) {
1043 fr->parseHeader = SCAN_CGI_BAD_HEADER;
1044- return ap_psprintf(r->pool, "invalid Status '%s'", value);
1045+ return apr_psprintf(r->pool, "invalid Status '%s'", value);
90890b93
AM		 1046 }
1047 hasStatus = TRUE;
1048 r->status = statusValue;
1049- r->status_line = ap_pstrdup(r->pool, value);
1050+ r->status_line = apr_pstrdup(r->pool, value);
1051 continue;
1052 }
1053
1054@@ -736,7 +736,7 @@
1055 goto DuplicateNotAllowed;
1056 }
1057 hasContentType = TRUE;
1058- r->content_type = ap_pstrdup(r->pool, value);
1059+ r->content_type = apr_pstrdup(r->pool, value);
1060 continue;
1061 }
1062
04965467
AM		 1063@@ -750,11 +750,11 @@
1064 }
1065
1066 /* If the script wants them merged, it can do it */
1067- ap_table_add(r->err_headers_out, name, value);
1068+ apr_table_add(r->err_headers_out, name, value);
1069 continue;
1070 }
1071 else {
1072- ap_table_add(fr->authHeaders, name, value);
1073+ apr_table_add(fr->authHeaders, name, value);
1074 }
1075 }
1076
993e98e3
AM		 1077@@ -765,7 +765,7 @@
1078 * Who responds, this handler or Apache?
1079 */
1080 if (hasLocation) {
1081- const char *location = ap_table_get(r->headers_out, "Location");
1082+ const char *location = apr_table_get(r->headers_out, "Location");
1083 /*
1084 * Based on internal redirect handling in mod_cgi.c...
1085 *
25a8184f
AM		 1086@@ -835,11 +835,11 @@
1087 if ((p = strpbrk(name, "\r\n")) != NULL)
1088 *p = '\0';
1089 fr->parseHeader = SCAN_CGI_BAD_HEADER;
1090- return ap_psprintf(r->pool, "malformed header '%s'", name);
1091+ return apr_psprintf(r->pool, "malformed header '%s'", name);
1092
1093 DuplicateNotAllowed:
1094 fr->parseHeader = SCAN_CGI_BAD_HEADER;
1095- return ap_psprintf(r->pool, "duplicate header '%s'", name);
1096+ return apr_psprintf(r->pool, "duplicate header '%s'", name);
1097 }
1098
1099 /*
90890b93 1100@@ -1019,9 +1019,9 @@
08b8dbf5
AM		 1101 char *end = strchr(r->uri + 2, '/');
1102
1103 if (end)
1104- *user = memcpy(ap_pcalloc(r->pool, end - r->uri), r->uri + 1, end - r->uri - 1);
1105+ *user = memcpy(apr_pcalloc(r->pool, end - r->uri), r->uri + 1, end - r->uri - 1);
1106 else
90890b93
AM		 1107- *user = ap_pstrdup(r->pool, r->uri + 1);
1108+ *user = apr_pstrdup(r->pool, r->uri + 1);
08b8dbf5 1109 *group = "-";
90890b93
AM		 1110 }
1111 else {
25a8184f
AM		 1112@@ -1030,8 +1030,8 @@
1113
1114 get_request_identity(r, &uid, &gid);
1115
1116- *user = ap_psprintf(r->pool, "%ld", (long) uid);
1117- *group = ap_psprintf(r->pool, "%ld", (long) gid);
1118+ *user = apr_psprintf(r->pool, "%ld", (long) uid);
1119+ *group = apr_psprintf(r->pool, "%ld", (long) gid);
1120 }
1121 }
1122
90890b93
AM		 1123@@ -1225,7 +1225,7 @@
1124 {
1125 /* xxx this handle should live somewhere (see CloseHandle()s below too) */
1126 char * wait_npipe_mutex_name, * cp;
1127- wait_npipe_mutex_name = cp = ap_pstrdup(rp, socket_path);
1128+ wait_npipe_mutex_name = cp = apr_pstrdup(rp, socket_path);
1129 while ((cp = strchr(cp, '\\'))) *cp = '/';
1130
1131 wait_npipe_mutex = CreateMutex(NULL, FALSE, wait_npipe_mutex_name);
4c3c1d65
AM		 1132@@ -2318,7 +2318,7 @@
1133 }
1134
1135 ap_block_alarms();
1136- ap_register_cleanup(rp, (void *)fr, cleanup, ap_null_cleanup);
1f402f3f 1137+ apr_pool_cleanup_register(rp, (void *)fr, cleanup, apr_pool_cleanup_null);
4c3c1d65
AM		 1138 ap_unblock_alarms();
1139
1140 #ifdef WIN32
08b8dbf5
AM		 1141@@ -2422,7 +2422,7 @@
1142 const char *fs_path;
1143 pool * const p = r->pool;
1144 fcgi_server *fs;
1145- fcgi_request * const fr = (fcgi_request *)ap_pcalloc(p, sizeof(fcgi_request));
1146+ fcgi_request * const fr = (fcgi_request *)apr_pcalloc(p, sizeof(fcgi_request));
1147 uid_t uid;
1148 gid_t gid;
1149
73152fff
AM		 1150@@ -2450,7 +2450,7 @@
1151 else
1152 #endif
1153 {
1154- my_finfo = (struct stat *) ap_palloc(p, sizeof(struct stat));
1155+ my_finfo = (struct stat *) apr_palloc(p, sizeof(struct stat));
1156
1157 if (stat(fs_path, my_finfo) < 0)
1158 {
2ff9aba2
AM		 1159@@ -2476,7 +2476,7 @@
1160 fr->erBufPtr = fcgi_buf_new(p, sizeof(FCGI_EndRequestBody) + 1);
1161 fr->gotHeader = FALSE;
1162 fr->parseHeader = SCAN_CGI_READING_HEADERS;
1163- fr->header = ap_make_array(p, 1, 1);
9a987e9c 1164+ fr->header = apr_array_make(p, 1, 1);
2ff9aba2
AM		 1165 fr->fs_stderr = NULL;
1166 fr->r = r;
1167 fr->readingEndRequestBody = FALSE;
993e98e3
AM		 1168@@ -2531,7 +2531,7 @@
1169 */
1170 static int apache_is_scriptaliased(request_rec *r)
1171 {
1172- const char *t = ap_table_get(r->notes, "alias-forced-type");
1173+ const char *t = apr_table_get(r->notes, "alias-forced-type");
1174 return t && (!strcasecmp(t, "cgi-script"));
1175 }
1176
18820dd5
AM		 1177@@ -2554,9 +2554,9 @@
1178 */
1179 r->method = "GET";
993e98e3 1180 r->method_number = M_GET;
18820dd5
AM		 1181- ap_table_unset(r->headers_in, "Content-length");
1182+ apr_table_unset(r->headers_in, "Content-length");
993e98e3
AM		 1183
1184- ap_internal_redirect_handler(ap_table_get(r->headers_out, "Location"), r);
1185+ ap_internal_redirect_handler(apr_table_get(r->headers_out, "Location"), r);
1186 return OK;
1187
1188 case SCAN_CGI_SRV_REDIRECT:
b8ef0a1b
AM		 1189@@ -2612,21 +2612,21 @@
1190 if (strncasecmp(key, "Variable-", 9) == 0)
1191 key += 9;
1192
1193- ap_table_setn(t, key, val);
1194+ apr_table_setn(t, key, val);
1195 return 1;
1196 }
1197
1198 static int post_process_auth_passed_compat_header(table *t, const char *key, const char * const val)
1199 {
1200 if (strncasecmp(key, "Variable-", 9) == 0)
1201- ap_table_setn(t, key + 9, val);
1202+ apr_table_setn(t, key + 9, val);
1203
1204 return 1;
1205 }
1206
1207 static int post_process_auth_failed_header(table * const t, const char * const key, const char * const val)
1208 {
1209- ap_table_setn(t, key, val);
1210+ apr_table_setn(t, key, val);
1211 return 1;
1212 }
1213
be58b6e3
AM		 1214@@ -2639,16 +2639,16 @@
1215
1216 if (passed) {
1217 if (fr->auth_compat) {
1218- ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_compat_header,
1219+ apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_compat_header,
1220 (void *)r->subprocess_env, fr->authHeaders, NULL);
1221 }
1222 else {
1223- ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_header,
1224+ apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_header,
1225 (void *)r->subprocess_env, fr->authHeaders, NULL);
1226 }
1227 }
1228 else {
1229- ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_failed_header,
1230+ apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_failed_header,
1231 (void *)r->err_headers_out, fr->authHeaders, NULL);
1232 }
1233
383fd18f
AM		 1234@@ -2679,10 +2679,10 @@
1235 }
1236
b8ef0a1b 1237 /* Save the existing subprocess_env, because we're gonna muddy it up */
383fd18f
AM		 1238- fr->saved_subprocess_env = ap_copy_table(r->pool, r->subprocess_env);
1239+ fr->saved_subprocess_env = apr_table_copy(r->pool, r->subprocess_env);
b8ef0a1b
AM		 1240
1241- ap_table_setn(r->subprocess_env, "REMOTE_PASSWD", password);
1242- ap_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "AUTHENTICATOR");
1243+ apr_table_setn(r->subprocess_env, "REMOTE_PASSWD", password);
1244+ apr_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "AUTHENTICATOR");
1245
1246 /* The FastCGI Protocol doesn't differentiate authentication */
1247 fr->role = FCGI_AUTHORIZER;
993e98e3
AM		 1248@@ -2697,7 +2697,7 @@
1249 post_process_auth(fr, authenticated);
1250
1251 /* A redirect shouldn't be allowed during the authentication phase */
1252- if (ap_table_get(r->headers_out, "Location") != NULL) {
1253+ if (apr_table_get(r->headers_out, "Location") != NULL) {
1254 ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
1255 "FastCGI: FastCgiAuthenticator \"%s\" redirected (not allowed)",
1256 dir_config->authenticator);
383fd18f
AM		 1257@@ -2746,9 +2746,9 @@
1258 }
1259
b8ef0a1b 1260 /* Save the existing subprocess_env, because we're gonna muddy it up */
383fd18f
AM		 1261- fr->saved_subprocess_env = ap_copy_table(r->pool, r->subprocess_env);
1262+ fr->saved_subprocess_env = apr_table_copy(r->pool, r->subprocess_env);
b8ef0a1b
AM		 1263
1264- ap_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "AUTHORIZER");
1265+ apr_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "AUTHORIZER");
1266
1267 fr->role = FCGI_AUTHORIZER;
1268
993e98e3
AM		 1269@@ -2762,7 +2762,7 @@
1270 post_process_auth(fr, authorized);
1271
1272 /* A redirect shouldn't be allowed during the authorization phase */
1273- if (ap_table_get(r->headers_out, "Location") != NULL) {
1274+ if (apr_table_get(r->headers_out, "Location") != NULL) {
1275 ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
1276 "FastCGI: FastCgiAuthorizer \"%s\" redirected (not allowed)",
1277 dir_config->authorizer);
383fd18f
AM		 1278@@ -2806,9 +2806,9 @@
1279 }
1280
b8ef0a1b 1281 /* Save the existing subprocess_env, because we're gonna muddy it up */
383fd18f
AM		 1282- fr->saved_subprocess_env = ap_copy_table(r->pool, r->subprocess_env);
1283+ fr->saved_subprocess_env = apr_table_copy(r->pool, r->subprocess_env);
b8ef0a1b
AM		 1284
1285- ap_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "ACCESS_CHECKER");
1286+ apr_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "ACCESS_CHECKER");
1287
1288 /* The FastCGI Protocol doesn't differentiate access control */
1289 fr->role = FCGI_AUTHORIZER;
993e98e3
AM		 1290@@ -2823,7 +2823,7 @@
1291 post_process_auth(fr, access_allowed);
1292
1293 /* A redirect shouldn't be allowed during the access check phase */
1294- if (ap_table_get(r->headers_out, "Location") != NULL) {
1295+ if (apr_table_get(r->headers_out, "Location") != NULL) {
1296 ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r,
1297 "FastCGI: FastCgiAccessChecker \"%s\" redirected (not allowed)",
1298 dir_config->access_checker);
Support for the FastCGI protocol for apache webserver
This page took 1.046671 seconds and 4 git commands to generate.