php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-25 08:58:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
78,479 Commits 549 Branches 1,485 Tags
d76a6a3e4d43986a51748add999e8969f73614e1
Commit Graph

33487 Commits

Author SHA1 Message Date
Stanislav Malyshev d76a6a3e4d tests still failing, so xfail for now until fixed 2014-01-29 23:48:44 -08:00
Yasuo Ohgaki 210b444e1d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug data->fd not set to -1 for open_basedir failure.
 2014-01-30 14:17:11 +09:00
Yasuo Ohgaki 53e3023566 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug data->fd not set to -1 for open_basedir failure.
 2014-01-30 14:16:47 +09:00
Yasuo Ohgaki b1c0614ecc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug data->fd not set to -1 for open_basedir failure.
 2014-01-30 14:16:05 +09:00
Yasuo Ohgaki f5e097d1ed Fixed bug data->fd not set to -1 for open_basedir failure. 2014-01-30 14:15:29 +09:00
Daniel Lowrey ba8cdc855d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed build breakage from b4b4d9697f
 2014-01-29 17:59:46 -07:00
Daniel Lowrey 43432c12f1 Fixed build breakage from b4b4d9697f 2014-01-29 17:57:59 -07:00
Anatol Belski c91ad8233b fix merge error after b4b4d9697f 2014-01-29 22:50:56 +01:00
Andrey Hristov 1c7f54d4f7 Merge branch 'PHP-5.6' 
Conflicts:
	NEWS
	ext/openssl/xp_ssl.c
 2014-01-29 15:32:02 +02:00
Andrey Hristov 253a66c8d5 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-01-29 15:28:47 +02:00
Andrey Hristov 7807d7d0ce Add new INI for rollbacking connections put back into the pconn pool 
as well a function get the the statistics in easier way than ob_start()
and parsing phpinfo().
 2014-01-29 15:27:43 +02:00
Remi Collet f06f4c9254 zip extension version 1.12.4 2014-01-29 14:00:50 +01:00
Yasuo Ohgaki a6ac64bdbb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed zend.multibyte tests partially
 2014-01-29 15:53:57 +09:00
Yasuo Ohgaki 3182660c04 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed zend.multibyte tests partially
 2014-01-29 15:51:47 +09:00
Yasuo Ohgaki d941ac5b4f Fixed zend.multibyte tests partially 2014-01-29 15:41:30 +09:00
Daniel Lowrey b4b4d9697f Verify peers by default in client socket operations 2014-01-28 10:05:56 -07:00
Andrey Hristov 3834771b2e Merge branch 'PHP-5.6' 
Conflicts:
	NEWS
	UPGRADING
 2014-01-28 15:57:48 +02:00
Andrey Hristov 79ab514f0c Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-01-28 15:56:17 +02:00
Andrey Hristov d9078c7c8d Merge branch 'PHP-5.6' 2014-01-28 15:47:50 +02:00
Andrey Hristov c1141d43e9 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-28 15:38:14 +02:00
Andrey Hristov 6b77c3aaa1 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-28 15:33:16 +02:00
Andrey Hristov 79cbcd9ded add text for the new constants 2014-01-28 15:32:59 +02:00
Andrey Hristov a87125c1e8 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-28 15:24:45 +02:00
Andrey Hristov eafe070f86 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2014-01-28 15:23:54 +02:00
Andrey Hristov d3faae03ec add new consts 2014-01-28 15:23:41 +02:00
Bob Weinand 18c2d45006 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-28 13:34:33 +01:00
Bob Weinand e8bf18bd9f Merge branch 'PHP-5.4' into PHP-5.5 2014-01-28 13:33:44 +01:00
Bob Weinand e9b4bca5a0 Fixed arginfo of PDO::__construct() to match the docs and zend_parse_parameters definition. 2014-01-28 13:31:52 +01:00
Daniel Lowrey 68883318aa Prevent invalid SAN peer verification on null byte prefix attack 2014-01-27 14:51:22 -07:00
Stanislav Malyshev d5560faaa3 drop precision since trigonometric functions are non-portable 
See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility
 2014-01-26 15:51:17 -08:00
Stanislav Malyshev f49965b487 XFAIL multibyte tests until they are fixed (bug 66582) 2014-01-26 15:51:17 -08:00
Stanislav Malyshev 909ef53e9d Merge branch 'PHP-5.6' 
* PHP-5.6:
  drop precision since trigonometric functions are non-portable
 2014-01-26 15:16:08 -08:00
Stanislav Malyshev 2fac5e5669 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  drop precision since trigonometric functions are non-portable
 2014-01-26 15:15:50 -08:00
Stanislav Malyshev 1dcaa109a1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  drop precision since trigonometric functions are non-portable
 2014-01-26 15:15:38 -08:00
Stanislav Malyshev 35cb180d9e drop precision since trigonometric functions are non-portable 
See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility
 2014-01-26 15:14:16 -08:00
Stanislav Malyshev 4e89151159 Merge branch 'PHP-5.6' 
* PHP-5.6:
  XFAIL multibyte tests until they are fixed (bug 66582)
 2014-01-26 15:12:40 -08:00
Stanislav Malyshev de62be2682 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  XFAIL multibyte tests until they are fixed (bug 66582)
 2014-01-26 15:12:19 -08:00
Stanislav Malyshev dfe6628440 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  XFAIL multibyte tests until they are fixed (bug 66582)
 2014-01-26 15:12:00 -08:00
Stanislav Malyshev cd0bf6fc3a XFAIL multibyte tests until they are fixed (bug 66582) 2014-01-26 15:11:15 -08:00
Stanislav Malyshev 3f19697c0c fix test 2014-01-26 14:31:20 -08:00
Stanislav Malyshev a0445644e0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix test
 2014-01-26 14:26:26 -08:00
Stanislav Malyshev e52c332b38 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2014-01-26 14:26:01 -08:00
Stanislav Malyshev 54c1e28a39 fix test 2014-01-26 14:25:49 -08:00
Stanislav Malyshev c4259f90b1 fix test - new flag ZEND_ACC_HAS_TYPE_HINTS 2014-01-26 12:17:29 -08:00
Stanislav Malyshev d78c40d25d fix test - new flag ZEND_ACC_HAS_TYPE_HINTS 2014-01-26 12:17:09 -08:00
Derick Rethans 6dd41435a3 Merge branch 'PHP-5.6' 2014-01-26 14:02:55 +01:00
Derick Rethans 2e65908643 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-26 14:02:44 +01:00
Derick Rethans 7399386a20 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-26 14:02:37 +01:00
Derick Rethans 22dba2f5f3 Fixed bug #45543: DateTime::setTimezone can not set timezones without ID. 2014-01-26 14:01:58 +01:00
Stanislav Malyshev c2a93ba3af Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix test bug62479.phpt
 2014-01-25 23:27:48 -08:00