Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails

Conflicts:
	ext/sqlite3/tests/sqlite3_15_open_error.phpt

diff --cc ext/sqlite3/tests/sqlite3_15_open_error.phpt
index ea1ee429922d5c8eb95d6c7ac4ab21f93d3a8177,9b0496f889176fb100d6554ded089f020aed78c4..fc05b878026a2cde80dbed3b47dfdb49037a6bcd
--- 1/ext/sqlite3/tests/sqlite3_15_open_error.phpt
--- 2/ext/sqlite3/tests/sqlite3_15_open_error.phpt
+++ b/ext/sqlite3/tests/sqlite3_15_open_error.phpt
@@@ -2,7 -2,10 +2,10 @@@
  SQLite3::open error test
  --SKIPIF--
  <?php
 -require_once(dirname(__FILE__) . '/skipif.inc');
+ if(substr(PHP_OS, 0, 3) == 'WIN' ) {
+       die('skip non windows test');
+ }
 +require_once(__DIR__ . '/skipif.inc');
  if (posix_geteuid() == 0) {
      die('SKIP Cannot run test as root.');
  }