1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00

10828 Commits

Author SHA1 Message Date
Oleg Pudeyev
9716cceb1b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10007] Add directive 'internal' to blocked folders in nginx config.
2011-01-26 05:45:45 -05:00
Oleg Pudeyev
afc856417f Merge branch 'ticket/bantu/10007' into develop-olympus
* ticket/bantu/10007:
  [ticket/10007] Add directive 'internal' to blocked folders in nginx config.
2011-01-26 05:45:16 -05:00
Andreas Fischer
a970219d61 [ticket/10007] Add directive 'internal' to blocked folders in nginx config.
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/CHANGES
http://wiki.nginx.org/HttpCoreModule#internal

PHPBB3-10007
2011-01-24 17:35:10 +01:00
Nils Adermann
10169d1c3e Merge branch 'develop-olympus' into develop
* 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
2011-01-23 18:44:03 +01:00
Nils Adermann
e1e84f9bd0 Merge branch 'task/naderman/session-tests' into develop-olympus
* 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.
2011-01-23 18:39:47 +01:00
Nils Adermann
1196b96462 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8779] Slow search for 'View unread posts'
2011-01-23 18:35:10 +01:00
Nils Adermann
4229490725 Merge branch 'ticket/rxu/8779' into develop-olympus
* ticket/rxu/8779:
  [ticket/8779] Slow search for 'View unread posts'
2011-01-23 18:34:50 +01:00
rxu
ab9d4b3b63 [ticket/8779] Slow search for 'View unread posts'
Adjust SQL query to speedup search for unread posts (thanks naderman).

PHPBB3-8779
2011-01-24 00:01:18 +07:00
Nils Adermann
cd694e9b9d [task/session-tests] Renamed assertSqlResultEquals and fixed its param order
PHPBB3-9732
2011-01-21 21:32:31 +01:00
Nils Adermann
8538561b31 [task/session-tests] Test additional combinations of session_begin.
PHPBB3-9732
2011-01-20 22:49:38 +01:00
Nils Adermann
74f537e89d [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
2011-01-20 22:47:48 +01:00
Igor Wiedler
40cf8b1c0a Merge branch 'ticket/bantu/9790' into develop
* 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().
2011-01-18 21:09:13 +01:00
Andreas Fischer
f6a14cbcef [ticket/9790] Support for lighttpd's X-Sendfile header for attachments.
PHPBB3-9790
2011-01-18 21:04:49 +01:00
Andreas Fischer
6bbdc129c0 [ticket/9790] Support for nginx's X-Accel-Redirect header for attachments.
PHPBB3-9790
2011-01-17 22:37:53 +01:00
Andreas Fischer
19931713db [ticket/9790] Always call file_gc(false) before sending the file.
This also unloads the cache before the file is send.

PHPBB3-9790
2011-01-17 22:34:39 +01:00
Andreas Fischer
0f88b847fc [ticket/9790] Add $exit parameter to file_gc().
PHPBB3-9790
2011-01-17 00:01:35 +01:00
Nils Adermann
cde423591e Merge branch 'develop-olympus' into develop
* 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.
2011-01-16 22:26:27 +01:00
Nils Adermann
ba5c7d8e63 Merge branch 'ticket/bantu/9859' into develop-olympus
* 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.
2011-01-16 22:25:49 +01:00
Igor Wiedler
656f18d3af Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9933] Remove empty word check.
  [ticket/9933] Add $use_unicode parameter to get_censor_preg_expression().
  [ticket/9933] Adjust word censor regex for non-unicode mode.

Conflicts:
	phpBB/includes/functions.php

Also remove static $unicode_support.
2011-01-16 20:37:39 +01:00
Igor Wiedler
e9c584af6a Merge branch 'ticket/bantu/9933' into develop-olympus
* ticket/bantu/9933:
  [ticket/9933] Remove empty word check.
  [ticket/9933] Add $use_unicode parameter to get_censor_preg_expression().
  [ticket/9933] Adjust word censor regex for non-unicode mode.
