Updated for nginx 1.13.4 with backported patch

3 files changed, 71 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4e8bf93e778c..705078384198 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 # Generated by mksrcinfo v8
-# Mon Jul 24 07:51:23 UTC 2017
+# Fri Sep  8 10:09:05 UTC 2017
 pkgbase = nginx-mainline-mod-pagespeed
 	pkgdesc = PageSpeed module for mainline nginx
 	pkgver = 1.12.34.2
-	pkgrel = 5
+	pkgrel = 6
 	url = https://modpagespeed.com
 	arch = i686
 	arch = x86_64
 	license = Apache
 	depends = nginx-mainline
-	source = https://nginx.org/download/nginx-1.13.3.tar.gz
+	source = https://nginx.org/download/nginx-1.13.4.tar.gz
 	source = https://github.com/pagespeed/ngx_pagespeed/archive/latest-stable/ngx_pagespeed-latest-stable.tar.gz
-	sha256sums = 5b73f98004c302fb8e4a172abf046d9ce77739a82487e4873b39f9b0dcbb0d72
+	source = pagespeed-nginx-try_files.patch
+	sha256sums = de21f3c49ba65c611329d8759a63d72e5fcf719bc6f2a3270e2541348ef1fbba
 	sha256sums = 09d341e73b831e36e2a9ec542019554df888b4b798723f1c956060ccdd12a9c0
+	sha256sums = d76e0abf1712a19b23ae9691c5d8ccda8ee01935954617c0757f1865b2f6279a
 	source_i686 = pagespeed-1.12.34.2-i686.tar.gz::https://dl.google.com/dl/page-speed/psol/1.12.34.2-ia32.tar.gz
 	sha256sums_i686 = cf54611bf8713a0dcb13ff274b011cb2a00c738b53afacb39edc64df7687f7fc
 	source_x86_64 = pagespeed-1.12.34.2-x86_64.tar.gz::https://dl.google.com/dl/page-speed/psol/1.12.34.2-x64.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 685fa24a2617..cd17a8418edf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
 
 pkgname=nginx-mainline-mod-pagespeed
 pkgver=1.12.34.2
-pkgrel=5
+pkgrel=6
 
 _modname="ngx_${pkgname#nginx-mainline-mod-}"
 
-_nginxver=1.13.3
+_nginxver=1.13.4
 _pagespeedver=latest-stable
 
 pkgdesc="PageSpeed module for mainline nginx"
@@ -18,17 +18,20 @@ license=('Apache')
 source=(
 	https://nginx.org/download/nginx-$_nginxver.tar.gz
 	https://github.com/pagespeed/$_modname/archive/$_pagespeedver/$_modname-$_pagespeedver.tar.gz
+	pagespeed-nginx-try_files.patch
 )
 source_i686=(pagespeed-$pkgver-i686.tar.gz::https://dl.google.com/dl/page-speed/psol/$pkgver-ia32.tar.gz)
 source_x86_64=(pagespeed-$pkgver-x86_64.tar.gz::https://dl.google.com/dl/page-speed/psol/$pkgver-x64.tar.gz)
 
-sha256sums=('5b73f98004c302fb8e4a172abf046d9ce77739a82487e4873b39f9b0dcbb0d72'
-            '09d341e73b831e36e2a9ec542019554df888b4b798723f1c956060ccdd12a9c0')
+sha256sums=('de21f3c49ba65c611329d8759a63d72e5fcf719bc6f2a3270e2541348ef1fbba'
+            '09d341e73b831e36e2a9ec542019554df888b4b798723f1c956060ccdd12a9c0'
+            'd76e0abf1712a19b23ae9691c5d8ccda8ee01935954617c0757f1865b2f6279a')
 sha256sums_i686=('cf54611bf8713a0dcb13ff274b011cb2a00c738b53afacb39edc64df7687f7fc')
 sha256sums_x86_64=('f5e53a07dff6b38075aa811f8a973b10db9f7c1d61464fd76b55b398f478e2c5')
 
 prepare() {
 	cd "$srcdir"/$_modname-$_pagespeedver
+	patch -p1 -i "$srcdir"/pagespeed-nginx-try_files.patch
 	ln -s ../psol
 	sed -r 's@^pagespeed_libs="(\$psol_binary.*)"@pagespeed_libs="\1 -Wl,-z,noexecstack"@' -i config
 }
diff --git a/pagespeed-nginx-try_files.patch b/pagespeed-nginx-try_files.patch
new file mode 100644
index 000000000000..190a732c6276
--- /dev/null
+++ b/pagespeed-nginx-try_files.patch
@@ -0,0 +1,58 @@
+From c67f6642440380a693329733f7148bfa4fed5459 Mon Sep 17 00:00:00 2001
+From: Otto van der Schaaf <oschaaf@we-amp.com>
+Date: Mon, 21 Aug 2017 12:25:50 +0200
+Subject: [PATCH] nginx 1.13.4: Fix compilation error (#1453)
+
+* Compilation of ngx_pagespeed broke with the following commit in
+nginx: https://github.com/nginx/nginx/commit/129b06dc5dfab7b4513a4f274b3778cd9b8a6a22
+This change intends to unbreak it while maintaining backwards
+compatibility.
+
+* updates the nginx testing-dependency to 1.13.4
+
+Fixes https://github.com/pagespeed/ngx_pagespeed/issues/1451
+---
+ src/ngx_pagespeed.cc       | 14 +++++++++++++-
+ testing-dependencies/nginx |  2 +-
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/src/ngx_pagespeed.cc b/src/ngx_pagespeed.cc
+index 8487f8ab6..97f07d98c 100644
+--- a/src/ngx_pagespeed.cc
++++ b/src/ngx_pagespeed.cc
+@@ -3019,13 +3019,17 @@ ngx_int_t ps_preaccess_handler(ngx_http_request_t* r) {
+   ph = cmcf->phase_engine.handlers;
+ 
+   i = r->phase_handler;
++
+   // move handlers before try_files && content phase
++  // As of nginx 1.13.4 we will be right before the try_files module
++  #if (nginx_version < 1013004)
+   while (ph[i + 1].checker != ngx_http_core_try_files_phase &&
+          ph[i + 1].checker != ngx_http_core_content_phase) {
+     ph[i] = ph[i + 1];
+     ph[i].next--;
+     i++;
+   }
++  #endif
+ 
+   // insert ps phase handler
+   ph[i].checker = ps_phase_handler;
+@@ -3081,8 +3085,16 @@ ngx_int_t ps_init(ngx_conf_t* cf) {
+     ngx_http_core_main_conf_t* cmcf = static_cast<ngx_http_core_main_conf_t*>(
+         ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module));
+ 
++    int phase = NGX_HTTP_PRECONTENT_PHASE;
++
++    // As of nginx 1.13.4, try_files has changed.
++#if (nginx_version < 1013004)
++    phase = NGX_HTTP_PREACCESS_PHASE;
++#endif
++
+     ngx_http_handler_pt* h = static_cast<ngx_http_handler_pt*>(
+-        ngx_array_push(&cmcf->phases[NGX_HTTP_PREACCESS_PHASE].handlers));
++        ngx_array_push(&cmcf->phases[phase].handlers));
++
+     if (h == NULL) {
+       return NGX_ERROR;
+     }