svn commit: r1312052 - in /httpd/mod_fcgid/trunk/modules/fcgid: fcgid_conf.c fcgid_pm_win.c fcgid_proc_win.c

[tr...@apache.org]

Author: trawick
Date: Tue Apr 10 23:59:13 2012
New Revision: 1312052

URL: http://svn.apache.org/viewvc?rev=1312052&view=rev
Log:
crash if module config can't be retrieved from server_rec (tweak to r1311569)

Modified:
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_win.c

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c?rev=1312052&r1=1312051&r2=1312052&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_conf.c Tue Apr 10 23:59:13 2012
@@ -776,7 +776,7 @@ const char *set_win32_prevent_process_or
     fcgid_server_conf *config = ap_get_module_config(s->module_config,
                                                      &fcgid_module);
 
-    if (config != NULL && config->hJobObjectForAutoCleanup == NULL) {
+    if (config->hJobObjectForAutoCleanup == NULL) {
         /* Create Win32 job object to prevent CGI process oprhaning
          */
         JOBOBJECT_EXTENDED_LIMIT_INFORMATION job_info = { 0 };

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c?rev=1312052&r1=1312051&r2=1312052&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c Tue Apr 10 23:59:13 2012
@@ -286,7 +286,7 @@ apr_status_t procmgr_stop_procmgr(void *
     conf = ap_get_module_config(((server_rec*)server)->module_config,
                                 &fcgid_module);
 
-    if (conf != NULL && conf->hJobObjectForAutoCleanup != NULL) {
+    if (conf->hJobObjectForAutoCleanup != NULL) {
         CloseHandle(conf->hJobObjectForAutoCleanup);
     }
 

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_win.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_win.c?rev=1312052&r1=1312051&r2=1312052&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_win.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_proc_win.c Tue Apr 10 23:59:13 2012
@@ -184,11 +184,6 @@ apr_status_t proc_spawn_process(const ch
     /* FcgidWin32PreventOrphans feature */
     sconf = ap_get_module_config(procinfo->main_server->module_config,
                                  &fcgid_module);
-    if (sconf == NULL) {
-        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, procinfo->main_server,
-                     "mod_fcgid: missing server configuration record");
-        return APR_SUCCESS;
-    }
 
     if (sconf->hJobObjectForAutoCleanup != NULL) {
         /* Associate cgi process to current process */