2011-01-16 20:25:06 +01:00
rxu
2b37a4fe56 [ticket/9933] Remove empty word check.
PHPBB3-9933
2011-01-16 20:14:35 +01:00
Andreas Fischer
97be6e7946 [ticket/9933] Add $use_unicode parameter to get_censor_preg_expression().
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
2011-01-16 20:13:05 +01:00
rxu
8c1866bc0c [ticket/9933] Adjust word censor regex for non-unicode mode.
PHPBB3-9933
2011-01-16 19:55:10 +01:00
Andreas Fischer
60eff4e59a [ticket/9859] Remove the years from the copyright statements in docs files.
PHPBB3-9859
2011-01-16 18:50:53 +01:00
Andreas Fischer
180e97abdc [ticket/9859] Remove the year from the copyright meta tag in docs/*.html
PHPBB3-9859
2011-01-16 18:50:11 +01:00
Andreas Fischer
732fd5980e [ticket/9859] Remove the meta copyright tag as well.
PHPBB3-9859
2011-01-16 17:53:30 +01:00
Andreas Fischer
c617400f95 [ticket/9859] Remove the credit line comment from all html files.
PHPBB3-9859
2011-01-16 17:53:30 +01:00
Andreas Fischer
2a703b4055 [ticket/9859] Remove years in credit line from some more files.
Standard HTML output now includes:
Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group

Print output now includes:
Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/

This also fixes an inconsistency where "phpBB Group" was linked instead of
"phpBB".

PHPBB3-9859
2011-01-16 17:53:30 +01:00
Andreas Fischer
be3a0b269a [ticket/9805] Script for easily cloning a whole github network.
PHPBB3-9805
2011-01-15 16:53:34 +01:00
Chris Smith
78df30f7b7 Merge branch 'task/igorw/acm-refactor' into develop
* task/igorw/acm-refactor:
  [task/acm-refactor] Remove includes/cache.php from coding guidelines
2011-01-13 13:38:36 +00:00
Igor Wiedler
3bc64deaec [task/acm-refactor] Remove includes/cache.php from coding guidelines
It has been refactored to includes/cache/service.php.

PHPBB3-9983
2011-01-13 12:56:54 +01:00
Nils Adermann
bdac86777e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9990] Add docs for running slow tests
  [ticket/9990] Integrate utf normalizer tests into test suite

Conflicts:
	phpunit.xml.dist
2011-01-12 03:00:45 +01:00
Nils Adermann
1359cf6547 Merge branch 'ticket/igorw/9990' into develop-olympus
* ticket/igorw/9990:
  [ticket/9990] Add docs for running slow tests
  [ticket/9990] Integrate utf normalizer tests into test suite
2011-01-12 02:59:32 +01:00
Igor Wiedler
42cf9a9895 [ticket/9990] Add docs for running slow tests
PHPBB3-9990
2011-01-12 02:22:37 +01:00
Andreas Fischer
a367378940 Merge branch 'task/naderman/config-class' into develop
* task/naderman/config-class:
  [task/config-class] Do not create multiple cache driver instances.
  [task/config-class] Add an attribute for the table name in phpbb_config_db.
  [task/config-class] Correctly merge cached config with dynamically loaded data.
  [task/config-class] Always specify the config table to use.
  [task/config-class] Fix db config constructor param order
  [task/config-class] Implemented a config class to replace the global array.
2011-01-12 01:49:44 +01:00
Nils Adermann
f11579549d [task/config-class] Do not create multiple cache driver instances.
Retrieve the driver from the service instead of creating new ones
over and over from the factory.

PHPBB3-9988
2011-01-12 01:47:51 +01:00
Nils Adermann
8e26f14eb6 [task/config-class] Add an attribute for the table name in phpbb_config_db.
PHPBB3-9988
2011-01-12 01:47:41 +01:00
Nils Adermann
129d3c53bc [task/config-class] Correctly merge cached config with dynamically loaded data.
PHPBB3-9988
2011-01-12 00:21:12 +01:00
Nils Adermann
6b1e343d8d [task/config-class] Always specify the config table to use.
PHPBB3-9988
2011-01-12 00:21:04 +01:00
Igor Wiedler
106f6800d4 [task/config-class] Fix db config constructor param order
PHPBB3-9988
2011-01-11 19:38:10 +01:00
Igor Wiedler
e00c5544d2 [ticket/9990] Integrate utf normalizer tests into test suite
PHPBB3-9990
2011-01-11 01:06:01 +01:00
Andreas Fischer
30dacf8e4e Merge branch 'task/igorw/acm-refactor' into develop
* task/igorw/acm-refactor:
  [task/acm-refactor] Refactor WinCache ACM module
2011-01-11 00:39:34 +01:00
Igor Wiedler
d97181f5a3 [task/acm-refactor] Refactor WinCache ACM module
PHPBB3-9983
2011-01-11 00:31:07 +01:00
Igor Wiedler
eff1d378cc Merge branch 'develop-olympus' into develop 2011-01-10 23:43:04 +01:00
Igor Wiedler
c9b9016ca8 Merge branch 'ticket/bantu/9764' into develop-olympus 2011-01-10 23:42:41 +01:00
Nils Adermann
fb2642bbc6 [task/config-class] Implemented a config class to replace the global array.
There is a phpbb_config class which simply holds an array and does not persist
any data. It implements ArrayAccess, Countable and IteratorAggregate to allow
regular use of configuration as if it was still an array. The phpbb_config_db
class depends on an instance of the dbal and a cache driver. It obtains the
configuration data from cache and database as necessary and persists data to
the database.

The functions set_config and set_config_count remain for backward compatability
but they only call methods on the new config class now instead of directly
manipulating the database and cache.

PHPBB3-9988
2011-01-10 04:05:23 +01:00
Igor Wiedler
5ea59ba322 Merge branch 'ticket/nickvergessen/6109' into develop
* ticket/nickvergessen/6109:
  [ticket/6109] WLM subsilver2 button in the english language package.
  [ticket/6109] MSN is now called Windows Live Messenger (WLM)
2011-01-10 01:52:56 +01:00
Joas Schilling
6f9e3d3b96 [ticket/6109] WLM subsilver2 button in the english language package.
PHPBB3-6109
2011-01-10 01:45:28 +01:00
Joas Schilling
efedc973eb [ticket/6109] MSN is now called Windows Live Messenger (WLM)
Replaced the logo with the current one and changed the language strings.

PHPBB3-6109
2011-01-10 01:44:54 +01:00
Igor Wiedler
b5c8349f4a Merge branch 'develop-olympus' into develop
This merge commit includes ascraeus-specific renames and adjustments.
2011-01-10 00:37:47 +01:00