Commit Graph

42684 Commits

Author SHA1 Message Date
Anatol Belski
4a08836d47 fix borked interbase patch 2016-08-11 15:08:26 +02:00
Anatol Belski
ddfbe07e28 Merge branch 'PHP-7.1'
* PHP-7.1:
  add missing chunk to support mb path in symlink()
  pull ps_title behind the logic to support the current codepage
  fix typo
  add missing mb path support chunk
2016-08-11 14:49:18 +02:00
Anatol Belski
e5d9d009cf add missing chunk to support mb path in symlink() 2016-08-11 13:38:28 +02:00
Anatol Belski
525eb35667 fix typo 2016-08-11 13:38:28 +02:00
Anatol Belski
6359c7a2bf add missing mb path support chunk 2016-08-11 13:38:28 +02:00
Nikita Popov
0fdf28bbf4 Merge branch 'PHP-7.1' 2016-08-11 12:20:02 +02:00
Aaron Piotrowski
622d2f41d1 ReflectionType improvements
Added ReflectionNamedType and updated ReflectionType::__toString()
2016-08-11 12:19:33 +02:00
Nikita Popov
df9378d3e1 Merge branch 'PHP-7.1' 2016-08-11 12:01:55 +02:00
Ville Hukkamäki
283b0cc8a5 Fix #72810. Add check for SKIP_ONLINE_TESTS 2016-08-11 12:01:24 +02:00
Kalle Sommer Nielsen
197051f3ab Remove sql.safe_mode
This is one of the last old and odd deprecated settings we still have in PHP, it was never fully implemented in all the database extensions and should probably have been gone back in 5.4, along with safe_mode. Although if my memory strikes me right, mysql was also supporting it back then, but not mysqli.

So far only interbase was supporting this feature, and the removal of it causes two effects for interbase:
 - CREATE DATABASE is now allowed no matter
 - The default database set by php.ini (ibase.default_db) is no longer forced

http://php.net/ini.core#ini.sql.safe-mode
2016-08-11 05:06:55 +02:00
Yasuo Ohgaki
052e69e50a Merge branch 'PHP-7.1'
* PHP-7.1:
  Fix URL rewriter issues
2016-08-11 09:17:57 +09:00
Kalle Sommer Nielsen
36b050c2c5 Get rid of these slow calls to LoadLibrary()/GetProcAddress() calls on Windows, we require Windows Vista as bare minimum for PHP anyway, so it does not make any sense to do this slow emulation anyway.
GD:
 - PrintWindow() is available as of Windows XP, it requires linking to User32.lib, which config.w32 for ext/gd already.

CLI:
 - The borrowed functions from PostgreSQL to set the titles of the console window uses SetConsoleTitle() and GetConsoleTitle(), both are available as of Windows 2000 from Kernel32.lib which we already are linking against.

Standard:
 - The disk space utility functions uses GetDiskFreeSpaceExA() which is available as of Windows XP, again links to Kernel32.lib.
 - The symlink() PHP function uses CreateSymbolicLinkA() which is available from Windows Vista, again from Kernel32.lib.
 - php_get_windows_name() in info.c uses GetNativeSystemInfo() which is available as of Windows XP and GetProductInfo() which is available as of Windows Vista, both are again from Kernel32.lib.

Notes:
 - ext/interbase & ext/pdo_firebird uses GetProcAddress(), I'm not entirely sure how to handle this one.
 - ext/sqlite3, this is apart of the bundled libsqlite3, I don't really wanna play around with our bundled libs and make it a bigger issue for those who maintain and upgrade them.
 - ext/readline, the call to GetProcAddress() here does not do any system calls, so it is left as is.
 - win32/ioutil.c uses GetProcAddress(), but the function it attempts to load (PathCchCanonicalizeEx()) is only available from Windows 8 and greater (Pathcch.lib linkage).
 - win32/time.c uses GetSystemTimePreciseAsFileTime() which is available from Windows 8 and greater to get the current system date and time which the highest possible precision and falls back to GetSystemTimeAsFileTime() (available as of Windows 2000), again Kernel32.lib, the GetSystemTimePreciseAsFileTime() is left in a GetProcAddress().
2016-08-11 02:09:50 +02:00
Yasuo Ohgaki
a53a6b3fb4 Fix URL rewriter issues 2016-08-11 08:31:48 +09:00
Leigh
42cf1a83fe Merge branch 'PHP-7.1' 2016-08-10 23:34:14 +01:00
Leigh
9a9004318f Preserve BC for rand() AND mt_rand() where min > max 2016-08-10 23:32:32 +01:00
Christoph M. Becker
faea487eff Merge branch 'PHP-7.1' 2016-08-10 18:11:11 +02:00
Christoph M. Becker
24fdffdacb Update to SQLite 3.14.0 2016-08-10 18:09:38 +02:00
Yasuo Ohgaki
850a0b5fb6 Merge pull request #1098
Fix bug #69086 enhancement for mb_convert_encoding
2016-08-10 14:39:23 +09:00
Yasuo Ohgaki
8ad4ef98b6 pull-request/1099
Request #65081 - implemeting mb_scrub
2016-08-10 14:09:48 +09:00
Yasuo Ohgaki
087dcd9381 pull-request/1100
Request #65081 mb_chr() and mb_ord()

Added test cases and little optimization.
2016-08-10 11:32:10 +09:00
Keyur
c7f0613666 Fix ASSERT logic 2016-08-09 18:16:58 +00:00
Keyur
1aca1771ff Bugfix 72791: fix memory leak in PDO persistent connections 2016-08-09 18:16:58 +00:00
Keyur
40059beed8 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Add NEWS
  Fix ASSERT logic
  Bugfix 72791: fix memory leak in PDO persistent connections
2016-08-09 17:30:26 +00:00
Keyur
2ab9a2d4be Fix ASSERT logic 2016-08-09 14:41:20 +00:00
Keyur
98e4d509f6 Bugfix 72791: fix memory leak in PDO persistent connections 2016-08-09 14:01:25 +00:00
Christopher Jones
e2e723b3f4 Merge branch 'PHP-7.1' 2016-08-09 16:14:53 +10:00
Christopher Jones
a3fdc5f680 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-09 16:13:27 +10:00
Christopher Jones
3c5e6b29ce Remove obsolete Id tags 2016-08-09 16:12:58 +10:00
Christopher Jones
8a6a470a89 Merge branch 'PHP-7.1' 2016-08-09 16:01:46 +10:00
Christopher Jones
3dbeb6118d Merge branch 'PHP-7.0' into PHP-7.1 2016-08-09 16:00:44 +10:00
Christopher Jones
797f69ef32 Bump version in OCI8 test 2016-08-09 15:59:59 +10:00
Xinchen Hui
d13c3b1ee4 Merge branch 'PHP-7.1'
* PHP-7.1:
  Update NEWS
  Fixed bug #72788 (Invalid memory access when using persistent PDO connection)
  Remove typo'd commit
  Fix bug 72788: Invalid memory access when database_object_handle is undefined. Also fix memory leak in dbh_free when using persistent PDO connections.
2016-08-09 11:33:38 +08:00
Xinchen Hui
3f1e9ed8f8 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #72788 (Invalid memory access when using persistent PDO connection)
  Remove typo'd commit
  Fix bug 72788: Invalid memory access when database_object_handle is undefined. Also fix memory leak in dbh_free when using persistent PDO connections.
2016-08-09 11:32:34 +08:00
Xinchen Hui
ebd21de1e4 Merge branch 'bug72788' of https://github.com/keyurdg/php-src into PHP-7.0
* 'bug72788' of https://github.com/keyurdg/php-src:
  Remove typo'd commit
  Fix bug 72788: Invalid memory access when database_object_handle is undefined. Also fix memory leak in dbh_free when using persistent PDO connections.
2016-08-09 11:25:32 +08:00
Keyur
a74c7cb528 Remove typo'd commit 2016-08-09 01:36:15 +00:00
Keyur
3f25c4228a Fix bug 72788: Invalid memory access when database_object_handle
is undefined. Also fix memory leak in dbh_free when using persistent
PDO connections.
2016-08-09 00:16:46 +00:00
Leigh
a5bec3a240 Merge branch 'PHP-7.1' 2016-08-08 22:33:18 +01:00
Leigh
2ece5decb7 Swap min/max if min > max 2016-08-08 22:31:59 +01:00
Leigh
e78795e842 Merge branch 'PHP-7.1' 2016-08-08 22:18:08 +01:00
Leigh
99e3bb1430 Allow min > max for mt_rand(). Bug #72784 2016-08-08 22:16:27 +01:00
Christoph M. Becker
5f6081e310 Merge branch 'PHP-7.1' 2016-08-08 18:57:14 +02:00
Christoph M. Becker
e8d8169fc1 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-08 18:51:34 +02:00
Nikita Popov
cc13a56356 Merge branch 'PHP-7.1' 2016-08-08 18:48:32 +02:00
Nikita Popov
cf017ce17f Fix array_column() packed hash initialization
FILL assumes enough space is alredy allocated -- do that. Note that
the used size is an upper bound, albeit a likely one.
2016-08-08 18:47:52 +02:00
Christoph M. Becker
9d03310b23 Merge branch 'PHP-5.6' into PHP-7.0 2016-08-08 18:45:27 +02:00
Christoph M. Becker
243d5fcb1f Add test for bug #69107: finfo no longer detects PHP files 2016-08-08 18:43:33 +02:00
Christoph M. Becker
dbf63cb98d Merge branch 'PHP-7.1' 2016-08-08 01:47:05 +02:00
Christoph M. Becker
f706897f33 Implement #38992: invoke() and invokeArgs() static method calls should match
We don't want ReflectionMethod::invoke() to simply ignore its first argument,
if the method to invoke is a static method. Instead we match its ZPP with
that of ReflectionMethod::invokeArgs(). Furthermore, we apply the DRY
principle by factoring out the code to a common helper function to prevent
inadvertent future divergence of the implementations of both methods.

As can be seen from the necessity to adapt some test cases, this causes a
BC break for some pathological cases. Therefore we apply this patch to PHP
7.1 only, which is still in beta phase.
2016-08-08 01:43:03 +02:00
Nikita Popov
61fb4f40aa Merge branch 'PHP-7.1' 2016-08-07 18:50:34 +02:00
Nikita Popov
e52c1f3ca9 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-07 18:50:27 +02:00