Merge pull request #1122 from pagespeed/oschaaf-trunk-tracking-issue-1120

Fix shutdown when ngx_pagespeed is completely disabled.
2016-02-17 10:29:39 -05:00
parent d959f01848 f60c754d82
commit 60f91becb7
1 changed files with 3 additions and 1 deletions
@@ -3079,7 +3079,9 @@ void ps_exit_child_process(ngx_cycle_t* cycle) {
  ps_main_conf_t* cfg_m = static_cast<ps_main_conf_t*>(
      ngx_http_cycle_get_module_main_conf(cycle, ngx_pagespeed));
  NgxBaseFetch::Terminate();
+  if (cfg_m->driver_factory != NULL) {
    cfg_m->driver_factory->ShutDown();
+  }
 }

 // Called when nginx forks worker processes.  No threads should be started