bb1093e8b2
Merge pull request #469 from pagespeed/jefftk-update-trunk-tracking
...
trunk-tracking: take advantage of new functionality in system/
2013-08-05 14:24:25 -07:00
51eaeddfba
trunk-tracking: update apache_system_test for minor changes in r3369 and r3374
2013-08-05 17:23:23 -04:00
122c234570
trunk-tracking: adjust for big changes from r3366
...
SystemRewriteDriverFactory was expanded by r3366 to do a lot of what
NgxRewriteDriverFactory used to have to do. Take advantage of this and
simplifiy our code.
2013-08-05 11:22:58 -04:00
ddf844b680
Merge pull request #473 from pagespeed/oschaaf-response-header-options
...
response-header-options: consider the response headers for options
2013-08-05 08:06:34 -07:00
a245f40bcf
Merge pull request #472 from pagespeed/oschaaf-native-fetcher-timeouts
...
native-fetcher: timeouts
2013-08-05 07:57:44 -07:00
cafb06c011
native-fetcher: timeouts
...
After more testing, it turns out that the timer that is initially set
in Init() remains active throughout the whole lifetime of the fetch.
This reverts the previous change, which isn't correct, and replaces
all TODO's concerning timers with a comment about that we don't need
them.
Fixes https://github.com/pagespeed/ngx_pagespeed/issues/466
2013-08-05 16:57:02 +02:00
cbfbb5b6d6
response-header-options: consider the response headers for options
...
Take the response headers into account when determining the options
for the request. Also adds tests for this.
Fixes https://github.com/pagespeed/ngx_pagespeed/issues/356
2013-08-05 16:42:49 +02:00
606a75a068
Merge pull request #474 from pagespeed/oschaaf-max-buffer-size
...
max-buffer-size: use ngx_pagesize
2013-08-05 04:44:38 -07:00
0c26aafc2f
Merge pull request #471 from pagespeed/oschaaf-pointer-declaration-style
...
pointer-declaration-style: fix style issues
2013-08-05 04:32:47 -07:00
8bd4ed2ec2
max-buffer-size: use ngx_pagesize
...
Other modules seem to use ngx_pagesize as the default buffer size:
http://lxr.evanmiller.org/http/source/http/modules/ngx_http_gunzip_filter_module.c#L661
2013-08-05 10:33:47 +02:00
9c5fb3107e
pointer-declaration-style: fix style issues
2013-08-04 15:25:26 +02:00
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
Jeff Kaufman