jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380480 )
Change subject: Pass request time from nginx to thumbor ...................................................................... Pass request time from nginx to thumbor Bug: T161535 Change-Id: I6ae13d2bd9ca452096ea9c3e6d1fd6e8e53b2b64 --- M puppet/modules/role/templates/thumbor/nginx.conf.erb M puppet/modules/swift/files/SwiftMedia/wmf/rewrite.py 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Gilles: Looks good to me, approved diff --git a/puppet/modules/role/templates/thumbor/nginx.conf.erb b/puppet/modules/role/templates/thumbor/nginx.conf.erb index 4c626b9..dd9b1f5 100644 --- a/puppet/modules/role/templates/thumbor/nginx.conf.erb +++ b/puppet/modules/role/templates/thumbor/nginx.conf.erb @@ -31,11 +31,13 @@ keepalive_timeout 60; location / { + ssi on; proxy_redirect off; proxy_buffering off; proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Request-Date $date_gmt; proxy_read_timeout 180s; proxy_pass http://thumbor; add_header X-Upstream $upstream_addr; diff --git a/puppet/modules/swift/files/SwiftMedia/wmf/rewrite.py b/puppet/modules/swift/files/SwiftMedia/wmf/rewrite.py index 0e091e5..f0b6b6f 100644 --- a/puppet/modules/swift/files/SwiftMedia/wmf/rewrite.py +++ b/puppet/modules/swift/files/SwiftMedia/wmf/rewrite.py @@ -170,7 +170,7 @@ resp = webob.Response(app_iter=upcopy, content_type=c_t) # add in the headers if we've got them - for header in ['Content-Length', 'Content-Disposition', 'Last-Modified', 'Accept-Ranges', 'XKey', 'Engine', 'Server', 'Processing-Time', 'Processing-Utime']: + for header in ['Content-Length', 'Content-Disposition', 'Last-Modified', 'Accept-Ranges', 'XKey', 'Engine', 'Server', 'Processing-Time', 'Processing-Utime', 'Request-Date']: if(uinfo.getheader(header)): resp.headers.add(header, uinfo.getheader(header)) -- To view, visit https://gerrit.wikimedia.org/r/380480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ae13d2bd9ca452096ea9c3e6d1fd6e8e53b2b64 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Gilles <gdu...@wikimedia.org> Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org> Gerrit-Reviewer: Gilles <gdu...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits