options: refactor repeated code in option setting
Merge pull request #436 from pagespeed/jefftk-simplify-option-setting

options: refactor repeated code in option setting
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
downstream-cache-test: don't hard code the port to 8051
Merge pull request #437 from pagespeed/oschaaf-downstream-cache-fix-test

downstream-cache-test: don't hard code the port to 8051
Merge pull request #435 from pagespeed/oschaaf-refactor-static-handler

static-handler: refactor to use write_handler_response
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
Merge pull request #439 from pagespeed/oschaaf-shutdown-fix

shutdown: fix segfault when shutting down a worker process
nginx 1.4.2 stable released

Changelog: http://nginx.org/en/CHANGES-1.4
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 ':'
Merge pull request #445 from pagespeed/oschaaf-fix-keepalive-test-gzip

keepalive-test: fix gzip accept encoding
system-tests: fix missing beacon url parameters in tests

Fix 2 tests on the beacon by adding the missing url parameter
Merge pull request #446 from pagespeed/oschaaf-missing-beacon-urls

system-tests: fix missing beacon urls
Merge pull request #443 from patschi/patch-2

readme: recommend nginx 1.4.2 stable
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
Merge pull request #448 from pagespeed/oschaaf-log-vhost-specific

logging: respect error_log in nginx.conf server blocks
force-caching: fix configuration handling

Make pagespeed ForceCaching [on|off] work
Merge pull request #454 from pagespeed/oschaaf-force-caching

force-caching: fix configuration handling
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.
release: 1.6.29.5