From daf1d9446c22bc779ee89c4dd6eff575899c15ab Mon Sep 17 00:00:00 2001 From: Otto van der Schaaf Date: Fri, 12 Jan 2018 20:02:03 +0000 Subject: [PATCH] Update repository links Update sources to reflect that the source of truth for most of the repositories in pagespeed/ have moved to github.com/apache/incubator-pagespeed-* --- .gitmodules | 2 +- PSOL_BINARY_URL | 2 +- config | 2 +- scripts/build_ngx_pagespeed.sh | 2 +- scripts/pagespeed_libraries_generator.sh | 4 ++-- src/ngx_base_fetch.cc | 2 +- src/ngx_event_connection.cc | 2 +- src/ngx_fetch.cc | 2 +- src/ngx_pagespeed.cc | 6 +++--- src/ngx_rewrite_driver_factory.cc | 2 +- test/pagespeed_test.conf.template | 2 +- test/valgrind.sup | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitmodules b/.gitmodules index d38a4bcd8..5e0e8b026 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "testing-dependencies/mod_pagespeed"] path = testing-dependencies/mod_pagespeed - url = https://github.com/pagespeed/mod_pagespeed.git + url = https://github.com/apache/incubator-pagespeed-mod.git [submodule "testing-dependencies/ngx_cache_purge"] path = testing-dependencies/ngx_cache_purge url = https://github.com/FRiCKLE/ngx_cache_purge.git diff --git a/PSOL_BINARY_URL b/PSOL_BINARY_URL index 3663eb12c..c19d0d556 100644 --- a/PSOL_BINARY_URL +++ b/PSOL_BINARY_URL @@ -1,4 +1,4 @@ In a release this file would contain the URL to download the pre-compiled PSOL binary, but on development branches (like this one) you have to build PSOL from source yourself. See: - https://github.com/pagespeed/ngx_pagespeed/wiki/Building-PSOL-From-Source + https://github.com/apache/incubator-pagespeed-ngx/wiki/Building-PSOL-From-Source diff --git a/config b/config index aeb677b2a..c082de335 100644 --- a/config +++ b/config @@ -35,7 +35,7 @@ if [ "$mod_pagespeed_dir" = "unset" ] ; then This is a development branch of ngx_pagespeed, which means there is no precompiled PSOL library available to link against. Either build from a release tag, like latest-beta, or build PSOL from source: - https://github.com/pagespeed/ngx_pagespeed/wiki/Building-PSOL-From-Source" + https://github.com/apache/incubator-pagespeed-ngx/wiki/Building-PSOL-From-Source" exit 1 fi diff --git a/scripts/build_ngx_pagespeed.sh b/scripts/build_ngx_pagespeed.sh index ed7785e89..85dcd64cb 100755 --- a/scripts/build_ngx_pagespeed.sh +++ b/scripts/build_ngx_pagespeed.sh @@ -608,7 +608,7 @@ Not deleting $directory; name is suspiciously short. Something is wrong." fi fi else - nps_baseurl="https://github.com/pagespeed/ngx_pagespeed/archive" + nps_baseurl="https://github.com/apache/incubator-pagespeed-ngx/archive" nps_downloaded="$TEMPDIR/$nps_downloaded_fname.zip" status "Downloading ngx_pagespeed..." run wget "$nps_baseurl/$tag_name.zip" -O "$nps_downloaded" diff --git a/scripts/pagespeed_libraries_generator.sh b/scripts/pagespeed_libraries_generator.sh index bd9ac3672..216e4f31b 100755 --- a/scripts/pagespeed_libraries_generator.sh +++ b/scripts/pagespeed_libraries_generator.sh @@ -16,7 +16,7 @@ # # Converts pagespeed_libraries.conf from Apache-format to Nginx-format, # supporting the canonicalize_javascript_libraries filter. -# Inspired by https://github.com/pagespeed/ngx_pagespeed/issues/532 +# Inspired by https://github.com/apache/incubator-pagespeed-ngx/issues/532 # # Usage: # scripts/pagespeed_libraries_generator.sh > pagespeed_libraries.conf @@ -27,7 +27,7 @@ # Author: vid@zippykid.com (Vid Luther) # jefftk@google.com (Jeff Kaufman) -URL="https://github.com/pagespeed/mod_pagespeed/raw/master/" +URL="https://github.com/apache/incubator-pagespeed-mod/raw/master/" URL+="net/instaweb/genfiles/conf/pagespeed_libraries.conf" curl -L -s -S "$URL" \ | grep ModPagespeedLibrary \ diff --git a/src/ngx_base_fetch.cc b/src/ngx_base_fetch.cc index 8c6c31d4f..5eaf05680 100644 --- a/src/ngx_base_fetch.cc +++ b/src/ngx_base_fetch.cc @@ -152,7 +152,7 @@ void NgxBaseFetch::ReadCallback(const ps_event_data& data) { ps_request_ctx_t* ctx = ps_get_request_context(r); // If our request context was zeroed, skip this event. - // See https://github.com/pagespeed/ngx_pagespeed/issues/1081 + // See https://github.com/apache/incubator-pagespeed-ngx/issues/1081 if (ctx == NULL) { // Should not happen normally, when it does this message will cause our // system tests to fail. diff --git a/src/ngx_event_connection.cc b/src/ngx_event_connection.cc index 6ab88f9cd..db03bdccb 100644 --- a/src/ngx_event_connection.cc +++ b/src/ngx_event_connection.cc @@ -54,7 +54,7 @@ bool NgxEventConnection::Init(ngx_cycle_t* cycle) { pipe_write_fd_ = file_descriptors[1]; // Attempt to bump the pipe capacity, because running out of buffer space // can potentially lead up to writes spinning on EAGAIN. - // See https://github.com/pagespeed/ngx_pagespeed/issues/1380 + // See https://github.com/apache/incubator-pagespeed-ngx/issues/1380 // TODO(oschaaf): Consider implementing a queueing mechanism for retrying // failed writes. #ifdef F_SETPIPE_SZ diff --git a/src/ngx_fetch.cc b/src/ngx_fetch.cc index 90e5bd324..e9df09038 100644 --- a/src/ngx_fetch.cc +++ b/src/ngx_fetch.cc @@ -30,7 +30,7 @@ // TODO(oschaaf): style: reindent namespace according to google C++ style guide // TODO(oschaaf): Retry mechanism for failures on a re-used k-a connection. // Currently we don't think it's going to be an issue, see the comments at -// https://github.com/pagespeed/ngx_pagespeed/pull/781. +// https://github.com/apache/incubator-pagespeed-ngx/pull/781. extern "C" { #include diff --git a/src/ngx_pagespeed.cc b/src/ngx_pagespeed.cc index 579832f0c..61b2daa2c 100644 --- a/src/ngx_pagespeed.cc +++ b/src/ngx_pagespeed.cc @@ -718,7 +718,7 @@ char* ps_srv_configure(ngx_conf_t* cf, ngx_command_t* cmd, void* conf); char* ps_loc_configure(ngx_conf_t* cf, ngx_command_t* cmd, void* conf); // We want NGX_CONF_MULTI for some very old versions: -// https://github.com/pagespeed/ngx_pagespeed/commit/66f1b9aa +// https://github.com/apache/incubator-pagespeed-ngx/commit/66f1b9aa // but it's gone in recent revisions, so provide a compat #define if needed #ifndef NGX_CONF_MULTI #define NGX_CONF_MULTI 0 @@ -2363,7 +2363,7 @@ ngx_int_t ps_html_rewrite_header_filter(ngx_http_request_t* r) { } ps_strip_html_headers(r); - // See https://github.com/pagespeed/ngx_pagespeed/issues/819 + // See https://github.com/apache/incubator-pagespeed-ngx/issues/819 ctx->location_field_set = r->headers_out.location != NULL; // TODO(jefftk): is this thread safe? @@ -3135,7 +3135,7 @@ ngx_int_t ps_init_module(ngx_cycle_t* cycle) { ps_main_conf_t* cfg_m = static_cast( ngx_http_cycle_get_module_main_conf(cycle, ngx_pagespeed)); - // See https://github.com/pagespeed/ngx_pagespeed/issues/1220 + // See https://github.com/apache/incubator-pagespeed-ngx/issues/1220 if (cfg_m == NULL) { return NGX_OK; } diff --git a/src/ngx_rewrite_driver_factory.cc b/src/ngx_rewrite_driver_factory.cc index bed90938c..6059e7965 100644 --- a/src/ngx_rewrite_driver_factory.cc +++ b/src/ngx_rewrite_driver_factory.cc @@ -151,7 +151,7 @@ RewriteOptions* NgxRewriteDriverFactory::NewRewriteOptions() { // mod_pagespeed does in mod_instaweb.cc:create_dir_config() isn't enough here // -- if you use that instead then ngx_pagespeed doesn't actually end up // defaulting CoreFilters. - // See: https://github.com/pagespeed/ngx_pagespeed/issues/1190 + // See: https://github.com/apache/incubator-pagespeed-ngx/issues/1190 options->SetRewriteLevel(RewriteOptions::kCoreFilters); return options; } diff --git a/test/pagespeed_test.conf.template b/test/pagespeed_test.conf.template index 20ce73ae2..fd2207637 100644 --- a/test/pagespeed_test.conf.template +++ b/test/pagespeed_test.conf.template @@ -2067,7 +2067,7 @@ http { # or made equivalent to ModPagespeedInPlaceRewriteDeadlineMs -1, which waits # forever. Otherwise ModPagespeedInPlaceRewriteDeadlineMs should just have # the specified deadline. - # # See https://github.com/pagespeed/mod_pagespeed/issues/1171 for more + # # See https://github.com/apache/incubator-pagespeed-mod/issues/1171 for more # detailed discussion. pagespeed InPlaceWaitForOptimized on; } diff --git a/test/valgrind.sup b/test/valgrind.sup index 38914731a..695dc48d2 100644 --- a/test/valgrind.sup +++ b/test/valgrind.sup @@ -101,7 +101,7 @@ fun:ngx_process_events_and_timers fun:ngx_worker_process_cycle } -# Mentioned in https://github.com/pagespeed/ngx_pagespeed/issues/103 +# Mentioned in https://github.com/apache/incubator-pagespeed-ngx/issues/103 # Assuming a false postives as the issue is closed. {