Strip subresource hints pagespeed automatic system test configuration

Corresponding changes for: - pull https://github.com/pagespeed/mod_pagespeed/pull/1204 - issue Strip subresource hints #973 https://github.com/pagespeed/mod_pagespeed/issues/973
Restore dropped fix for #957
2015-12-24 12:08:28 +01:00 · 2015-12-18 15:01:15 -05:00 · 2015-12-17 11:36:34 -05:00 · 2015-12-11 12:02:21 +01:00
4 changed files with 28 additions and 7 deletions
@@ -986,6 +986,7 @@ void* ps_create_main_conf(ngx_conf_t* cf) {
      "" /* hostname, not used */,
      -1 /* port, not used */);
  active_driver_factory = cfg_m->driver_factory;
+  active_driver_factory->LoggingInit(ngx_cycle->log, false);
  cfg_m->driver_factory->Init();
  ps_set_conf_cleanup_handler(cf, ps_cleanup_main_conf, cfg_m);
  return cfg_m;
@@ -2478,8 +2479,8 @@ ngx_int_t send_out_headers_and_body(

  rc = ngx_http_send_header(r);

-  if (rc != NGX_OK) {
-    return NGX_ERROR;
+  if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
+    return rc;
  }

  // Send the body.
@@ -3051,7 +3052,7 @@ ngx_int_t ps_init_module(ngx_cycle_t* cycle) {
      return NGX_ERROR;
    }

-    cfg_m->driver_factory->LoggingInit(cycle->log);
+    cfg_m->driver_factory->LoggingInit(cycle->log, true);
    cfg_m->driver_factory->RootInit();
  } else {
    delete cfg_m->driver_factory;
@@ -3083,7 +3084,7 @@ ngx_int_t ps_init_child_process(ngx_cycle_t* cycle) {

  // ChildInit() will initialise all ServerContexts, which we need to
  // create ProxyFetchFactories below
-  cfg_m->driver_factory->LoggingInit(cycle->log);
+  cfg_m->driver_factory->LoggingInit(cycle->log, true);
  cfg_m->driver_factory->ChildInit();

  ngx_http_core_main_conf_t* cmcf = static_cast<ngx_http_core_main_conf_t*>(
@@ -208,10 +208,11 @@ void NgxRewriteDriverFactory::StartThreads() {
  threads_started_ = true;
 }

-void NgxRewriteDriverFactory::LoggingInit(ngx_log_t* log) {
+void NgxRewriteDriverFactory::LoggingInit(
+    ngx_log_t* log, bool may_install_crash_handler) {
  log_ = log;
  net_instaweb::log_message_handler::Install(log);
-  if (install_crash_handler()) {
+  if (may_install_crash_handler && install_crash_handler()) {
    NgxMessageHandler::InstallCrashHandler(log);
  }
  ngx_message_handler_->set_log(log);
@@ -115,7 +115,7 @@ class NgxRewriteDriverFactory : public SystemRewriteDriverFactory {
    return process_script_variables_;
  }

-  void LoggingInit(ngx_log_t* log);
+  void LoggingInit(ngx_log_t* log, bool may_install_crash_handler);

  virtual void ShutDownMessageHandlers();

@@ -1748,6 +1748,25 @@ http {
          https://www.gstatic.com/psa/static;
    }

+    location /mod_pagespeed_test/strip_subresource_hints/default/ {
+      pagespeed DisableFilters add_instrumentation;
+      pagespeed RewriteLevel CoreFilters;
+      pagespeed DisAllow *dontrewriteme*;
+    }
+    location /mod_pagespeed_test/strip_subresource_hints/default_passthrough/ {
+      pagespeed DisableFilters add_instrumentation;
+      pagespeed RewriteLevel PassThrough;
+    }
+    location /mod_pagespeed_test/strip_subresource_hints/preserve_on/ {
+      pagespeed DisableFilters add_instrumentation;
+      pagespeed PreserveSubresourceHints on;
+      pagespeed RewriteLevel CoreFilters;
+    }
+    location /mod_pagespeed_test/strip_subresource_hints/preserve_off/ {
+      pagespeed DisableFilters add_instrumentation;
+      pagespeed PreserveSubresourceHints off;
+      pagespeed RewriteLevel CoreFilters;
+    }
    # $host implicitly tests script variable support. I'd love to test it more
    # directly, but so far this is the best I've come up with and duplicating
    # the test doesn't seem to make sense.
Author	SHA1	Message	Date
Kees Spoelstra	f7b0311e92	Strip subresource hints pagespeed automatic system test configuration Corresponding changes for: - pull https://github.com/pagespeed/mod_pagespeed/pull/1204 - issue Strip subresource hints #973 https://github.com/pagespeed/mod_pagespeed/issues/973	2015-12-24 12:08:28 +01:00
Jeff Kaufman	56a5d41ec3	Restore dropped fix for #957 @rfnx fixed #957 in acb89a, but this was accidentally merged to master instead of trunk-tracking. I checked for this sort of problem as part of the 1.10 release, but missed this commit. Restored. Fixes #1054	2015-12-18 15:01:15 -05:00
Jeff Kaufman	7ee1efe0dd	Merge pull request #1071 from pagespeed/oschaaf-trunk-tracking-log-debug-noise log: initialize logging earlier	2015-12-17 11:36:34 -05:00
Otto van der Schaaf	37e1c3618a	log: initialize logging earlier It turns out to be possible to initialize logging earlier by grabbing the log from a global ngx_cycle structure. This makes us start logging earlier, yet loses the "No threading detected ..." messages both from stderr and in error.log when nginx initially starts. With this change, these messages will now be logged as we start logging earlier: " flush . " These originate from SystemCachePath::CacheKey which appends newlines to the key, and the resulting cache key ends up being logged. We might want to change that, because the resulting lines in error.log look weird and might raise questions. Fixes https://github.com/pagespeed/ngx_pagespeed/issues/895	2015-12-11 12:02:21 +01:00