clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
104,955 Commits 491 Branches 1,363 Tags 844 MiB
7ff13badda
Commit Graph

104955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
7ff13badda Fixed required SHM memeory size calculation for scripts when opcache.revalidate_path is set. 2017-10-18 14:26:44 +03:00
Xinchen Hui
d042d1d8e0 Cleanup cfg flags & Added ZEND_FUNC_HAS_EXTENED_INFO 2017-10-18 17:03:07 +08:00
fandrieu
014fd21b48 Implemented request #69592: allow 0-column rowsets to be skipped automatically 
This adds a new attribute PDO::DBLIB_ATTR_SKIP_EMPTY_ROWSETS to enable automatic
skipping of empty rowsets.

This happens with some SQL commands (like PRINT or SET): a rowset with 0 columns
is returned by the driver.

With this option enabled, 0 columns rowsets are automatically skipped, mirroring
the behavior of the deprecated mssql extension.

Credits go to MiRacLe-RPZ for developping and promoting this patch.
 2017-10-17 14:16:38 -04:00
Anatol Belski
f16b918e47 Merge branch 'PHP-7.2' 
* PHP-7.2:
  One more folder to delete in AppVeyor image
 2017-10-17 15:38:01 +02:00
Anatol Belski
63a0ddb013 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  One more folder to delete in AppVeyor image
 2017-10-17 15:37:23 +02:00
Anatol Belski
b9b06c4bdf Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  One more folder to delete in AppVeyor image
 2017-10-17 15:34:42 +02:00
Anatol Belski
9891f11f84 One more folder to delete in AppVeyor image 2017-10-17 15:32:47 +02:00
Xinchen Hui
21f2ed6a63 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug (assertion fails with extended info generated)
 2017-10-17 19:47:40 +08:00
Xinchen Hui
e53a9aaa4a Fixed bug (assertion fails with extended info generated) 2017-10-17 19:47:29 +08:00
Dmitry Stogov
801b467c73 Added test 2017-10-17 13:45:46 +03:00
Dmitry Stogov
d0f4dbfd96 Make assertions in DO_ICALL and CALL_TRAMPOLINE to be consistent with DO_FCALL. 2017-10-17 13:35:59 +03:00
Dmitry Stogov
61ef91bf0d Revert "Allow internal functions to return values by reference (this was disabled in implementation of DO_ICALL, but enabled in DO_FCALL)." 
This reverts commit da781a5ac2.
 2017-10-17 13:25:19 +03:00
Dmitry Stogov
da781a5ac2 Allow internal functions to return values by reference (this was disabled in implementation of DO_ICALL, but enabled in DO_FCALL). 
However, don't require internal functions returning by reference to return a reference.
Mark unserialize() as returning by reference and remove unwrap_reference hack, to allow proper returning of self referenced arrays using a reference.
Currently unserialize() is the only internal function that may return a reference.
 2017-10-17 11:50:34 +03:00
Xinchen Hui
3e195d4d16 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed test
 2017-10-17 12:20:48 +08:00
Xinchen Hui
0292456262 Fixed test 2017-10-17 12:20:43 +08:00
Xinchen Hui
1c7c5d9720 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Try to fix test
 2017-10-17 11:35:57 +08:00
Xinchen Hui
2f73f2436a Try to fix test 2017-10-17 11:35:40 +08:00
Tianfang Yang
28e6520574 Merge branch 'PHP-7.2' 2017-10-16 19:28:50 -04:00
Tianfang Yang
77ad860bf0 Merge branch 'PHP-7.1' into PHP-7.2 2017-10-16 19:27:21 -04:00
Tianfang Yang
d1f43b1a58 Merge branch 'PHP-7.0' into PHP-7.1 2017-10-16 19:24:08 -04:00
Tianfang Yang
f955cff54c Fixed valgrind issue 2017-10-16 19:20:24 -04:00
Tianfang Yang
aad4544e95 Fixed valgrind issue 2017-10-16 19:16:30 -04:00
Dmitry Stogov
1dd224dd12 Reuse interned strings from opcache SHM, if possible. 2017-10-16 19:20:16 +03:00
Anatol Belski
a87484aa22 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Move to next binary SDK version for AppVeyor
 2017-10-16 18:08:09 +02:00
