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,255 Commits 491 Branches 1,363 Tags 844 MiB
fb88cee0fc
Commit Graph

104255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
fb88cee0fc Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Yet two wrong version checks
 2017-10-20 16:55:32 +02:00
Anatol Belski
65d4bd0311 Yet two wrong version checks 2017-10-20 16:54:47 +02:00
Anatol Belski
0f7ddf0d47 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix version checks in tests
  Fix version checks in tests
 2017-10-20 15:25:27 +02:00
Anatol Belski
ae6d877f54 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix version checks in tests
 2017-10-20 15:25:01 +02:00
Anatol Belski
2f444640b4 Fix version checks in tests 2017-10-20 15:24:43 +02:00
Anatol Belski
7240d99838 Fix version checks in tests 2017-10-20 15:23:09 +02:00
Anatol Belski
7775f9e872 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Sync some tests for compat with ICU 58.1, PHP 7.1+ part
  Sync some tests for compat with ICU 58.1+
 2017-10-20 13:58:53 +02:00
Anatol Belski
e2afa00b4c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Sync some tests for compat with ICU 58.1+
 2017-10-20 13:57:44 +02:00
Anatol Belski
26473523b0 Sync some tests for compat with ICU 58.1, PHP 7.1+ part 2017-10-20 13:56:58 +02:00
Anatol Belski
877e0b04bc Sync some tests for compat with ICU 58.1+ 2017-10-20 13:55:32 +02:00
Anatol Belski
2a361b14ea Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Add skip for incompatible ICU version
 2017-10-20 11:30:09 +02:00
Anatol Belski
7751ae59ae Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add skip for incompatible ICU version
 2017-10-20 11:28:51 +02:00
Anatol Belski
9071ff5c87 Add skip for incompatible ICU version 2017-10-20 11:27:54 +02:00
Joe Watkins
4b67943501
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination
 2017-10-19 12:03:19 +01:00
Joe Watkins
8eee20d876
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination
 2017-10-19 12:02:52 +01:00
Nester
80c3b078b8
Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination 2017-10-19 12:02:22 +01:00
Joe Watkins
cf91d81b31
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update .editorconfig with some more configs
 2017-10-19 11:54:01 +01:00
Joe Watkins
85c243ef66
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Update .editorconfig with some more configs
 2017-10-19 11:53:50 +01:00
Peter Kokot
aa143515d6
Update .editorconfig with some more configs 
Added support for .awk, .w32, .bat, .mk, .frag, .m4, .sh, .php, .phpt,
and Markdown files based on the current most used coding style in the
php-src repository.
 2017-10-19 11:53:37 +01:00
Joe Watkins
0397b8c5c5
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix issue with zend signals in php_request_startup
 2017-10-19 11:48:27 +01:00
Herman J. Radtke III
bb1814b5c3
Fix issue with zend signals in php_request_startup 
The zend_signals_activate() function is called in php_request_startup()
even if `--disable-zend-signals` is used. This causes uninitialized
variables to be used on ZTS builds.

This was removed in 7.1 in c870633. Removing guards from the SAPIs
should be fine, but removing the guard from main/main.c prevents anyone
using the static embedded library to integrate PHP into their programs.

For more details, see the "Additional remark" section in
https://bugs.php.net/bug.php?id=74149
 2017-10-19 11:48:16 +01:00
Joe Watkins
965daf4349
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Escape newline on curl config.m4
 2017-10-19 11:40:48 +01:00
Joe Watkins
925d969f9e
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Escape newline on curl config.m4
 2017-10-19 11:40:05 +01:00
Ryan Volz
4e85dd0346
Escape newline on curl config.m4 2017-10-19 11:39:54 +01:00
Anatol Belski
2b76520d86 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Move to php-sdk-2.0.0beta3 for Appveyor
 2017-10-18 17:47:27 +02:00
Anatol Belski
3c2b087b3e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Move to php-sdk-2.0.0beta3 for Appveyor
 2017-10-18 17:46:40 +02:00
Anatol Belski
5f7707cc8a Move to php-sdk-2.0.0beta3 for Appveyor 
Supposed to fix sporadic tool crashes on the test image
 2017-10-18 17:45:33 +02:00
Anatol Belski
5315cea6e2 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Backport 7ff13badda into 7.0+
 2017-10-18 16:27:31 +02:00
Anatol Belski
53d8775015 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Backport 7ff13badda into 7.0+
 2017-10-18 16:24:23 +02:00
Anatol Belski
d82805f097 Backport 7ff13badda into 7.0+ 2017-10-18 16:02:56 +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
e53a9aaa4a Fixed bug (assertion fails with extended info generated) 2017-10-17 19:47:29 +08:00
Xinchen Hui
0292456262 Fixed test 2017-10-17 12:20:43 +08:00
Xinchen Hui
2f73f2436a Try to fix test 2017-10-17 11:35:40 +08: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
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
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
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
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