]>
Commit | Line | Data |
---|---|---|
1 | diff -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 | |
3 | +++ mod_fastcgi-2.4.2/fcgi_buf.c 2004-10-06 21:53:04.248062670 +0200 | |
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; | |
22 | diff -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 | |
24 | +++ mod_fastcgi-2.4.2/fcgi_config.c 2004-10-06 21:53:04.253061599 +0200 | |
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 | ||
34 | @@ -75,11 +75,11 @@ | |
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) { | |
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 @@ | |
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 | { | |
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 @@ | |
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) | |
69 | - return ap_psprintf(p, "\"%u\" must be >= %u", *num, min); | |
70 | + return apr_psprintf(p, "\"%u\" must be >= %u", *num, min); | |
71 | return NULL; | |
72 | } | |
73 | ||
74 | @@ -147,9 +147,9 @@ | |
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) | |
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); | |
83 | return NULL; | |
84 | } | |
85 | ||
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; | |
95 | @@ -191,10 +191,10 @@ | |
96 | const char **header; | |
97 | ||
98 | if (!*array) { | |
99 | - *array = ap_make_array(p, 10, sizeof(char*)); | |
100 | + *array = apr_array_make(p, 10, sizeof(char*)); | |
101 | } | |
102 | ||
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 : "\"\""; | |
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 @@ | |
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))) | |
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 @@ | |
158 | ||
159 | dp = ap_popendir(tp, fcgi_dynamic_dir); | |
160 | if (dp == NULL) { | |
161 | - ap_destroy_pool(tp); | |
162 | - return ap_psprintf(p, "can't open dynamic directory \"%s\": %s", | |
163 | + apr_pool_destroy(tp); | |
164 | + return apr_psprintf(p, "can't open dynamic directory \"%s\": %s", | |
165 | fcgi_dynamic_dir, strerror(errno)); | |
166 | } | |
167 | ||
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 | } | |
176 | ||
177 | #endif /* !APACHE2 */ | |
178 | ||
179 | - ap_destroy_pool(tp); | |
180 | + apr_pool_destroy(tp); | |
181 | ||
182 | return NULL; | |
183 | } | |
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", | |
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 | ||
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 | ||
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) | |
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 | } | |
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 | |
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); | |
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 */ | |
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 @@ | |
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 | |
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 | ||
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) | |
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 | } | |
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; | |
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: | |
619 | diff -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 | |
621 | +++ mod_fastcgi-2.4.2/fcgi_pm.c 2004-10-06 21:53:04.263059457 +0200 | |
622 | @@ -225,7 +225,7 @@ | |
623 | #ifdef WIN32 | |
624 | errno = WSAGetLastError(); | |
625 | #endif | |
626 | - ap_snprintf(port, sizeof(port), "port=%d", | |
627 | + apr_snprintf(port, sizeof(port), "port=%d", | |
628 | ((struct sockaddr_in *)fs->socket_addr)->sin_port); | |
629 | ||
630 | ap_log_error(FCGI_LOG_CRIT_ERRNO, fcgi_apache_main_server, | |
631 | @@ -365,7 +365,7 @@ | |
632 | if (dnEnd == NULL) { | |
633 | dirName = "./"; | |
634 | } else { | |
635 | - dirName = ap_pcalloc(fcgi_config_pool, dnEnd - fs->fs_path + 1); | |
636 | + dirName = apr_pcalloc(fcgi_config_pool, dnEnd - fs->fs_path + 1); | |
637 | dirName = memcpy(dirName, fs->fs_path, dnEnd - fs->fs_path); | |
638 | } | |
639 | if (chdir(dirName) < 0) { | |
640 | @@ -489,7 +489,7 @@ | |
641 | ||
642 | SetHandleInformation(process->terminationEvent, HANDLE_FLAG_INHERIT, TRUE); | |
643 | ||
644 | - termination_env_string = ap_psprintf(tp, | |
645 | + termination_env_string = apr_psprintf(tp, | |
646 | "_FCGI_SHUTDOWN_EVENT_=%ld", process->terminationEvent); | |
647 | ||
648 | while (fs->envp[i]) i++; | |
649 | @@ -576,7 +576,7 @@ | |
650 | fs->envp[i - 1] = NULL; | |
651 | } | |
652 | ||
653 | - ap_destroy_pool(tp); | |
654 | + apr_pool_destroy(tp); | |
655 | ||
656 | return proc.pid; | |
657 | ||
658 | @@ -614,7 +614,7 @@ | |
659 | } | |
660 | SetHandleInformation(process->terminationEvent, HANDLE_FLAG_INHERIT, TRUE); | |
661 | ||
662 | - termination_env_string = ap_psprintf(tp, | |
663 | + termination_env_string = apr_psprintf(tp, | |
664 | "_FCGI_SHUTDOWN_EVENT_=%ld", process->terminationEvent); | |
665 | ||
666 | if (fs->socket_path) | |
667 | @@ -659,7 +659,7 @@ | |
668 | "FastCGI: %s is not executable; ensure interpreted scripts have " | |
669 | "\"#!\" as their first line", | |
670 | fs->fs_path); | |
671 | - ap_destroy_pool(tp); | |
672 | + apr_pool_destroy(tp); | |
673 | goto CLEANUP; | |
674 | } | |
675 | ||
676 | @@ -668,9 +668,9 @@ | |
677 | * the arguments (if there are any). | |
678 | * Build the command string to pass to CreateProcess. | |
679 | */ | |
680 | - quoted_filename = ap_pstrcat(tp, "\"", fs->fs_path, "\"", NULL); | |
681 | + quoted_filename = apr_pstrcat(tp, "\"", fs->fs_path, "\"", NULL); | |
682 | if (interpreter && *interpreter) { | |
683 | - pCommand = ap_pstrcat(tp, interpreter, " ", quoted_filename, NULL); | |
684 | + pCommand = apr_pstrcat(tp, interpreter, " ", quoted_filename, NULL); | |
685 | } | |
686 | else { | |
687 | pCommand = quoted_filename; | |
688 | @@ -704,7 +704,7 @@ | |
689 | iEnvBlockLen += strlen(termination_env_string) + 1; | |
690 | iEnvBlockLen += strlen(fs->mutex_env_string) + 1; | |
691 | ||
692 | - pEnvBlock = (char *) ap_pcalloc(tp, iEnvBlockLen); | |
693 | + pEnvBlock = (char *) apr_pcalloc(tp, iEnvBlockLen); | |
694 | ||
695 | i = 0; | |
696 | pNext = pEnvBlock; | |
697 | @@ -744,7 +744,7 @@ | |
698 | CloseHandle(listen_handle); | |
699 | } | |
700 | ||
701 | - ap_destroy_pool(tp); | |
702 | + apr_pool_destroy(tp); | |
703 | ||
704 | return pid; | |
705 | ||
706 | @@ -1071,10 +1071,10 @@ | |
707 | s->flush = dynamicFlush; | |
708 | ||
709 | #ifdef WIN32 | |
710 | - s->mutex_env_string = ap_psprintf(sp, "_FCGI_MUTEX_=%ld", mutex); | |
711 | - s->fs_path = ap_pstrdup(sp, cjob->fs_path); | |
712 | + s->mutex_env_string = apr_psprintf(sp, "_FCGI_MUTEX_=%ld", mutex); | |
713 | + s->fs_path = apr_pstrdup(sp, cjob->fs_path); | |
714 | #else | |
715 | - s->fs_path = ap_pstrdup(sp, execName); | |
716 | + s->fs_path = apr_pstrdup(sp, execName); | |
717 | #endif | |
718 | ap_getparents(s->fs_path); | |
719 | ap_no2slash(s->fs_path); | |
720 | @@ -1094,7 +1094,7 @@ | |
721 | s->socket_path = fcgi_util_socket_make_path_absolute(sp, s->socket_path, 1); | |
722 | ||
723 | /* Create sockaddr, prealloc it so it won't get created in tp */ | |
724 | - s->socket_addr = ap_pcalloc(sp, sizeof(struct sockaddr_un)); | |
725 | + s->socket_addr = apr_pcalloc(sp, sizeof(struct sockaddr_un)); | |
726 | err = fcgi_util_socket_make_domain_addr(tp, (struct sockaddr_un **)&s->socket_addr, | |
727 | &s->socket_addr_len, s->socket_path); | |
728 | if (err) { | |
729 | @@ -1120,11 +1120,11 @@ | |
730 | goto BagNewServer; | |
731 | } | |
732 | s->uid = pw->pw_uid; | |
733 | - s->user = ap_pstrdup(sp, user); | |
734 | + s->user = apr_pstrdup(sp, user); | |
735 | s->username = s->user; | |
736 | ||
737 | s->gid = pw->pw_gid; | |
738 | - s->group = ap_psprintf(sp, "%ld", (long)s->gid); | |
739 | + s->group = apr_psprintf(sp, "%ld", (long)s->gid); | |
740 | } | |
741 | else { | |
742 | struct passwd *pw; | |
743 | @@ -1137,11 +1137,11 @@ | |
744 | execName, (long)s->uid); | |
745 | goto BagNewServer; | |
746 | } | |
747 | - s->user = ap_pstrdup(sp, user); | |
748 | - s->username = ap_pstrdup(sp, pw->pw_name); | |
749 | + s->user = apr_pstrdup(sp, user); | |
750 | + s->username = apr_pstrdup(sp, pw->pw_name); | |
751 | ||
752 | s->gid = (gid_t)atol(group); | |
753 | - s->group = ap_pstrdup(sp, group); | |
754 | + s->group = apr_pstrdup(sp, group); | |
755 | } | |
756 | } | |
757 | #else | |
758 | @@ -1340,7 +1340,7 @@ | |
759 | continue; | |
760 | ||
761 | BagNewServer: | |
762 | - if (sp) ap_destroy_pool(sp); | |
763 | + if (sp) apr_pool_destroy(sp); | |
764 | ||
765 | #ifdef WIN32 | |
766 | free(cjob->fs_path); | |
767 | @@ -1362,7 +1362,7 @@ | |
768 | } | |
769 | #endif | |
770 | ||
771 | - ap_destroy_pool(tp); | |
772 | + apr_pool_destroy(tp); | |
773 | } | |
774 | ||
775 | /* | |
776 | diff -urN mod_fastcgi-2.4.2.org/fcgi_protocol.c mod_fastcgi-2.4.2/fcgi_protocol.c | |
777 | --- mod_fastcgi-2.4.2.org/fcgi_protocol.c 2004-10-06 20:30:46.338893902 +0200 | |
778 | +++ mod_fastcgi-2.4.2/fcgi_protocol.c 2004-10-06 21:53:04.266058814 +0200 | |
779 | @@ -110,21 +110,21 @@ | |
780 | char *first, *last; | |
781 | ||
782 | if (r->the_request == NULL) | |
783 | - return (char *) ap_pcalloc(r->pool, 1); | |
784 | + return (char *) apr_pcalloc(r->pool, 1); | |
785 | ||
786 | first = r->the_request; /* use the request-line */ | |
787 | ||
788 | - while (*first && !ap_isspace(*first)) | |
789 | + while (*first && !apr_isspace(*first)) | |
790 | ++first; /* skip over the method */ | |
791 | ||
792 | - while (ap_isspace(*first)) | |
793 | + while (apr_isspace(*first)) | |
794 | ++first; /* and the space(s) */ | |
795 | ||
796 | last = first; | |
797 | - while (*last && !ap_isspace(*last)) | |
798 | + while (*last && !apr_isspace(*last)) | |
799 | ++last; /* end at next whitespace */ | |
800 | ||
801 | - return ap_pstrndup(r->pool, first, last - first); | |
802 | + return apr_pstrndup(r->pool, first, last - first); | |
803 | } | |
804 | ||
805 | /* Based on Apache's ap_add_cgi_vars() in util_script.c. | |
806 | @@ -135,18 +135,18 @@ | |
807 | { | |
808 | table *e = r->subprocess_env; | |
809 | ||
810 | - ap_table_setn(e, "GATEWAY_INTERFACE", "CGI/1.1"); | |
811 | - ap_table_setn(e, "SERVER_PROTOCOL", r->protocol); | |
812 | - ap_table_setn(e, "REQUEST_METHOD", r->method); | |
813 | - ap_table_setn(e, "QUERY_STRING", r->args ? r->args : ""); | |
814 | - ap_table_setn(e, "REQUEST_URI", apache_original_uri(r)); | |
815 | + apr_table_setn(e, "GATEWAY_INTERFACE", "CGI/1.1"); | |
816 | + apr_table_setn(e, "SERVER_PROTOCOL", r->protocol); | |
817 | + apr_table_setn(e, "REQUEST_METHOD", r->method); | |
818 | + apr_table_setn(e, "QUERY_STRING", r->args ? r->args : ""); | |
819 | + apr_table_setn(e, "REQUEST_URI", apache_original_uri(r)); | |
820 | ||
821 | /* The FastCGI spec precludes sending of CONTENT_LENGTH, PATH_INFO, | |
822 | * PATH_TRANSLATED, and SCRIPT_NAME (for some reason?). PATH_TRANSLATED we | |
823 | * don't have, its the variable that causes Apache to break trying to set | |
824 | * up (and thus the reason this fn exists vs. using ap_add_cgi_vars()). */ | |
825 | if (compat) { | |
826 | - ap_table_unset(e, "CONTENT_LENGTH"); | |
827 | + apr_table_unset(e, "CONTENT_LENGTH"); | |
828 | return; | |
829 | } | |
830 | ||
831 | @@ -155,17 +155,17 @@ | |
832 | * args and path_info of the original request, and not any that may have | |
833 | * come with the script URI in the include command. Ugh. */ | |
834 | if (!strcmp(r->protocol, "INCLUDED")) { | |
835 | - ap_table_setn(e, "SCRIPT_NAME", r->uri); | |
836 | + apr_table_setn(e, "SCRIPT_NAME", r->uri); | |
837 | if (r->path_info && *r->path_info) | |
838 | - ap_table_setn(e, "PATH_INFO", r->path_info); | |
839 | + apr_table_setn(e, "PATH_INFO", r->path_info); | |
840 | } | |
841 | else if (!r->path_info || !*r->path_info) | |
842 | - ap_table_setn(e, "SCRIPT_NAME", r->uri); | |
843 | + apr_table_setn(e, "SCRIPT_NAME", r->uri); | |
844 | else { | |
845 | int path_info_start = ap_find_path_info(r->uri, r->path_info); | |
846 | ||
847 | - ap_table_setn(e, "SCRIPT_NAME", ap_pstrndup(r->pool, r->uri, path_info_start)); | |
848 | - ap_table_setn(e, "PATH_INFO", r->path_info); | |
849 | + apr_table_setn(e, "SCRIPT_NAME", apr_pstrndup(r->pool, r->uri, path_info_start)); | |
850 | + apr_table_setn(e, "PATH_INFO", r->path_info); | |
851 | } | |
852 | } | |
853 | ||
854 | @@ -178,9 +178,9 @@ | |
855 | int i = ph->nelts; | |
856 | ||
857 | for ( ; i; --i, ++elt) { | |
858 | - const char *val = ap_table_get(fr->r->headers_in, *elt); | |
859 | + const char *val = apr_table_get(fr->r->headers_in, *elt); | |
860 | if (val) { | |
861 | - ap_table_setn(fr->r->subprocess_env, *elt, val); | |
862 | + apr_table_setn(fr->r->subprocess_env, *elt, val); | |
863 | } | |
864 | } | |
865 | } | |
866 | @@ -373,7 +373,7 @@ | |
867 | ||
868 | if (fr->fs_stderr == NULL) | |
869 | { | |
870 | - fr->fs_stderr = ap_palloc(p, FCGI_SERVER_MAX_STDERR_LINE_LEN + 1); | |
871 | + fr->fs_stderr = apr_palloc(p, FCGI_SERVER_MAX_STDERR_LINE_LEN + 1); | |
872 | } | |
873 | ||
874 | /* We're gonna consume all thats here */ | |
875 | diff -urN mod_fastcgi-2.4.2.org/fcgi_util.c mod_fastcgi-2.4.2/fcgi_util.c | |
876 | --- mod_fastcgi-2.4.2.org/fcgi_util.c 2004-10-06 20:30:46.339893687 +0200 | |
877 | +++ mod_fastcgi-2.4.2/fcgi_util.c 2004-10-06 21:53:04.270057958 +0200 | |
878 | @@ -55,7 +55,7 @@ | |
879 | fcgi_util_socket_hash_filename(pool *p, const char *path, | |
880 | const char *user, const char *group) | |
881 | { | |
882 | - char *buf = ap_pstrcat(p, path, user, group, NULL); | |
883 | + char *buf = apr_pstrcat(p, path, user, group, NULL); | |
884 | ||
885 | /* Canonicalize the path (remove "//", ".", "..") */ | |
886 | ap_getparents(buf); | |
887 | @@ -77,13 +77,13 @@ | |
888 | x = strlen(src1); | |
889 | ||
890 | if (x == 0) { | |
891 | - p = ap_pstrcat(a, "\\", src2, NULL); | |
892 | + p = apr_pstrcat(a, "\\", src2, NULL); | |
893 | } | |
894 | else if (src1[x - 1] != '\\' && src1[x - 1] != '/') { | |
895 | - p = ap_pstrcat(a, src1, "\\", src2, NULL); | |
896 | + p = apr_pstrcat(a, src1, "\\", src2, NULL); | |
897 | } | |
898 | else { | |
899 | - p = ap_pstrcat(a, src1, src2, NULL); | |
900 | + p = apr_pstrcat(a, src1, src2, NULL); | |
901 | } | |
902 | ||
903 | q = p ; | |
904 | @@ -137,12 +137,12 @@ | |
905 | int socket_pathLen = strlen(socket_path); | |
906 | ||
907 | if (socket_pathLen >= sizeof((*socket_addr)->sun_path)) { | |
908 | - return ap_pstrcat(p, "path \"", socket_path, | |
909 | + return apr_pstrcat(p, "path \"", socket_path, | |
910 | "\" is too long for a Domain socket", NULL); | |
911 | } | |
912 | ||
913 | if (*socket_addr == NULL) | |
914 | - *socket_addr = ap_pcalloc(p, sizeof(struct sockaddr_un)); | |
915 | + *socket_addr = apr_pcalloc(p, sizeof(struct sockaddr_un)); | |
916 | else | |
917 | memset(*socket_addr, 0, sizeof(struct sockaddr_un)); | |
918 | ||
919 | @@ -194,7 +194,7 @@ | |
920 | int *socket_addr_len, const char *host, unsigned short port) | |
921 | { | |
922 | if (*socket_addr == NULL) | |
923 | - *socket_addr = ap_pcalloc(p, sizeof(struct sockaddr_in)); | |
924 | + *socket_addr = apr_pcalloc(p, sizeof(struct sockaddr_in)); | |
925 | else | |
926 | memset(*socket_addr, 0, sizeof(struct sockaddr_in)); | |
927 | ||
928 | @@ -204,7 +204,7 @@ | |
929 | /* Get an in_addr represention of the host */ | |
930 | if (host != NULL) { | |
931 | if (convert_string_to_in_addr(host, &(*socket_addr)->sin_addr) != 1) { | |
932 | - return ap_pstrcat(p, "failed to resolve \"", host, | |
933 | + return apr_pstrcat(p, "failed to resolve \"", host, | |
934 | "\" to exactly one IP address", NULL); | |
935 | } | |
936 | } else { | |
937 | @@ -227,7 +227,7 @@ | |
938 | ||
939 | if (statBuf == NULL) { | |
940 | if (stat(path, &myStatBuf) < 0) | |
941 | - return ap_psprintf(tp, "stat(%s) failed: %s", path, strerror(errno)); | |
942 | + return apr_psprintf(tp, "stat(%s) failed: %s", path, strerror(errno)); | |
943 | statBuf = &myStatBuf; | |
944 | } | |
945 | ||
946 | @@ -311,7 +311,7 @@ | |
947 | fcgi_server *s; | |
948 | ||
949 | /* @@@ This should now be done in the loop below */ | |
950 | - ap_cpystrn(path, ePath, FCGI_MAXPATH); | |
951 | + apr_cpystrn(path, ePath, FCGI_MAXPATH); | |
952 | ap_no2slash(path); | |
953 | ||
954 | for (s = fcgi_servers; s != NULL; s = s->next) { | |
955 | @@ -343,7 +343,7 @@ | |
956 | char path[FCGI_MAXPATH]; | |
957 | fcgi_server *s; | |
958 | ||
959 | - ap_cpystrn(path, ePath, FCGI_MAXPATH); | |
960 | + apr_cpystrn(path, ePath, FCGI_MAXPATH); | |
961 | ap_no2slash(path); | |
962 | ||
963 | for (s = fcgi_servers; s != NULL; s = s->next) { | |
964 | @@ -367,21 +367,21 @@ | |
965 | const char *err; | |
966 | ||
967 | if (finfo == NULL) { | |
968 | - finfo = (struct stat *)ap_palloc(p, sizeof(struct stat)); | |
969 | + finfo = (struct stat *)apr_palloc(p, sizeof(struct stat)); | |
970 | if (stat(fs_path, finfo) < 0) | |
971 | - return ap_psprintf(p, "stat(%s) failed: %s", fs_path, strerror(errno)); | |
972 | + return apr_psprintf(p, "stat(%s) failed: %s", fs_path, strerror(errno)); | |
973 | } | |
974 | ||
975 | /* No Parse Header scripts aren't allowed. | |
976 | * @@@ Well... we really could quite easily */ | |
977 | if (strncmp(strrchr(fs_path, '/'), "/nph-", 5) == 0) | |
978 | - return ap_psprintf(p, "NPH scripts cannot be run as FastCGI"); | |
979 | + return apr_psprintf(p, "NPH scripts cannot be run as FastCGI"); | |
980 | ||
981 | if (finfo->st_mode == 0) | |
982 | - return ap_psprintf(p, "script not found or unable to stat()"); | |
983 | + return apr_psprintf(p, "script not found or unable to stat()"); | |
984 | ||
985 | if (S_ISDIR(finfo->st_mode)) | |
986 | - return ap_psprintf(p, "script is a directory!"); | |
987 | + return apr_psprintf(p, "script is a directory!"); | |
988 | ||
989 | /* Let the wrapper determine what it can and can't execute */ | |
990 | if (! fcgi_wrapper) | |
991 | @@ -392,7 +392,7 @@ | |
992 | err = fcgi_util_check_access(p, fs_path, finfo, X_OK, fcgi_user_id, fcgi_group_id); | |
993 | #endif | |
994 | if (err) { | |
995 | - return ap_psprintf(p, | |
996 | + return apr_psprintf(p, | |
997 | "access for server (uid %ld, gid %ld) not allowed: %s", | |
998 | (long)fcgi_user_id, (long)fcgi_group_id, err); | |
999 | } | |
1000 | @@ -409,7 +409,7 @@ | |
1001 | fcgi_server * | |
1002 | fcgi_util_fs_new(pool *p) | |
1003 | { | |
1004 | - fcgi_server *s = (fcgi_server *) ap_pcalloc(p, sizeof(fcgi_server)); | |
1005 | + fcgi_server *s = (fcgi_server *) apr_pcalloc(p, sizeof(fcgi_server)); | |
1006 | ||
1007 | /* Initialize anything who's init state is not zeroizzzzed */ | |
1008 | s->listenQueueDepth = FCGI_DEFAULT_LISTEN_Q; | |
1009 | @@ -462,23 +462,23 @@ | |
1010 | s->uid = uid; | |
1011 | pw = getpwuid(uid); | |
1012 | if (pw == NULL) { | |
1013 | - return ap_psprintf(p, | |
1014 | + return apr_psprintf(p, | |
1015 | "getpwuid() couldn't determine the username for uid '%ld', " | |
1016 | "you probably need to modify the User directive: %s", | |
1017 | (long)uid, strerror(errno)); | |
1018 | } | |
1019 | - s->user = ap_pstrdup(p, pw->pw_name); | |
1020 | + s->user = apr_pstrdup(p, pw->pw_name); | |
1021 | s->username = s->user; | |
1022 | ||
1023 | s->gid = gid; | |
1024 | gr = getgrgid(gid); | |
1025 | if (gr == NULL) { | |
1026 | - return ap_psprintf(p, | |
1027 | + return apr_psprintf(p, | |
1028 | "getgrgid() couldn't determine the group name for gid '%ld', " | |
1029 | "you probably need to modify the Group directive: %s", | |
1030 | (long)gid, strerror(errno)); | |
1031 | } | |
1032 | - s->group = ap_pstrdup(p, gr->gr_name); | |
1033 | + s->group = apr_pstrdup(p, gr->gr_name); | |
1034 | ||
1035 | #endif /* !WIN32 */ | |
1036 | ||
1037 | @@ -492,7 +492,7 @@ | |
1038 | fcgi_util_fs_create_procs(pool *p, int num) | |
1039 | { | |
1040 | int i; | |
1041 | - ServerProcess *proc = (ServerProcess *)ap_pcalloc(p, sizeof(ServerProcess) * num); | |
1042 | + ServerProcess *proc = (ServerProcess *)apr_pcalloc(p, sizeof(ServerProcess) * num); | |
1043 | ||
1044 | for (i = 0; i < num; i++) { | |
1045 | #ifdef WIN32 | |
1046 | diff -urN mod_fastcgi-2.4.2.org/mod_fastcgi.c mod_fastcgi-2.4.2/mod_fastcgi.c | |
1047 | --- mod_fastcgi-2.4.2.org/mod_fastcgi.c 2004-10-06 20:30:46.355890260 +0200 | |
1048 | +++ mod_fastcgi-2.4.2/mod_fastcgi.c 2004-10-06 21:53:04.284054959 +0200 | |
1049 | @@ -267,7 +267,7 @@ | |
1050 | ||
1051 | /* Register to reset to default values when the config pool is cleaned */ | |
1052 | ap_block_alarms(); | |
1053 | - ap_register_cleanup(p, NULL, fcgi_config_reset_globals, ap_null_cleanup); | |
1054 | + apr_pool_cleanup_register(p, NULL, fcgi_config_reset_globals, apr_pool_cleanup_null); | |
1055 | ap_unblock_alarms(); | |
1056 | ||
1057 | #ifdef APACHE2 | |
1058 | @@ -285,7 +285,7 @@ | |
1059 | #ifdef WIN32 | |
1060 | if (fcgi_socket_dir == NULL) | |
1061 | fcgi_socket_dir = DEFAULT_SOCK_DIR; | |
1062 | - fcgi_dynamic_dir = ap_pstrcat(p, fcgi_socket_dir, "dynamic", NULL); | |
1063 | + fcgi_dynamic_dir = apr_pstrcat(p, fcgi_socket_dir, "dynamic", NULL); | |
1064 | #else | |
1065 | ||
1066 | if (fcgi_socket_dir == NULL) | |
1067 | @@ -722,11 +722,11 @@ | |
1068 | } | |
1069 | if (statusValue < 0) { | |
1070 | fr->parseHeader = SCAN_CGI_BAD_HEADER; | |
1071 | - return ap_psprintf(r->pool, "invalid Status '%s'", value); | |
1072 | + return apr_psprintf(r->pool, "invalid Status '%s'", value); | |
1073 | } | |
1074 | hasStatus = TRUE; | |
1075 | r->status = statusValue; | |
1076 | - r->status_line = ap_pstrdup(r->pool, value); | |
1077 | + r->status_line = apr_pstrdup(r->pool, value); | |
1078 | continue; | |
1079 | } | |
1080 | ||
1081 | @@ -736,7 +736,7 @@ | |
1082 | goto DuplicateNotAllowed; | |
1083 | } | |
1084 | hasContentType = TRUE; | |
1085 | - r->content_type = ap_pstrdup(r->pool, value); | |
1086 | + r->content_type = apr_pstrdup(r->pool, value); | |
1087 | continue; | |
1088 | } | |
1089 | ||
1090 | @@ -745,16 +745,16 @@ | |
1091 | goto DuplicateNotAllowed; | |
1092 | } | |
1093 | hasLocation = TRUE; | |
1094 | - ap_table_set(r->headers_out, "Location", value); | |
1095 | + apr_table_set(r->headers_out, "Location", value); | |
1096 | continue; | |
1097 | } | |
1098 | ||
1099 | /* If the script wants them merged, it can do it */ | |
1100 | - ap_table_add(r->err_headers_out, name, value); | |
1101 | + apr_table_add(r->err_headers_out, name, value); | |
1102 | continue; | |
1103 | } | |
1104 | else { | |
1105 | - ap_table_add(fr->authHeaders, name, value); | |
1106 | + apr_table_add(fr->authHeaders, name, value); | |
1107 | } | |
1108 | } | |
1109 | ||
1110 | @@ -765,7 +765,7 @@ | |
1111 | * Who responds, this handler or Apache? | |
1112 | */ | |
1113 | if (hasLocation) { | |
1114 | - const char *location = ap_table_get(r->headers_out, "Location"); | |
1115 | + const char *location = apr_table_get(r->headers_out, "Location"); | |
1116 | /* | |
1117 | * Based on internal redirect handling in mod_cgi.c... | |
1118 | * | |
1119 | @@ -835,11 +835,11 @@ | |
1120 | if ((p = strpbrk(name, "\r\n")) != NULL) | |
1121 | *p = '\0'; | |
1122 | fr->parseHeader = SCAN_CGI_BAD_HEADER; | |
1123 | - return ap_psprintf(r->pool, "malformed header '%s'", name); | |
1124 | + return apr_psprintf(r->pool, "malformed header '%s'", name); | |
1125 | ||
1126 | DuplicateNotAllowed: | |
1127 | fr->parseHeader = SCAN_CGI_BAD_HEADER; | |
1128 | - return ap_psprintf(r->pool, "duplicate header '%s'", name); | |
1129 | + return apr_psprintf(r->pool, "duplicate header '%s'", name); | |
1130 | } | |
1131 | ||
1132 | /* | |
1133 | @@ -1019,9 +1019,9 @@ | |
1134 | char *end = strchr(r->uri + 2, '/'); | |
1135 | ||
1136 | if (end) | |
1137 | - *user = memcpy(ap_pcalloc(r->pool, end - r->uri), r->uri + 1, end - r->uri - 1); | |
1138 | + *user = memcpy(apr_pcalloc(r->pool, end - r->uri), r->uri + 1, end - r->uri - 1); | |
1139 | else | |
1140 | - *user = ap_pstrdup(r->pool, r->uri + 1); | |
1141 | + *user = apr_pstrdup(r->pool, r->uri + 1); | |
1142 | *group = "-"; | |
1143 | } | |
1144 | else { | |
1145 | @@ -1030,8 +1030,8 @@ | |
1146 | ||
1147 | get_request_identity(r, &uid, &gid); | |
1148 | ||
1149 | - *user = ap_psprintf(r->pool, "%ld", (long) uid); | |
1150 | - *group = ap_psprintf(r->pool, "%ld", (long) gid); | |
1151 | + *user = apr_psprintf(r->pool, "%ld", (long) uid); | |
1152 | + *group = apr_psprintf(r->pool, "%ld", (long) gid); | |
1153 | } | |
1154 | } | |
1155 | ||
1156 | @@ -1225,7 +1225,7 @@ | |
1157 | { | |
1158 | /* xxx this handle should live somewhere (see CloseHandle()s below too) */ | |
1159 | char * wait_npipe_mutex_name, * cp; | |
1160 | - wait_npipe_mutex_name = cp = ap_pstrdup(rp, socket_path); | |
1161 | + wait_npipe_mutex_name = cp = apr_pstrdup(rp, socket_path); | |
1162 | while ((cp = strchr(cp, '\\'))) *cp = '/'; | |
1163 | ||
1164 | wait_npipe_mutex = CreateMutex(NULL, FALSE, wait_npipe_mutex_name); | |
1165 | @@ -2318,7 +2318,7 @@ | |
1166 | } | |
1167 | ||
1168 | ap_block_alarms(); | |
1169 | - ap_register_cleanup(rp, (void *)fr, cleanup, ap_null_cleanup); | |
1170 | + apr_pool_cleanup_register(rp, (void *)fr, cleanup, apr_pool_cleanup_null); | |
1171 | ap_unblock_alarms(); | |
1172 | ||
1173 | #ifdef WIN32 | |
1174 | @@ -2422,7 +2422,7 @@ | |
1175 | const char *fs_path; | |
1176 | pool * const p = r->pool; | |
1177 | fcgi_server *fs; | |
1178 | - fcgi_request * const fr = (fcgi_request *)ap_pcalloc(p, sizeof(fcgi_request)); | |
1179 | + fcgi_request * const fr = (fcgi_request *)apr_pcalloc(p, sizeof(fcgi_request)); | |
1180 | uid_t uid; | |
1181 | gid_t gid; | |
1182 | ||
1183 | @@ -2450,7 +2450,7 @@ | |
1184 | else | |
1185 | #endif | |
1186 | { | |
1187 | - my_finfo = (struct stat *) ap_palloc(p, sizeof(struct stat)); | |
1188 | + my_finfo = (struct stat *) apr_palloc(p, sizeof(struct stat)); | |
1189 | ||
1190 | if (stat(fs_path, my_finfo) < 0) | |
1191 | { | |
1192 | @@ -2476,7 +2476,7 @@ | |
1193 | fr->erBufPtr = fcgi_buf_new(p, sizeof(FCGI_EndRequestBody) + 1); | |
1194 | fr->gotHeader = FALSE; | |
1195 | fr->parseHeader = SCAN_CGI_READING_HEADERS; | |
1196 | - fr->header = ap_make_array(p, 1, 1); | |
1197 | + fr->header = apr_array_make(p, 1, 1); | |
1198 | fr->fs_stderr = NULL; | |
1199 | fr->r = r; | |
1200 | fr->readingEndRequestBody = FALSE; | |
1201 | @@ -2489,7 +2489,7 @@ | |
1202 | fr->keepReadingFromFcgiApp = TRUE; | |
1203 | fr->fs = fs; | |
1204 | fr->fs_path = fs_path; | |
1205 | - fr->authHeaders = ap_make_table(p, 10); | |
1206 | + fr->authHeaders = apr_table_make(p, 10); | |
1207 | #ifdef WIN32 | |
1208 | fr->fd = INVALID_SOCKET; | |
1209 | fr->dynamic = ((fs == NULL) || (fs->directive == APP_CLASS_DYNAMIC)) ? TRUE : FALSE; | |
1210 | @@ -2531,7 +2531,7 @@ | |
1211 | */ | |
1212 | static int apache_is_scriptaliased(request_rec *r) | |
1213 | { | |
1214 | - const char *t = ap_table_get(r->notes, "alias-forced-type"); | |
1215 | + const char *t = apr_table_get(r->notes, "alias-forced-type"); | |
1216 | return t && (!strcasecmp(t, "cgi-script")); | |
1217 | } | |
1218 | ||
1219 | @@ -2554,9 +2554,9 @@ | |
1220 | */ | |
1221 | r->method = "GET"; | |
1222 | r->method_number = M_GET; | |
1223 | - ap_table_unset(r->headers_in, "Content-length"); | |
1224 | + apr_table_unset(r->headers_in, "Content-length"); | |
1225 | ||
1226 | - ap_internal_redirect_handler(ap_table_get(r->headers_out, "Location"), r); | |
1227 | + ap_internal_redirect_handler(apr_table_get(r->headers_out, "Location"), r); | |
1228 | return OK; | |
1229 | ||
1230 | case SCAN_CGI_SRV_REDIRECT: | |
1231 | @@ -2612,21 +2612,21 @@ | |
1232 | if (strncasecmp(key, "Variable-", 9) == 0) | |
1233 | key += 9; | |
1234 | ||
1235 | - ap_table_setn(t, key, val); | |
1236 | + apr_table_setn(t, key, val); | |
1237 | return 1; | |
1238 | } | |
1239 | ||
1240 | static int post_process_auth_passed_compat_header(table *t, const char *key, const char * const val) | |
1241 | { | |
1242 | if (strncasecmp(key, "Variable-", 9) == 0) | |
1243 | - ap_table_setn(t, key + 9, val); | |
1244 | + apr_table_setn(t, key + 9, val); | |
1245 | ||
1246 | return 1; | |
1247 | } | |
1248 | ||
1249 | static int post_process_auth_failed_header(table * const t, const char * const key, const char * const val) | |
1250 | { | |
1251 | - ap_table_setn(t, key, val); | |
1252 | + apr_table_setn(t, key, val); | |
1253 | return 1; | |
1254 | } | |
1255 | ||
1256 | @@ -2639,16 +2639,16 @@ | |
1257 | ||
1258 | if (passed) { | |
1259 | if (fr->auth_compat) { | |
1260 | - ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_compat_header, | |
1261 | + apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_compat_header, | |
1262 | (void *)r->subprocess_env, fr->authHeaders, NULL); | |
1263 | } | |
1264 | else { | |
1265 | - ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_header, | |
1266 | + apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_passed_header, | |
1267 | (void *)r->subprocess_env, fr->authHeaders, NULL); | |
1268 | } | |
1269 | } | |
1270 | else { | |
1271 | - ap_table_do((int (*)(void *, const char *, const char *))post_process_auth_failed_header, | |
1272 | + apr_table_do((int (*)(void *, const char *, const char *))post_process_auth_failed_header, | |
1273 | (void *)r->err_headers_out, fr->authHeaders, NULL); | |
1274 | } | |
1275 | ||
1276 | @@ -2679,10 +2679,10 @@ | |
1277 | } | |
1278 | ||
1279 | /* Save the existing subprocess_env, because we're gonna muddy it up */ | |
1280 | - fr->saved_subprocess_env = ap_copy_table(r->pool, r->subprocess_env); | |
1281 | + fr->saved_subprocess_env = apr_table_copy(r->pool, r->subprocess_env); | |
1282 | ||
1283 | - ap_table_setn(r->subprocess_env, "REMOTE_PASSWD", password); | |
1284 | - ap_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "AUTHENTICATOR"); | |
1285 | + apr_table_setn(r->subprocess_env, "REMOTE_PASSWD", password); | |
1286 | + apr_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "AUTHENTICATOR"); | |
1287 | ||
1288 | /* The FastCGI Protocol doesn't differentiate authentication */ | |
1289 | fr->role = FCGI_AUTHORIZER; | |
1290 | @@ -2697,7 +2697,7 @@ | |
1291 | post_process_auth(fr, authenticated); | |
1292 | ||
1293 | /* A redirect shouldn't be allowed during the authentication 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: FastCgiAuthenticator \"%s\" redirected (not allowed)", | |
1298 | dir_config->authenticator); | |
1299 | @@ -2746,9 +2746,9 @@ | |
1300 | } | |
1301 | ||
1302 | /* Save the existing subprocess_env, because we're gonna muddy it up */ | |
1303 | - fr->saved_subprocess_env = ap_copy_table(r->pool, r->subprocess_env); | |
1304 | + fr->saved_subprocess_env = apr_table_copy(r->pool, r->subprocess_env); | |
1305 | ||
1306 | - ap_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "AUTHORIZER"); | |
1307 | + apr_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "AUTHORIZER"); | |
1308 | ||
1309 | fr->role = FCGI_AUTHORIZER; | |
1310 | ||
1311 | @@ -2762,7 +2762,7 @@ | |
1312 | post_process_auth(fr, authorized); | |
1313 | ||
1314 | /* A redirect shouldn't be allowed during the authorization phase */ | |
1315 | - if (ap_table_get(r->headers_out, "Location") != NULL) { | |
1316 | + if (apr_table_get(r->headers_out, "Location") != NULL) { | |
1317 | ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r, | |
1318 | "FastCGI: FastCgiAuthorizer \"%s\" redirected (not allowed)", | |
1319 | dir_config->authorizer); | |
1320 | @@ -2806,9 +2806,9 @@ | |
1321 | } | |
1322 | ||
1323 | /* Save the existing subprocess_env, because we're gonna muddy it up */ | |
1324 | - fr->saved_subprocess_env = ap_copy_table(r->pool, r->subprocess_env); | |
1325 | + fr->saved_subprocess_env = apr_table_copy(r->pool, r->subprocess_env); | |
1326 | ||
1327 | - ap_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "ACCESS_CHECKER"); | |
1328 | + apr_table_setn(r->subprocess_env, "FCGI_APACHE_ROLE", "ACCESS_CHECKER"); | |
1329 | ||
1330 | /* The FastCGI Protocol doesn't differentiate access control */ | |
1331 | fr->role = FCGI_AUTHORIZER; | |
1332 | @@ -2823,7 +2823,7 @@ | |
1333 | post_process_auth(fr, access_allowed); | |
1334 | ||
1335 | /* A redirect shouldn't be allowed during the access check phase */ | |
1336 | - if (ap_table_get(r->headers_out, "Location") != NULL) { | |
1337 | + if (apr_table_get(r->headers_out, "Location") != NULL) { | |
1338 | ap_log_rerror(FCGI_LOG_ERR_NOERRNO, r, | |
1339 | "FastCGI: FastCgiAccessChecker \"%s\" redirected (not allowed)", | |
1340 | dir_config->access_checker); |