php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
93,496 Commits 549 Branches 1,485 Tags
9dc6de528d206679d7735150ccd871f75b8fe862
Commit Graph

40236 Commits

Author SHA1 Message Date
Popa Adrian Marius 9dc6de528d Merge branch 'PHP-7.0' 
* PHP-7.0:
  Use LL_MASK for SQL_INT64 data formatting
 2015-12-03 17:13:59 +02:00
Popa Adrian Marius 9ddfd49063 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Use LL_MASK for SQL_INT64 data formatting
 2015-12-03 17:13:45 +02:00
Popa Adrian Marius 8da5752311 Use LL_MASK for SQL_INT64 data formatting 2015-12-03 17:12:02 +02:00
Popa Adrian Marius c548d6b7a2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix Bug #60052	Integer returned as a 64bit integer on X64_86 for pdo_firebird
 2015-12-03 16:15:37 +02:00
Popa Adrian Marius 1745ead668 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix Bug #60052	Integer returned as a 64bit integer on X64_86 for pdo_firebird
 2015-12-03 16:15:18 +02:00
Popa Adrian Marius 4173a667fa Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird 2015-12-03 16:14:17 +02:00
Lior Kaplan 4dc996f74d Merge branch 'PHP-7.0' 
* PHP-7.0:
  SIZEOF_SIZE_T doesn't exist on AIX, keep using SIZEOF_LONG
 2015-12-02 19:34:13 +02:00
Lior Kaplan e322fb0015 SIZEOF_SIZE_T doesn't exist on AIX, keep using SIZEOF_LONG 
Follow up for 3689b444
 2015-12-02 19:30:05 +02:00
Andrey Hristov 139af35c25 Add a method for checking if the underlying stream is valid. 2015-12-01 12:52:36 +01:00
Xinchen Hui badce8c49a Merge branch 'PHP-7.0' 2015-12-01 10:35:48 +08:00
Xinchen Hui ed4b887cf6 Fixed bug #70991 (zend_file_cache.c:710: error: array type has incomplete element type) 2015-12-01 10:35:32 +08:00
Scott 00e3b7614e Update random.c 
Ref: https://github.com/jedisct1/libsodium/commit/beb826f6fd173cff4473c8b7614033dbd4803500
 2015-12-01 10:33:33 +08:00
Xinchen Hui c78a782a2f Merge branch 'PHP-7.0' 2015-11-30 10:50:34 +08:00
Xinchen Hui 5df6f9f20e Fixed bug #70993 (Array key references break argument processing) 2015-11-30 10:50:23 +08:00
Xinchen Hui 5c707a6cf8 Merge branch 'PHP-7.0' 2015-11-28 23:44:06 -08:00
Xinchen Hui 9397f52724 Fixed Bug #70967 (Weird error handling for __toString when Error is thrown) 2015-11-28 23:38:19 -08:00
Xinchen Hui cb5af748b1 Merge branch 'PHP-7.0' 2015-11-27 19:12:37 -08:00
Xinchen Hui 5af61aa1cc Space 2015-11-27 19:12:26 -08:00
Xinchen Hui f9a56e00f6 Merge branch 'PHP-7.0' 2015-11-27 07:31:19 -08:00
Xinchen Hui e9a8d7ff1d Fixed bug #70977, #70973 (Segmentation fault with opcache.huge_code_pages=1) 2015-11-27 07:30:37 -08:00
Xinchen Hui 3aa2182db6 Merge branch 'PHP-7.0' 2015-11-27 15:53:19 +08:00
Xinchen Hui a347b0be48 Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors) 2015-11-27 15:52:55 +08:00
Xinchen Hui d3e6a9ce39 Merge branch 'PHP-7.0' 2015-11-27 11:42:39 +08:00
Xinchen Hui b0f472b3b2 Fixed test 2015-11-27 11:42:30 +08:00
Xinchen Hui 541b11b5f6 Merge branch 'PHP-7.0' 2015-11-27 11:33:05 +08:00
Xinchen Hui 6cb6c04499 Fixed bug #70982 (setStaticPropertyValue behaviors inconsistently with 5.6) 2015-11-27 11:32:38 +08:00
Dmitry Stogov 2e6cf2710a Fixed compilation warning 2015-11-26 11:27:24 +03:00
Christopher Jones eaa94390b3 Merge branch 'PHP-7.0' 2015-11-26 06:53:54 +11:00
Christopher Jones 071247713f Change line endings: Windows to Unix 2015-11-26 06:51:46 +11:00
Xinchen Hui 07a05836de Merge branch 'PHP-7.0' 2015-11-25 20:20:51 +08:00
Xinchen Hui 9376e8213c ZEND_SPACESHIP supports 2015-11-25 20:20:05 +08:00
Christopher Jones 850ef17c5d Merge branch 'PHP-7.0' 2015-11-25 12:44:10 +11:00
Christopher Jones 7be30eb78c Improve test portability 2015-11-25 12:43:05 +11:00
Christopher Jones d10ee1eef1 Fix remaining gcov valgrind issues 2015-11-25 12:42:27 +11:00
Andrey Hristov 85e4fcf647 Give the possibility of the client to pass a factory 2015-11-24 10:23:44 +01:00
Xinchen Hui 7e7c2c062f Merge branch 'PHP-7.0' 2015-11-24 13:46:04 +08:00
Xinchen Hui e637ead6ed Merge branch 'PHP-5.6' into PHP-7.0 2015-11-24 13:45:32 +08:00
Xinchen Hui e6b46dc2ff Fixed bug #70960 (ReflectionFunction for array_unique returns wrong number of parameters) 2015-11-24 13:45:16 +08:00
Xinchen Hui 8d4fc591ef Merge branch 'PHP-7.0' 2015-11-24 11:48:14 +08:00
Xinchen Hui fd545f4f44 Also fixed 'r' 2015-11-24 11:48:03 +08:00
Xinchen Hui 59933934be Merge branch 'PHP-7.0' 2015-11-24 11:08:53 +08:00
Xinchen Hui 3e0b2ba5d8 Indent (not sure why it was messed) 2015-11-24 11:08:30 +08:00
Xinchen Hui 31b4581c45 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2015-11-24 11:05:56 +08:00
Xinchen Hui 26a526fb4a Merge branch 'PHP-7.0' 2015-11-24 11:05:13 +08:00
Xinchen Hui 91fb1edbbf Fixed bug #70963 (Unserialize shows UNKNOW in result) 
Thanks to ryat for reportinig
 2015-11-24 11:04:42 +08:00
Côme Bernigaud e6759644ec Revert "Added back support for undocummented host:port syntax" 
This reverts commit 15876e85e5.
 2015-11-24 03:45:21 +01:00
Côme Bernigaud 5a8bcf73ba Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)" 
This reverts commit 391087ed28.
 2015-11-24 03:45:17 +01:00
Xinchen Hui 34bff5b91c Merge branch 'PHP-7.0' 2015-11-23 23:16:11 +08:00
Xinchen Hui 7e9f416218 Fixed bug #70959 (ArrayObject unserialize does not restore protected fields) 2015-11-23 23:15:33 +08:00
Xinchen Hui 26f3710ae8 Merge branch 'PHP-7.0' 2015-11-23 06:22:11 -08:00