Merge branch 'develop-olympus' into develop-ascraeus

Browse Source

* develop-olympus:
  [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.

Conflicts:
	phpBB/includes/startup.php
	tests/security/trailing_path_test.php

...

This commit is contained in:

Andreas Fischer

2015-01-29 00:09:12 +01:00

parent ef10b02f78 6f5524de26

commit 5b96d30540

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available