aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9520] Additionally filter requests for {common,config}.phpChris Smith2010-05-031-0/+2
| | | | PHPBB3-9520
* [ticket/9520] New web.config file as suggested by Microsoft using request filterChris Smith2010-05-031-12/+20
| | | | PHPBB3-9520
* [ticket/9520] Removed per directory web.config files.Chris Smith2010-05-034-52/+0
| | | | | | | These use the IIS rewriter to reject requests, Microsoft have suggested we just use a single web.config with the builtin request filter. PHPBB3-9520
* [ticket/9520] Add suggested web.config for root files as suggested by Microsoft.Chris Smith2010-05-031-0/+17
| | | | PHPBB3-9520
* [ticket/9520] Add some default web.config files for IIS.Chris Smith2010-05-034-0/+52
| | | | | | These deny access to the various directories written to by phpBB. PHPBB3-9520
* Merge branch 'feature/dbal-tests' into develop-olympusNils Adermann2010-04-021-3/+5
|\ | | | | | | | | | | * feature/dbal-tests: [feature/dbal-tests] Remove hardcoded 'mysql' from PDO DSN in DBAL test. [feature/dbal-tests] Fix mysql (not mysqli) dbal test.
| * [feature/dbal-tests] Remove hardcoded 'mysql' from PDO DSN in DBAL test.Andreas Fischer2010-04-021-1/+1
| |
| * [feature/dbal-tests] Fix mysql (not mysqli) dbal test.Andreas Fischer2010-04-021-2/+4
| | | | | | | | Correctly determine MySQL version from the database.
* | Merge branch 'bug/bantu/9108' into develop-olympusNils Adermann2010-04-012-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | * bug/bantu/9108: [bug/9108] Fix table binding issues with PostgreSQL in board-wide feed. (Old Bug #58425) Conflicts: phpBB/docs/CHANGELOG.html
| * | [bug/9108] Fix table binding issues with PostgreSQL in board-wide feed. (Old ↵Andreas Fischer2010-04-012-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #58425) The order in the FROM clause is important. The posts table has to be the last one in the chain, so it can be correctly bound with the forums table in the LEFT JOIN. This only affects the overall feed (board-wide feed). All the other feeds are unaffected.
* | | Merge branch 'feature/dbal-tests' into develop-olympusNils Adermann2010-04-018-20/+665
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/dbal-tests: [feature/dbal-tests] Only output the missing config error message once. [feature/dbal-tests] Make the PDO prefix depend on the dbms. [feature/dbal-tests] Fix whitespace and line endings. [feature/dbal-tests] Make some tests for build_array_data on SELECT [feature/dbal-tests] Make some tests for return_on_error on SELECT-queries [feature/dbal-tests] Tests for $db->sql_query_limit() [feature/dbal-tests] Load phpbb-schema after creating the connection to the database [feature/dbal-tests] Added tests for dbal fetchrow and fetchfield. [feature/dbal-tests] Added database test & refactored test framework
| * | [feature/dbal-tests] Only output the missing config error message once.Nils Adermann2010-04-011-6/+18
| | | | | | | | | | | | | | | The error message was also not properly escaping the variables, thus producing an incorrect example configuration file.
| * | [feature/dbal-tests] Make the PDO prefix depend on the dbms.Nils Adermann2010-04-011-3/+13
| | | | | | | | | | | | | | | | | | The database base test will need a few more changes to run on all the databases we support. But those really need to be made on a system where they run and can be tested. Patches welcome!
| * | [feature/dbal-tests] Fix whitespace and line endings.Nils Adermann2010-04-012-21/+21
| | |
| * | [feature/dbal-tests] Make some tests for build_array_data on SELECTJoas Schilling2010-03-272-4/+114
| | |
| * | [feature/dbal-tests] Make some tests for return_on_error on SELECT-queriesJoas Schilling2010-03-261-8/+208
| | |
| * | [feature/dbal-tests] Tests for $db->sql_query_limit()Joas Schilling2010-03-262-1/+47
| | |
| * | [feature/dbal-tests] Load phpbb-schema after creating the connection to the ↵Joas Schilling2010-03-262-3/+53
| | | | | | | | | | | | database
| * | [feature/dbal-tests] Added tests for dbal fetchrow and fetchfield.Joas Schilling2010-03-264-0/+100
| | |
| * | [feature/dbal-tests] Added database test & refactored test frameworkJoas Schilling2010-03-264-20/+137
| | | | | | | | | | | | | | | | | | There is now a phpbb_database_test_case which can be used as a base class for tests that require database access. You have to set up a test_config.php file in your tests/ directory containing host, user, pass etc. Extra test functionality has been moved to phpbb_test_case_helpers to provide the same functionality in database tests and regular tests without duplicating the code. This is achieved through delegation of method calls.
* | | Merge branch 'bug/nickvergessen/59135' into develop-olympusNils Adermann2010-04-013-4/+5
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | * bug/nickvergessen/59135: [bug/59135] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135) Conflicts: phpBB/docs/CHANGELOG.html
| * | [bug/59135] Fix open_basedir issues when accessing styles- and ↵Joas Schilling2010-03-133-4/+5
| | | | | | | | | | | | | | | | | | language-management. (Bug #59135) introduced in r10496 and r10360/r10361
* | | Merge branch 'bug/kellanved/59425' into develop-olympusNils Adermann2010-03-282-1/+2
|\ \ \ | | | | | | | | | | | | | | | | * bug/kellanved/59425: [bug/59425] Correctly check for double inclusion in captcha garbage collection
| * | | [bug/59425] Correctly check for double inclusion in captcha garbage collectionU-H-PC\H2010-03-282-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The check to avoid the double inclusion of the captcha factory class in the garbage collection code was faulty, checking for "captcha_factory" instead of "phpbb_captcha_factory". TerryE pointed the problem out, thanks!
* | | | Merge branch 'bug/kellanved/58465' into develop-olympusNils Adermann2010-03-282-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * bug/kellanved/58465: [bug/58465] The redirect hidden field is now XHTML conform
| * | | [bug/58465] The redirect hidden field is now XHTML conformU-H-PC\H2010-03-282-1/+2
|/ / / | | | | | | | | | The result of build_url was falsely un-entitized.
* | | Merge remote branch 'github-nickvergessen/develop-olympus' into develop-olympusNils Adermann2010-03-261-1/+1
|\ \ \ | | |/ | |/| | | | | | | * github-nickvergessen/develop-olympus: [develop-olympus] Make this test run on windows with backslash-paths.
| * | [develop-olympus] Make this test run on windows with backslash-paths.Joas Schilling2010-03-261-1/+1
| | |
* | | Merge branch 'bug/jellydoughnut/56965' into develop-olympusNils Adermann2010-03-261-42/+48
|\ \ \ | |/ / |/| | | | | | | | * bug/jellydoughnut/56965: [bug/56965] Redirect fails with directory traversal
| * | [bug/56965] Redirect fails with directory traversalJosh Woody2010-03-221-42/+48
| | | | | | | | | | | | Correct invalid r10536 with a boolean flag. Note that this fix for the bug will not actually correct the redirects, it will only prevent phpBB from redirecting outside $phpbb_root_path when redirect()'s third argument is not provided.
* | | Merge branch 'bug/cs278/58685' into develop-olympusNils Adermann2010-03-181-2/+2
|\ \ \ | | | | | | | | | | | | | | | | * bug/cs278/58685: [bug/58685] Correct spelling errors in append_sid() comments.
| * | | [bug/58685] Correct spelling errors in append_sid() comments.Chris Smith2010-03-181-2/+2
| | | |
* | | | Merge branch 'bug/cs278/58025' into develop-olympusNils Adermann2010-03-182-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/cs278/58025: [bug/58025] Search robots are now redirected if they send a SID in the request Conflicts: phpBB/docs/CHANGELOG.html
| * | | | [bug/58025] Search robots are now redirected if they send a SID in the requestChris Smith2010-03-132-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously search robots could stumble upon a board link somewhere on the web containing a SID they'd follow it and end up indexing that page with the SID in the request URI, this fix prevents that by redirecting them to the same URI just without the SID.
* | | | | Merge branch 'feature/arstechnica/memcache-multi-server' into develop-olympusNils Adermann2010-03-181-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * feature/arstechnica/memcache-multi-server: [feature/arstechnica/memcache-multi-server] Add memcache-multi-server to the changelog.
| * | | | | [feature/arstechnica/memcache-multi-server] Add memcache-multi-server to the ↵Nils Adermann2010-03-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | changelog.
* | | | | | Merge branch 'feature/arstechnica/memcache-multi-server' into develop-olympusNils Adermann2010-03-181-2/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * feature/arstechnica/memcache-multi-server: [feature/memcache-multi-server] Changing format for multiple memcache hosts. Fixing code style issues in changes. [feature/memcache-multi-server] Adding support for multiple memcache servers to acm_memcache.php
| * | | | | [feature/memcache-multi-server] Changing format for multiple memcache hosts. ↵mrkurt2010-03-181-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing code style issues in changes. Host and ports are now represented like this in config: host1/port1,host2/port2,host3/port3
| * | | | | [feature/memcache-multi-server] Adding support for multiple memcache servers ↵mrkurt2010-03-181-2/+10
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to acm_memcache.php You can define multiple memcache servers in your config using this format: host::port,host::port,host::port Example: @define(PHPBB_ACM_MEMCACHE, '127.0.0.1::11211,10.0.0.2::11211,memcache1::11211'
* | | | | Merge branch 'bug/jellydoughnut/58415' into develop-olympusNils Adermann2010-03-172-2/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/jellydoughnut/58415: Allow setting parent forums regardless of permission settings. (Bug #58415) Conflicts: phpBB/docs/CHANGELOG.html
| * | | | Allow setting parent forums regardless of permission settings. (Bug #58415)Josh Woody2010-03-172-2/+3
| | | | |
* | | | | [develop-olympus] Backported 3.1 unit tests to 3.0.Nils Adermann2010-03-1029-0/+1766
| |_|_|/ |/| | | | | | | | | | | | | | | Start adding unit tests for bugs you fix! Tests for anything are welcome really. We have to work on these a lot.
* | | | Merge branch 'develop-olympus' of git://github.com/evil3/phpbb3 into ↵Nils Adermann2010-03-081-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | develop-olympus
| * | | | Add feature/ support to branchname hookIgor Wiedler2010-03-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | The previously introduced branchname hook now will also use feature/ branch names, in addition to the existing bug/.
* | | | | Merge branch 'develop-olympus' of git://github.com/evil3/phpbb3 into ↵Nils Adermann2010-03-081-0/+24
|\ \ \ \ \ | |/ / / / | | | | | | | | | | develop-olympus
| * | | | Adding a branchname prepare-commit-msg hookIgor Wiedler2010-03-081-0/+24
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git supports several hooks, some of which are client-side. The prepare-commit-msg hook is run right after a `git commit` call, before the editor is opened. This allows the initial message to be altered. This hook will check if the current branch name begins with `bug/`, in which case it will prepend `[$branchname]` to the commit message. This makes it easier to create proper commit messages. http://wiki.phpbb.com/Git#Commit_Messages For more information refer to the hook source.
* | | | Merge branch 'bug/dpward/58755' into develop-olympusNils Adermann2010-03-072-1/+2
|\ \ \ \
| * | | | Adding the bugfix for #58755 to the changelog.Nils Adermann2010-03-071-0/+1
| | | | |
| * | | | [bug/58755] Fix a redirection bug that can occur after loginDavid Ward2010-03-071-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue affects any forum (i.e. https://myforum/phpBB3/) where: - the forum is located in a directory underneath the web root (i.e., NOT https://myforum/) - a user accesses the forum with a URI pointing to a directory rather than a script (i.e., NOT https://myforum/phpBB3/index.php) - the URI used ends in a slash (i.e., NOT https://myforum/phpBB3) If these conditions are met, after successful login the user is redirected to an invalid URI (i.e., https://myforum/phpBB3/phpBB3?sid=). This change fixes extract_current_page() to handle the case correctly where the URI ends in a slash and is not the web root. So after successful login, the redirection back to the main page will work (i.e., https://myforum/phpBB3/?sid=)
* | | | Merge branch 'bug/evil3/12531' into develop-olympusNils Adermann2010-03-072-2/+3
|\ \ \ \ | |/ / / |/| | |