You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2004/11/12 11:16:02 UTC
cvs commit: httpd-2.0/modules/generators mod_cgid.c
jorton 2004/11/12 02:16:02
Modified: modules/generators mod_cgid.c
Log:
* modules/generators/mod_cgid.c (cgid_init): Fix GCC strict-aliasing
warning.
Revision Changes Path
1.171 +6 -2 httpd-2.0/modules/generators/mod_cgid.c
Index: mod_cgid.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgid.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -d -w -u -r1.170 -r1.171
--- mod_cgid.c 1 Aug 2004 01:12:30 -0000 1.170
+++ mod_cgid.c 12 Nov 2004 10:16:01 -0000 1.171
@@ -816,18 +816,22 @@
const char *userdata_key = "cgid_init";
module **m;
int ret = OK;
+ void *data;
root_server = main_server;
root_pool = p;
- apr_pool_userdata_get((void **)&procnew, userdata_key, main_server->process->pool);
- if (!procnew) {
+ apr_pool_userdata_get(&data, userdata_key, main_server->process->pool);
+ if (!data) {
first_time = 1;
procnew = apr_pcalloc(main_server->process->pool, sizeof(*procnew));
procnew->pid = -1;
procnew->err = procnew->in = procnew->out = NULL;
apr_pool_userdata_set((const void *)procnew, userdata_key,
apr_pool_cleanup_null, main_server->process->pool);
+ }
+ else {
+ procnew = data;
}
if (!first_time) {