* develop-olympus:
[ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().
[ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
The "deny" and "access" directives are IP-based in general. Both directives
only support IPv6 from nginx 0.8.22 onwards, on older versions of nginx those
directives have no effect on IPv6 requests. Thus they do not block access for
IPv6 requests.
Adding the "internal" directive blocks external access in general (both IPv4
and IPv6) and makes the web server return a status code 404 (Not Found)
response.
See:
http://nginx.org/en/CHANGEShttp://wiki.nginx.org/HttpCoreModule#internal
PHPBB3-10007
* develop-olympus:
[task/session-tests] Renamed assertSqlResultEquals and fixed its param order
[task/session-tests] Test additional combinations of session_begin.
[task/session-tests] Added tests for the session class.
Conflicts:
tests/mock/cache.php
* task/naderman/session-tests:
[task/session-tests] Renamed assertSqlResultEquals and fixed its param order
[task/session-tests] Test additional combinations of session_begin.
[task/session-tests] Added tests for the session class.
Two first simple tests to check functionality of session_begin and
session_create.
Added a mock class for the cache as well as a subclass of session
which has its cookie handling function mocked out to avoid header
sending problems.
PHPBB3-9732
* ticket/bantu/9790:
[ticket/9790] Support for lighttpd's X-Sendfile header for attachments.
[ticket/9790] Support for nginx's X-Accel-Redirect header for attachments.
[ticket/9790] Always call file_gc(false) before sending the file.
[ticket/9790] Add $exit parameter to file_gc().
* develop-olympus:
[ticket/9859] Remove the years from the copyright statements in docs files.
[ticket/9859] Remove the year from the copyright meta tag in docs/*.html
[ticket/9859] Remove the meta copyright tag as well.
[ticket/9859] Remove the credit line comment from all html files.
[ticket/9859] Remove years in credit line from some more files.
* ticket/bantu/9859:
[ticket/9859] Remove the years from the copyright statements in docs files.
[ticket/9859] Remove the year from the copyright meta tag in docs/*.html
[ticket/9859] Remove the meta copyright tag as well.
[ticket/9859] Remove the credit line comment from all html files.
[ticket/9859] Remove years in credit line from some more files.
Rename $unicode to $unicode_support, pass in $use_unicode defaulting to true.
In unit tests we can now pass in $use_unicode as false and also test the code
path that is taken when PCRE does not support unicode.
PHPBB3-9933
* develop-olympus:
[ticket/9990] Add docs for running slow tests
[ticket/9990] Integrate utf normalizer tests into test suite
Conflicts:
phpunit.xml.dist
