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-*
diff --git a/.gitmodules b/.gitmodules
index d38a4bc..5e0e8b0 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 3663eb1..c19d0d5 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 aeb677b..c082de3 100644
--- a/config
+++ b/config
@@ -35,7 +35,7 @@
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 ed7785e..85dcd64 100755
--- a/scripts/build_ngx_pagespeed.sh
+++ b/scripts/build_ngx_pagespeed.sh
@@ -608,7 +608,7 @@
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 bd9ac36..216e4f3 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 8c6c31d..5eaf056 100644
--- a/src/ngx_base_fetch.cc
+++ b/src/ngx_base_fetch.cc
@@ -152,7 +152,7 @@
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 6ab88f9..db03bdc 100644
--- a/src/ngx_event_connection.cc
+++ b/src/ngx_event_connection.cc
@@ -54,7 +54,7 @@
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 90e5bd3..e9df090 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 <nginx.h>
diff --git a/src/ngx_pagespeed.cc b/src/ngx_pagespeed.cc
index 579832f..61b2daa 100644
--- a/src/ngx_pagespeed.cc
+++ b/src/ngx_pagespeed.cc
@@ -718,7 +718,7 @@
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 @@
}
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 @@
ps_main_conf_t* cfg_m = static_cast<ps_main_conf_t*>(
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 bed9093..6059e79 100644
--- a/src/ngx_rewrite_driver_factory.cc
+++ b/src/ngx_rewrite_driver_factory.cc
@@ -151,7 +151,7 @@
// 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 20ce73a..fd22076 100644
--- a/test/pagespeed_test.conf.template
+++ b/test/pagespeed_test.conf.template
@@ -2067,7 +2067,7 @@
# 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 3891473..695dc48 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.
{
<nginx false positive>