1c86ab66be
Merge pull request #465 from pagespeed/oschaaf-native-fetcher-crash
...
native-fetcher: fix a crasher, and set a timeout
2013-08-03 00:06:13 -07:00
f05e3cf281
native-fetcher: fix a crasher, and set a timeout
...
Handle the case where ngx_event_connect_peer didn't return NGX_OK.
Also replace a TODO for adding a timer with actually adding the
timer.
Fixes https://github.com/pagespeed/ngx_pagespeed/issues/463
2013-08-01 15:39:02 +02:00
177b70b995
Merge pull request #460 from pagespeed/oschaaf-test-accidental-quotes
...
system-test: remove a few stray quotes
2013-07-30 13:53:29 -07:00
3b2b28559a
system-test: remove a few stray quotes
...
This fixes nginx's complaints about receiving invalid headers after
running the system tests.
2013-07-30 22:43:39 +02:00
7e89db8fa1
trunk-tracking: in_place_resource_recorder changes
2013-07-30 15:38:42 -04:00
9b3ab25cea
Merge branch 'master' into trunk-tracking
2013-07-30 15:27:53 -04:00
54ef25214c
Merge pull request #457 from pagespeed/oschaaf-modify-headers
...
header-handling: ModifyCachingheaders & Content-Encoding
2013-07-30 12:19:46 -07:00
b9db498199
header-handling: ModifyCachingHeaders & Content-Encoding
...
- Change header handling for ModifyCachingHeaders
- Don't copy over response headers which have their hash set to 0
- Don't invent a date header
2013-07-30 21:14:49 +02:00
6503ebfb1a
merge commit
2013-07-30 14:30:55 -04:00
baf35dc906
Merge pull request #458 from pagespeed/jud-trunk-tracking
...
Trunk tracking updates
2013-07-26 12:14:24 -07:00
f4466918f3
System test changes to align with latest mod_pagespeed trunk.
2013-07-26 14:54:02 -04:00
3b6caa38aa
release: merging readme changes for 1.6.29.5
2013-07-25 14:31:45 -04:00
b1127c2a01
release: 1.6.29.5
2013-07-25 13:56:28 -04:00
ad6429d26f
ipro: support in-place resource optimization
...
Squash-merge of chaizhenhua's work over many pull requests, especially #450 .
The copy of in_place_resource_recorder.cc is temporary and can be removed after
the next PSOL release.
2013-07-24 10:45:39 -04:00
59cdafaf70
Merge pull request #454 from pagespeed/oschaaf-force-caching
...
force-caching: fix configuration handling
2013-07-24 07:15:40 -07:00
34ebc2d179
force-caching: fix configuration handling
...
Make pagespeed ForceCaching [on|off] work
2013-07-23 13:12:24 +02:00
49c9de63cd
Merge pull request #448 from pagespeed/oschaaf-log-vhost-specific
...
logging: respect error_log in nginx.conf server blocks
2013-07-23 01:52:34 -07:00
502a604a26
logging: respect error_log in nginx.conf server blocks
...
This makes messages written via the NgxMessageHandler from the
NgxServerContext be written with the nginx error_log configuration
specified at the server{} level, if specified.
Fixes https://github.com/pagespeed/ngx_pagespeed/issues/447
2013-07-23 10:51:47 +02:00
fca58f2d6f
Merge pull request #444 from morlovich/morlovich-trunk-tracking-20130719
...
trunk-tracking: merge with MPS trunk as of 2003-07-19
2013-07-22 07:13:31 -07:00
b2bbdcc0df
Merge pull request #443 from patschi/patch-2
...
readme: recommend nginx 1.4.2 stable
2013-07-22 07:05:20 -07:00
bdb5de5a2f
Merge pull request #446 from pagespeed/oschaaf-missing-beacon-urls
...
system-tests: fix missing beacon urls
2013-07-22 04:56:18 -07:00
960d0940bb
system-tests: fix missing beacon url parameters in tests
...
Fix 2 tests on the beacon by adding the missing url parameter
2013-07-21 14:20:16 +02:00
e7a91c2f0a
Merge pull request #445 from pagespeed/oschaaf-fix-keepalive-test-gzip
...
keepalive-test: fix gzip accept encoding
2013-07-20 03:11:06 -07:00
e583afdb49
keepalive-test: fix gzip accept encoding
...
We would send "Accept-Encoding:gzip" in the request headers. NGINX
would mark that as an invalid header, as it misses a space after ':'
2013-07-20 09:06:38 +02:00
53138d7b34
Merge with MPS trunk as of 2003-07-19
...
This has 2 families of changes:
- Port to changes in PropertyCache API
- Update to a MapProxyDomain test.
2013-07-19 14:28:46 -04:00
e45acf4613
nginx 1.4.2 stable released
...
Changelog: http://nginx.org/en/CHANGES-1.4
2013-07-19 14:45:21 +02:00
47e3364332
Merge pull request #439 from pagespeed/oschaaf-shutdown-fix
...
shutdown: fix segfault when shutting down a worker process
2013-07-18 14:21:12 -07:00
49760f03a0
shutdown: fix a crash when shutting down a worker process
...
Remove the deferred cleanup, as in ngx_pagespeed the fetcher
is owned by the RewriteDriverFactory.
Fixes the backtrace pointing to
net_instaweb::RewriteDriverFactory::Deleter
at https://github.com/pagespeed/ngx_pagespeed/issues/367
2013-07-18 23:20:03 +02:00
2f5afcddd1
Merge pull request #440 from pagespeed/anupama-updates-to-trunk-tracking
...
Updating trunk-tracking to be in sync with r3298.
2013-07-15 11:05:43 -07:00
67beee1444
Updating trunk-tracking to be in sync with r3298.
...
Fixes to allow ngx_pagespeed trunk-tracking branch to compile and work with r3298 mod_pagespeed revision:
- Config fix to include path for critical_keys.pb.h.
- Make changes needed due to RewriteOptions refactoring done in https://code.google.com/p/modpagespeed/source/detail?r=3226
2013-07-15 13:20:14 -04:00
cd80e92df1
Merge pull request #435 from pagespeed/oschaaf-refactor-static-handler
...
static-handler: refactor to use write_handler_response
2013-07-12 13:33:30 -07:00
e303c92041
Merge pull request #437 from pagespeed/oschaaf-downstream-cache-fix-test
...
downstream-cache-test: don't hard code the port to 8051
2013-07-12 09:26:47 -07:00
ccd36dd658
downstream-cache-test: don't hard code the port to 8051
2013-07-12 18:21:55 +02:00
3a9953e25c
static-handler: refactor to use write_handler_response
...
This fixes sending out the weak ETag for ngx_pagespeed_static/js_defer.hash.js,
and simplifies things somewhat for this code path.
It also adds a test for it.
Fixes https://github.com/pagespeed/ngx_pagespeed/issues/434
2013-07-12 18:12:13 +02:00
311ea897cf
Merge pull request #436 from pagespeed/jefftk-simplify-option-setting
...
options: refactor repeated code in option setting
2013-07-12 07:55:07 -07:00
4cc3e4def3
options: refactor repeated code in option setting
2013-07-12 10:44:34 -04:00
301a5249a8
Merge branch 'master' into trunk-tracking
2013-07-10 12:44:50 -04:00
4bff89e8af
Merge pull request #431 from pagespeed/oschaaf-fix-keepalive-test
...
keepalive-test: prevent false positives, filter a little more
2013-07-09 23:40:42 -07:00
fa29f9ff32
merge: rate controlled fetcher
2013-07-09 10:07:13 -04:00
aeba9eb285
Merge pull request #428 from pagespeed/jefftk-head-get
...
request: allow alternate request methods when rewriting html
2013-07-09 07:01:46 -07:00
5d2e2d7b67
keepalive-test: prevent false positives, filter a little more
...
From the comments at https://github.com/pagespeed/ngx_pagespeed/pull/425 ,
on Chai's machine curl's output seems slightly different when it
reports it is trying to connect.
2013-07-09 15:36:57 +02:00
e61c4f722f
test: expect fewer arguments in beacon
2013-07-08 16:51:01 -04:00
505d3be9b9
Merge pull request #427 from pagespeed/oschaaf-rate-limiting
...
fetch-rate-limiting: add rate limiting for background fetches
2013-07-08 08:16:55 -07:00
bec52734f9
request: allow alternate request methods when rewriting html
2013-07-08 11:10:25 -04:00
73f7531ed5
fetch-rate-limiting: add rate limiting for background fetches
...
Limits the number of simultaneous background fetches performed.
Requires statistics to be turned on.
Fixes https://github.com/pagespeed/ngx_pagespeed/issues/426
2013-07-08 16:38:02 +02:00
96fbca62e0
Merge pull request #423 from pagespeed/oschaaf-double-forward-declaration
...
double-forward-declaration: remove a duplicate forward declaration
2013-07-07 08:05:12 -07:00
36aed99813
double-forward-declaration: remove a duplicate forward declaration
2013-07-06 23:03:04 +02:00
e1cd69e672
release: 1.6.29.2 -> 1.6.29.3
2013-07-04 09:48:52 -04:00
41f75282d8
release: 1.5.27.3 -> 1.6.29.2 in documentation
2013-07-02 11:20:48 -04:00
aa6ef1d6f2
Merge pull request #420 from pagespeed/jefftk-trunk-tracking-nocache
...
headers: pass through no-store; don't duplicate cache-control
2013-07-02 08:16:33 -07:00
Otto van der Schaaf