php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-30 03:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
78,858 Commits 549 Branches 1,487 Tags
99b01fb3d7faf56fffa9285dcae9a6ed8dc0f440
Commit Graph

33716 Commits

Author SHA1 Message Date
Stanislav Malyshev 99b01fb3d7 ws fix 2014-04-14 13:35:59 -07:00
Andrey Hristov 84fcc44083 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-04-14 23:11:16 +03:00
Stanislav Malyshev 59900dd37f Fix null byte in LDAP bindings 2014-04-14 10:51:32 -07:00
Stanislav Malyshev 41569b1029 Fix bug #66171: better handling of symlinks 2014-04-14 10:51:31 -07:00
Anatol Belski 9e76e87ca9 fix crash in MINFO when no mysqlnd plugins are loaded 2014-04-14 17:44:47 +02:00
Andrey Hristov ce99f292de Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/mysqli/tests/mysqli_change_user_old.phpt
 2014-04-14 17:44:13 +03:00
Andrey Hristov dae70a2ff7 Add test 2014-04-14 17:35:01 +03:00
Anatol Belski d483e1daca test fixes for ICU 53.1 2014-04-14 15:34:32 +02:00
Stanislav Malyshev 7c9209a0d1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #66021 (Blank line inside empty array/object)
 2014-04-13 18:56:16 -07:00
Stanislav Malyshev 9bba219c75 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #66021 (Blank line inside empty array/object)
 2014-04-13 18:55:28 -07:00
Stanislav Malyshev 5e66ce9293 Merge branch 'pull-request/518' into PHP-5.4 
* pull-request/518:
  Fix #66021 (Blank line inside empty array/object)
 2014-04-13 18:50:39 -07:00
Stanislav Malyshev 0d4c28f2e1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #64604
 2014-04-13 18:39:17 -07:00
Stanislav Malyshev 30ec1c0051 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64604
 2014-04-13 18:38:36 -07:00
Ingo Walz b05c088a3a Fixed bug #64604 2014-04-13 18:37:40 -07:00
Stanislav Malyshev 1ef0bd2633 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
 2014-04-13 18:13:52 -07:00
Stanislav Malyshev f1206aef70 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
 2014-04-13 18:13:09 -07:00
Freek 5558d0db9b Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec 
curl_exec returns an empty string when data is received from a domain that returns zero content. curl_multi_getcontent
returned null. Now it returns an empty string fixing the incosistency
 2014-04-13 18:12:17 -07:00
Stanislav Malyshev 04a11b850a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix windows build
 2014-04-13 17:04:00 -07:00
Stanislav Malyshev df8e34bcc1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix windows build
 2014-04-13 17:03:28 -07:00
Stanislav Malyshev 3a2660b302 Fix windows build 2014-04-13 17:02:21 -07:00
Stanislav Malyshev d3c4292db7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #66721
 2014-04-13 15:55:45 -07:00
Stanislav Malyshev 733b09442d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #66721
 2014-04-13 15:55:07 -07:00
Boro Sitnikovski 8c88b6e81c Fix bug #66721 
Add NULL check to php_date_parse_tzfile's retval
 2014-04-13 15:51:55 -07:00
Stanislav Malyshev 3aab84c100 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
 2014-04-13 15:25:58 -07:00
Stanislav Malyshev fe72caa6e5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
 2014-04-13 15:23:32 -07:00
Gabor Buella 1010200da5 Fixed bug #67024 - getimagesize should recognize BMP files with negative height 2014-04-13 15:17:04 -07:00
Bob Weinand a93e734f81 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-14 00:08:36 +02:00
Daniel Lowrey 0e023e9784 Bug #66840: Fix broken build when extension built separately 2014-04-13 15:17:50 -06:00
Bob Weinand bf3edbada6 Merge branch 'PHP-5.4' into PHP-5.5 2014-04-13 23:03:53 +02:00
Bob Weinand beda5093b4 Reverted to 5a0da281e5 
Discussion: http://news.php.net/php.cvs/76836
 2014-04-13 23:01:31 +02:00
Bob Weinand 3636a91adc Merge branch 'PHP-5.5' into PHP-5.6 2014-04-13 19:40:39 +02:00
Bob Weinand 191d9fc227 Merge branch 'PHP-5.4' into PHP-5.5 2014-04-13 19:37:06 +02:00
Bob Weinand f07e37c96d Forgot title in phpt for bug #67064 2014-04-13 19:34:17 +02:00
Bob Weinand fb99409f89 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-13 19:27:43 +02:00
Bob Weinand eca0644e0a Merge branch 'PHP-5.4' into PHP-5.5 2014-04-13 19:25:07 +02:00
Bob Weinand 1a4a9eede5 Fix bug #67064 in a BC safe way 
You can use an optional parameter now when implementing the Countable interface
to get the $mode passed to count().
 2014-04-13 19:24:12 +02:00
Matteo Beccati 7fd9898a2d Fixed bug #66604 'pdo/php_pdo_error.h' not copied to the include dir 2014-04-13 08:53:21 +02:00
Ferenc Kovacs aefc8f22b3 Fix bug #66568: the second arg for unserialize is optional. 2014-04-13 02:49:35 +02:00
Bob Weinand 99d1a1bb3f Shut up, my lovely compiler; I do not like your warnings 2014-04-11 19:33:56 +02:00
Bob Weinand 35b895fdf0 Removed useless void* parameter and replaced with zend_bool on zval_update_constant* functions 2014-04-11 19:18:58 +02:00
Anatol Belski 5c87ed058b fix syntax error in vc++ 2014-04-11 13:08:46 +02:00
Anatol Belski c5181ef6c2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3
 2014-04-11 11:01:01 +02:00
Anatol Belski e08172e0d5 Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3 2014-04-11 11:00:10 +02:00
Bob Weinand f614fc6898 Fix bug #66015 by reverting "Removed operations on constant arrays." 2014-04-11 10:08:44 +02:00
Andrey Hristov e02fdcf3f7 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-04-10 18:13:58 +03:00
Andrey Hristov af5fa00c97 Fix the fix 2014-04-10 18:13:44 +03:00
Popa Adrian Marius 4048872317 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Cleanup $ is not needed for git
 2014-04-10 17:43:29 +03:00
Popa Adrian Marius 1a0b80fe90 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Cleanup $ is not needed for git
 2014-04-10 17:43:09 +03:00
Popa Adrian Marius 1c3ed86211 Cleanup $ is not needed for git 2014-04-10 17:42:32 +03:00
Andrey Hristov 090c3e87c0 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 
Conflicts:
	ext/mysqli/tests/mysqli_begin_transaction.phpt
 2014-04-10 16:49:13 +03:00