Build: #4894 was successful
Job: Build and Test Job was successful
Code commits
phpBB Ascraeus
-
Joas Schilling 9cd0295dd87fd8920b473a290830b58ec3a9877e
Merge branch 'prep-release-3.1.4' into 3.1.x
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql -
Joas Schilling 1ad09d9c8b40310698648e1064f186c2670ad880
[prep-release-3.1.4] Increase version number to 3.1.4-RC2
- build/build.xml (version 1ad09d9c8b40310698648e1064f186c2670ad880)
- phpBB/includes/constants.php (version 1ad09d9c8b40310698648e1064f186c2670ad880)
- phpBB/install/schemas/schema_data.sql (version 1ad09d9c8b40310698648e1064f186c2670ad880)
- phpBB/phpbb/db/migration/data/v31x/v314rc2.php (version 1ad09d9c8b40310698648e1064f186c2670ad880)
-
Andreas Fischer <bantu@phpbb.com> 95add752b74bf8c24f88e81799aa0f43341ea90b
Merge branch '3.0.x' into 3.1.x
* 3.0.x: -
Andreas Fischer <bantu@phpbb.com> aa0c55ed8f0917c876cabdb03cda7a841d28a3a3
Merge branch 'prep-release-3.1.4' into 3.1.x
* prep-release-3.1.4:
[ticket/security-180] Use language variable for redirect error in 3.1+
[ticket/security-180] Merge if statement with previous one in 3.1.x
[ticket/security-180] Add tests for redirecting to main URL
[ticket/security-180] Always fail when redirecting to an insecure URL
[ticket/security-180] Make sure that redirect goes to full URL plus slash
[ticket/security-180] Check if redirect URL contains board URL -
Andreas Fischer <bantu@phpbb.com> c1702b8e19a69c98ef049abb4e14157e3e208ed4
Merge remote-tracking branch 'phpbb-security/ticket/security-180-asc' into prep-release-3.1.4
* phpbb-security/ticket/security-180-asc:
[ticket/security-180] Use language variable for redirect error in 3.1+
[ticket/security-180] Merge if statement with previous one in 3.1.x
[ticket/security-180] Add tests for redirecting to main URL
[ticket/security-180] Always fail when redirecting to an insecure URL
[ticket/security-180] Make sure that redirect goes to full URL plus slash
[ticket/security-180] Check if redirect URL contains board URL -
Marc d7c96cc60ca5836356a0c4f0bb9a9976a4a232ab
[ticket/security-180] Use language variable for redirect error in 3.1+
SECURITY-180- phpBB/includes/functions.php (version d7c96cc60ca5836356a0c4f0bb9a9976a4a232ab)
-
Marc 416728fc172b03e06b376ca7efb085af27985dbb
Merge branch 'ticket/security-180' into ticket/security-180-asc
Conflicts:
tests/security/redirect_test.php -
Marc ec207d0a71ba2c15e7cdcb2b59acd93aaa011223
[ticket/security-180] Merge if statement with previous one in 3.1.x
SECURITY-180- phpBB/includes/functions.php (version ec207d0a71ba2c15e7cdcb2b59acd93aaa011223)
-
Marc 89723b17d9c0a2984bcd52e41d8aabbbe03528d9
Merge branch 'ticket/security-180' into ticket/security-180-asc
Conflicts:
tests/security/redirect_test.php -
Andreas Fischer <bantu@phpbb.com> 2fb7ef26686f37a7f51367b47e9c8b0b7485d824
Merge branch 'prep-release-3.0.14' into 3.0.x
* prep-release-3.0.14:
[ticket/security-180] Add tests for redirecting to main URL
[ticket/security-180] Always fail when redirecting to an insecure URL
[ticket/security-180] Make sure that redirect goes to full URL plus slash
[ticket/security-180] Check if redirect URL contains board URL -
Andreas Fischer <bantu@phpbb.com> 1a3350619f428d9d69d196c52128727e27ef2f04
Merge remote-tracking branch 'phpbb-security/ticket/security-180' into prep-release-3.0.14
* phpbb-security/ticket/security-180:
[ticket/security-180] Add tests for redirecting to main URL
[ticket/security-180] Always fail when redirecting to an insecure URL
[ticket/security-180] Make sure that redirect goes to full URL plus slash
[ticket/security-180] Check if redirect URL contains board URL -
Andreas Fischer <bantu@phpbb.com> 98c9734db4ab8a56faa5297c4994657da2d1599e
Merge branch '3.0.x' into 3.1.x
* 3.0.x:
[3.0.x] Increment version number to 3.0.15-dev.
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql -
Andreas Fischer <bantu@phpbb.com> 62abead26d52d02cf7de1e9e639e0c1ace40ba91
Merge branch 'prep-release-3.1.4' into 3.1.x
* prep-release-3.1.4:
[3.0.x] Add changelog for 3.0.14 release.
[3.0.x] Bump version numbers for 3.0.14-RC1 release.
[3.0.x] Bumping version numbers to final for 3.0.14 releases. -
Andreas Fischer <bantu@phpbb.com> 969718fc91cc2343332d0b89d9e842a8a1c2c1d3
Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
* prep-release-3.0.14:
[3.0.x] Add changelog for 3.0.14 release.
[3.0.x] Bump version numbers for 3.0.14-RC1 release.
[3.0.x] Bumping version numbers to final for 3.0.14 releases.
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/docs/INSTALL.html
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg -
Andreas Fischer <bantu@phpbb.com> 6d8df7332cac920b5e8dd7dedf971789d30bc3cb
[3.0.x] Increment version number to 3.0.15-dev.
- build/build.xml (version 6d8df7332cac920b5e8dd7dedf971789d30bc3cb)
- phpBB/includes/constants.php (version 6d8df7332cac920b5e8dd7dedf971789d30bc3cb)
- phpBB/install/database_update.php (version 6d8df7332cac920b5e8dd7dedf971789d30bc3cb)
- phpBB/install/schemas/schema_data.sql (version 6d8df7332cac920b5e8dd7dedf971789d30bc3cb)
-
Andreas Fischer <bantu@phpbb.com> d833f290694e7545c0c4168cbf6c565bd52c43ba
[3.0.x] Add changelog for 3.0.14 release.
- phpBB/docs/CHANGELOG.html (version d833f290694e7545c0c4168cbf6c565bd52c43ba)
-
Andreas Fischer <bantu@phpbb.com> ce74a0bd6ce6cd0bcb7cfe1c05bfadac7cc5151c
[3.0.x] Bump version numbers for 3.0.14-RC1 release.
- build/build.xml (version ce74a0bd6ce6cd0bcb7cfe1c05bfadac7cc5151c)
- phpBB/includes/constants.php (version ce74a0bd6ce6cd0bcb7cfe1c05bfadac7cc5151c)
- phpBB/install/database_update.php (version ce74a0bd6ce6cd0bcb7cfe1c05bfadac7cc5151c)
- phpBB/install/schemas/schema_data.sql (version ce74a0bd6ce6cd0bcb7cfe1c05bfadac7cc5151c)
-
Andreas Fischer <bantu@phpbb.com> cd6c0427fbb82ba79a628bb4945531df2289359c
[3.0.x] Bumping version numbers to final for 3.0.14 releases.
- phpBB/docs/INSTALL.html (version cd6c0427fbb82ba79a628bb4945531df2289359c)
- phpBB/install/convertors/convert_phpbb20.php (version cd6c0427fbb82ba79a628bb4945531df2289359c)
- phpBB/styles/prosilver/imageset/imageset.cfg (version cd6c0427fbb82ba79a628bb4945531df2289359c)
- phpBB/styles/prosilver/style.cfg (version cd6c0427fbb82ba79a628bb4945531df2289359c)
- phpBB/styles/prosilver/template/template.cfg (version cd6c0427fbb82ba79a628bb4945531df2289359c)
- phpBB/styles/prosilver/theme/theme.cfg (version cd6c0427fbb82ba79a628bb4945531df2289359c)
- phpBB/styles/subsilver2/imageset/imageset.cfg (version cd6c0427fbb82ba79a628bb4945531df2289359c)
- phpBB/styles/subsilver2/style.cfg (version cd6c0427fbb82ba79a628bb4945531df2289359c)
- phpBB/styles/subsilver2/template/template.cfg (version cd6c0427fbb82ba79a628bb4945531df2289359c)
- phpBB/styles/subsilver2/theme/theme.cfg (version cd6c0427fbb82ba79a628bb4945531df2289359c)
-
Andreas Fischer <bantu@phpbb.com> 0bc352ea7e15c2a9b2cf4b71cf0653d49cd6ac42
Merge pull request #3557 from VSEphpbb/ticket/13778
[ticket/13778] Update wording of the reCaptcha instructions
* VSEphpbb/ticket/13778:
[ticket/13778] Update wording of the reCaptcha instructions -
Andreas Fischer <bantu@phpbb.com> 78c022185577cd9ecdc40eee50480bb94a69f665
Merge pull request #3555 from akoeplinger/ticket/12101
[ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
* akoeplinger/ticket/12101:
[ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver -
Matt Friedman <maf675@gmail.com> 281661c23e2c7627dbd7fe45bb0d68b3afe2eaaa
[ticket/13778] Update wording of the reCaptcha instructions
PHPBB3-13778- phpBB/language/en/captcha_recaptcha.php (version 281661c23e2c7627dbd7fe45bb0d68b3afe2eaaa)
-
Alexander Köplinger <alex.koeplinger@outlook.com> e25e411e2b7281e2be8a4e7c7da46a281eb32e47
[ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
The code was added as a workaround for bugs in very old versions of IIS,
dating back to 2002: see commit 849d76697444f4e3523845f8c96569ccde57d868.
Newer IIS versions handle the 'Location' header just fine, so we can avoid
the unnecessary HTML page for redirects. Given that it seems to work fine
since IIS 6.0 (on WinServer 2003), I don't think it's worth adding a special
check for earlier versions as they are no longer supported by MS as well.
PHPBB3-12101- phpBB/includes/functions.php (version e25e411e2b7281e2be8a4e7c7da46a281eb32e47)
-
Marc 59a178f3cba87f536826df251120f03980a556c6
Merge pull request #3532 from prototech/ticket/13755
[ticket/13755] Ignore dots in path when determining file extension. -
Andreas Fischer <bantu@phpbb.com> 887f83589ff34dc087b75f3f2dfa9f1da73c8dea
Merge branch 'prep-release-3.1.4' into 3.1.x
* prep-release-3.1.4: -
Andreas Fischer <bantu@phpbb.com> eae592691c200490cb8152722dddb7bd12da5207
Merge pull request #3550 from bantu/ticket/13765-3.1.4
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
* bantu/ticket/13765-3.1.4:
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. -
Andreas Fischer <bantu@phpbb.com> 196eb98ba8abe66cefa87de86ec506a6024280d7
Merge branch '3.0.x' into 3.1.x
* 3.0.x: -
Andreas Fischer <bantu@phpbb.com> 0fc70d4b1530254ab81dfff3f0e4078eb751de0f
Merge pull request #3550 from bantu/ticket/13765-3.1.4
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
* bantu/ticket/13765-3.1.4:
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. -
Andreas Fischer <bantu@phpbb.com> 4d6303202497e1af18b9db7c62960e557e5cdd3d
Merge pull request #3549 from bantu/ticket/13765
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
* bantu/ticket/13765:
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. -
Andreas Fischer <bantu@phpbb.com> 901875a1fb43610365817b61486409645787d39c
Merge branch 'ticket/13765' into ticket/13765-3.1.4
* ticket/13765:
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
Conflicts:
phpBB/includes/functions.php
phpBB/includes/startup.php -
Joas Schilling 463c62df1847a3791fb7ec23b72c2f72bed12938
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
PHPBB3-13765- phpBB/includes/functions.php (version 463c62df1847a3791fb7ec23b72c2f72bed12938)
- phpBB/includes/startup.php (version 463c62df1847a3791fb7ec23b72c2f72bed12938)
-
Marc 18fc621d73757ef793fba08f7da4e048b293a059
[ticket/security-180] Add tests for redirecting to main URL
SECURITY-180- tests/security/redirect_test.php (version 18fc621d73757ef793fba08f7da4e048b293a059)
-
Andreas Fischer <bantu@phpbb.com> 552f35952aaf992157e62148ae571bf2ab899c4a
Merge pull request #3546 from brunoais/ticket/13772
[ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
* brunoais/ticket/13772:
[ticket/13772] Fix typo in phpbb\passwords\manager::__construct() -
brunoais 8769f185f5be6e8d4b517be67c4e0facfda06f68
[ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
PHPBB3-13772- phpBB/phpbb/passwords/manager.php (version 8769f185f5be6e8d4b517be67c4e0facfda06f68)
-
Andreas Fischer <bantu@phpbb.com> c46024bfa20a4dbd39538bb4a55fe5f579bc40cf
Merge pull request #3537 from RMcGirr83/ticket/13763
[ticket/13763] Fix typo in extension lang file
* RMcGirr83/ticket/13763:
[ticket/13763] Fix typo in extension lang file -
Rich McGirr 60f31d48e2dd3f2b698987cb55c9d27fc6a80424
[ticket/13763] Fix typo in extension lang file
PHPBB3-13763- phpBB/language/en/acp/extensions.php (version 60f31d48e2dd3f2b698987cb55c9d27fc6a80424)
-
Dhruv Goel <dhruv.goel92@gmail.com> ba1e3fd66173ccecf29f8dfef761772322182ff0
Merge pull request #3533 from Elsensee/ticket/13756
[ticket/13756] Fix resize after upload with plupload -
Oliver Schramm <oliver.schramm97@gmail.com> 366dfce84602801c2a5da114fe4845d181fed3e8
[ticket/13756] Add test for generate_resize_string()
PHPBB3-13756- tests/plupload/plupload_test.php (version 366dfce84602801c2a5da114fe4845d181fed3e8)
-
Oliver Schramm <oliver.schramm97@gmail.com> 70c74df00981303b8ebcfdd83acd7c308658eeeb
[ticket/13756] Fix resize after upload with plupload
PHPBB3-13756- phpBB/phpbb/plupload/plupload.php (version 70c74df00981303b8ebcfdd83acd7c308658eeeb)
-
Joas Schilling ee658bfe7bd284573d199c3c2a76007c5509695d
[ticket/security-180] Always fail when redirecting to an insecure URL
SECURITY-180- phpBB/includes/functions.php (version ee658bfe7bd284573d199c3c2a76007c5509695d)
- tests/security/redirect_test.php (version ee658bfe7bd284573d199c3c2a76007c5509695d)
-
Marc bca1b96b2e9235bbb4a3e7a104dd79e7f3761679
[ticket/security-180] Make sure that redirect goes to full URL plus slash
SECURITY-180- phpBB/includes/functions.php (version bca1b96b2e9235bbb4a3e7a104dd79e7f3761679)
- tests/security/redirect_test.php (version bca1b96b2e9235bbb4a3e7a104dd79e7f3761679)
-
Cesar G <prototech91@gmail.com> 47514ca2df301631bf9ee2043e347f95f11f57da
[ticket/13755] Ignore dots in path when determining file extension.
PHPBB3-13755- phpBB/includes/functions_upload.php (version 47514ca2df301631bf9ee2043e347f95f11f57da)
- tests/upload/filespec_test.php (version 47514ca2df301631bf9ee2043e347f95f11f57da)
-
Marc eed355b798ec77ed8b67555087fc5866b522c5fc
[ticket/security-180] Check if redirect URL contains board URL
SECURITY-180- phpBB/includes/functions.php (version eed355b798ec77ed8b67555087fc5866b522c5fc)
-
Joas Schilling a151ad912a21e9f7ba4d5ef3bbee32b725cd1c5d
[3.1.x] Update development version to 3.1.5-dev
- build/build.xml (version a151ad912a21e9f7ba4d5ef3bbee32b725cd1c5d)
- phpBB/includes/constants.php (version a151ad912a21e9f7ba4d5ef3bbee32b725cd1c5d)
- phpBB/install/schemas/schema_data.sql (version a151ad912a21e9f7ba4d5ef3bbee32b725cd1c5d)
-
Joas Schilling fcc7e7d33306347128158ff843db08bd25039cb4
Merge branch 'prep-release-3.1.4' into 3.1.x
-
Joas Schilling 073f3e4470016af718f90070276305615abc007f
[prep-release-3.1.4] Add changelog for 3.1.4-RC1
- phpBB/docs/CHANGELOG.html (version 073f3e4470016af718f90070276305615abc007f)
-
Joas Schilling bc04581b8010affb4192f5b160e1e5e2ff21d325
[prep-release-3.1.4] Add migration for 3.1.4-RC1
- phpBB/phpbb/db/migration/data/v31x/v314rc1.php (version bc04581b8010affb4192f5b160e1e5e2ff21d325)
-
Joas Schilling 313a224c688fa1e2575b22092384458ae23d5147
Update version to 3.1.4-RC1
- build/build.xml (version 313a224c688fa1e2575b22092384458ae23d5147)
- phpBB/includes/constants.php (version 313a224c688fa1e2575b22092384458ae23d5147)
- phpBB/install/convertors/convert_phpbb20.php (version 313a224c688fa1e2575b22092384458ae23d5147)
- phpBB/install/schemas/schema_data.sql (version 313a224c688fa1e2575b22092384458ae23d5147)
- phpBB/styles/prosilver/style.cfg (version 313a224c688fa1e2575b22092384458ae23d5147)
- phpBB/styles/subsilver2/style.cfg (version 313a224c688fa1e2575b22092384458ae23d5147)