Anatol Belski
d30477f23a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Move to next binary SDK version for AppVeyor
 2017-10-16 18:07:41 +02:00
Anatol Belski
c3177f8279 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Move to next binary SDK version for AppVeyor
 2017-10-16 18:06:38 +02:00
Anatol Belski
7778106f40 Move to next binary SDK version for AppVeyor 2017-10-16 18:05:56 +02:00
Dmitry Stogov
555f6dfdec Merge branch 'PHP-7.2' 
* PHP-7.2:
  Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql
 2017-10-16 19:02:46 +03:00
Dmitry Stogov
5d6912d185 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql
 2017-10-16 19:02:22 +03:00
Dmitry Stogov
c33ca443ee Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql
 2017-10-16 19:02:07 +03:00
Dmitry Stogov
8bfe748fb0 Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql 2017-10-16 19:00:12 +03:00
Xinchen Hui
5c697ccb9d Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #75378 ([REGRESSION] IntlDateFormatter::parse() does not change $position argument)
 2017-10-16 19:09:13 +08:00
Xinchen Hui
6fab62e923 Merge branch 'PHP-7.2' of git.php.net:/php-src into PHP-7.2 
* 'PHP-7.2' of git.php.net:/php-src:
  [ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct")
  Properly fix #75363 and address some other leaks with cert
 2017-10-16 19:07:55 +08:00
Xinchen Hui
863acd7753 Fixed bug #75378 ([REGRESSION] IntlDateFormatter::parse() does not change $position argument) 2017-10-16 19:07:34 +08:00
Christoph M. Becker
7ae8e3e8a2 Merge branch 'PHP-7.2' 
* PHP-7.2:
  [ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct")
 2017-10-16 11:13:05 +02:00
Christoph M. Becker
08c04c9245 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct")
 2017-10-16 11:12:17 +02:00
Christoph M. Becker
200d526a9c [ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct") 2017-10-16 11:11:34 +02:00
Jakub Zelenka
0c99e7eff1 Merge branch 'PHP-7.2' 2017-10-16 09:55:18 +01:00
Jakub Zelenka
532aec7af2 Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2 2017-10-16 09:54:03 +01:00
Xinchen Hui
7bce8c5224 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug (Phi sources removel)
 2017-10-16 15:23:02 +08:00
Xinchen Hui
8e147f12b9 Fixed bug (Phi sources removel) 2017-10-16 15:01:06 +08:00
Jakub Zelenka
16aca56816 Merge branch 'PHP-7.2' 2017-10-15 20:33:49 +01:00
Jakub Zelenka
a3da46b524 Merge branch 'PHP-7.1' into PHP-7.2 2017-10-15 20:33:22 +01:00
Jakub Zelenka
547fee9cd4 Merge branch 'PHP-7.0' into PHP-7.1 2017-10-15 20:31:25 +01:00
Jakub Zelenka
999fe36d40 Properly fix #75363 and address some other leaks with cert 2017-10-15 20:25:58 +01:00
Jakub Zelenka
d1f5811ff0 Merge branch 'PHP-7.2' 2017-10-15 19:37:22 +01:00
Jakub Zelenka
7c556c44a1 Fix bug #68567 (JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null key) 2017-10-15 19:36:15 +01:00
Peter Kokot
b7b55d955e Remove PHP code examples from xmlwriter extension 
PHP documentation can present PHP code examples better instead.
 2017-10-15 15:38:45 +02:00
Christoph M. Becker
c189b4788d Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)
 2017-10-15 14:08:03 +02:00
Christoph M. Becker
46d87c1f10 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)
 2017-10-15 14:07:41 +02:00