clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 07:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,240 Commits 494 Branches 1,367 Tags 810 MiB
92a1640694
Commit Graph

74240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi Collet
92a1640694 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix copy/paste in error message
 2013-04-23 13:53:07 +02:00
Remi Collet
2005a15caa fix copy/paste in error message 2013-04-23 13:53:00 +02:00
Remi Collet
2fa178fa41 Merge branch 'PHP-5.5' 
* PHP-5.5:
  enable WebP with system libgd when available
  (re)allow WBMP detection with system libgd provide getbmi and skipheader not exported functions in gd_compat.
 2013-04-23 13:46:24 +02:00
Remi Collet
9819d81ddf enable WebP with system libgd when available 2013-04-23 13:46:10 +02:00
Remi Collet
eb50789910 (re)allow WBMP detection with system libgd 
provide getbmi and skipheader not exported functions in gd_compat.
 2013-04-23 13:43:57 +02:00
Sara Golemon
231e2d762a Merge branch 'PHP-5.5' 
* PHP-5.5:
  array_column() - Use entire subject array when NULL passed for second param.
 2013-04-22 16:20:41 -07:00
Sara Golemon
734e165d4e array_column() - Use entire subject array when NULL passed for second param. 
This starts to look like array_values(), except that you can reindex the arrays
using the third parameter.
 2013-04-22 16:19:21 -07:00
Sara Golemon
35df484b5b Merge branch 'PHP-5.5' 
* PHP-5.5:
  Allow array_column() to take -1 as a valid value in third param
 2013-04-22 15:55:38 -07:00
Sara Golemon
1a03bd5dee Allow array_column() to take -1 as a valid value in third param 
Also do some cleanup and simplification to make this code more
readable in the long term.
 2013-04-22 15:54:21 -07:00
Sara Golemon
caff01e751 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Harden array_column_basic.phpt against resource renumbering.
 2013-04-22 13:37:36 -07:00
Sara Golemon
f63db963c4 Harden array_column_basic.phpt against resource renumbering. 
We don't care what resource number it is, so long as there's a
stream resource returned.
 2013-04-22 13:36:40 -07:00
Sara Golemon
70c700cf8c Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix handling of double keys in array_column
 2013-04-21 23:33:20 -07:00
Anatol Belski
8645309c4e Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed stream_socket_pair() on Windows x64 and
 2013-04-22 19:01:07 +02:00
Anatol Belski
b119836765 updated NEWS 2013-04-22 19:00:46 +02:00
Anatol Belski
f578bb0388 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed stream_socket_pair() on Windows x64 and
 2013-04-22 19:00:13 +02:00
Anatol Belski
b3aa3c2616 updated NEWS 2013-04-22 18:59:47 +02:00
Anatol Belski
8febe2ad08 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed stream_socket_pair() on Windows x64 and
 2013-04-22 18:59:11 +02:00
Anatol Belski
f082d6311b Fixed stream_socket_pair() on Windows x64 and 
improved errorhandling in the socketpair() implementation.
 2013-04-22 18:55:32 +02:00
Derick Rethans
cf0d902a84 Merge branch 'PHP-5.5' 2013-04-22 17:51:50 +01:00
Derick Rethans
0720804e7c Merge branch 'PHP-5.4' into PHP-5.5 2013-04-22 17:51:47 +01:00
Derick Rethans
0b2c411323 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-22 17:51:43 +01:00
Derick Rethans
70b67f2e50 - Updated to version 2013.3 (2013c) 2013-04-22 17:51:41 +01:00
Remi Collet
41ef288ced Merge branch 'PHP-5.5' 
* PHP-5.5:
  temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported
 2013-04-22 17:48:43 +02:00
Remi Collet
ec1678dd7c temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported 2013-04-22 17:48:28 +02:00
Remi Collet
149cf2650a Merge branch 'PHP-5.5' 
* PHP-5.5:
  overflow2 is not exported by system libgd
 2013-04-22 17:39:54 +02:00
Remi Collet
6889a0d1f5 overflow2 is not exported by system libgd 2013-04-22 17:39:35 +02:00
Dmitry Stogov
9ca60e2444 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed linkage with C++
  Includes 5 new phpTests to check that the error message DOM_NOT_FOUND is properly raised by the method DOMNode::insertBefore(newNode, [refNode]).
 2013-04-22 15:40:46 +04:00
Dmitry Stogov
13b039ff9a Fixed linkage with C++ 2013-04-22 15:39:50 +04:00
Sara Golemon
7b34324f84 Fix handling of double keys in array_column 
Also fix resource test to not localize __FILE__ to cwd.
 2013-04-21 22:35:04 -07:00
Xinchen Hui
b02241b968 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-04-21 11:11:02 +08:00
Xinchen Hui
32490673b9 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-21 11:10:41 +08:00
Xinchen Hui
6b1928ba0b Merge branch 'PHP-5.4' into PHP-5.5 2013-04-21 11:09:18 +08:00
Antonio Diaz Ruiz
92bbe6be72 Includes 5 new phpTests to check that the error message DOM_NOT_FOUND is properly raised by the method DOMNode::insertBefore(newNode, [refNode]). 
Each file covers a different test case

    DOMNode_insertBefore_error2.phpt: refNode is a sibling of the node where newNode wanted to be inserted.
    DOMNode_insertBefore_error3.phpt: refNode is the parent of the node where newNode wanted to be inserted.
    DOMNode_insertBefore_error4.phpt: refNode is a brand new node.
    DOMNode_insertBefore_error5.phpt: refNode is a descendant (not child) of the node where newNode wanted to be inserted.
    DOMNode_insertBefore_error6.phpt: refNode is the node where newNode wanted to be inserted.
 2013-04-21 11:05:59 +08:00
Xinchen Hui
0c1ef6898d Merge branch 'master' of https://github.com/dejalatele/php-src 2013-04-21 11:04:27 +08:00
Pierre Joye
3cc81d151d Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-20 18:24:04 +02:00
Pierre Joye
d818fdcc47 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix x64 opcache, still uses fugly fixed addresses, see TODO entry for explanaton
 2013-04-20 18:23:21 +02:00
Pierre Joye
14d9f3450b fix x64 opcache, still uses fugly fixed addresses, see TODO entry for explanaton 2013-04-20 18:22:39 +02:00
Antonio Diaz Ruiz
eebe602c58 Merge branch 'master' of https://github.com/dejalatele/php-src 2013-04-20 16:37:45 +02:00
Antonio Diaz Ruiz
9bf80bc294 Includes 5 new phpTests to check that the error message DOM_NOT_FOUND is properly raised by the method DOMNode::insertBefore(newNode, [refNode]). 
Each file covers a different test case

    DOMNode_insertBefore_error2.phpt: refNode is a sibling of the node where newNode wanted to be inserted.
    DOMNode_insertBefore_error3.phpt: refNode is the parent of the node where newNode wanted to be inserted.
    DOMNode_insertBefore_error4.phpt: refNode is a brand new node.
    DOMNode_insertBefore_error5.phpt: refNode is a descendant (not child) of the node where newNode wanted to be inserted.
    DOMNode_insertBefore_error6.phpt: refNode is the node where newNode wanted to be inserted.
 2013-04-20 16:28:46 +02:00
Xinchen Hui
2bcbe8fab9 Merge branch 'PHP-5.5' 2013-04-20 15:24:48 +08:00
Xinchen Hui
63d3ef4df0 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-20 15:24:18 +08:00
Xinchen Hui
6ed16753c1 Fixed bug #64677 (execution operator `` stealing surrounding arguments) 2013-04-20 15:23:49 +08:00
Dmitry Stogov
1fe5ee4d6a Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed 5.2 ZTS build
 2013-04-19 21:44:00 +04:00
Dmitry Stogov
c7cf9b68b6 Fixed 5.2 ZTS build 2013-04-19 21:37:24 +04:00
Andrey Hristov
6ce68583be Merge branch 'PHP-5.5' 2013-04-19 16:47:47 +02:00
Andrey Hristov
7b7424c34c Merge branch 'PHP-5.4' into PHP-5.5 2013-04-19 16:29:53 +02:00
Andrey Hristov
39cc08c7e9 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-19 15:55:46 +02:00
Andrey Hristov
0802961bd1 lower the limit, should fit in a byte 2013-04-19 15:54:35 +02:00
Dmitry Stogov
fc2f2f7813 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Fix other typos & add test script
  Fix typo
  - Fixed ZTS build
 2013-04-19 10:48:46 +04:00
Dmitry Stogov
1074bbd5a3 Fixed ZTS build 2013-04-19 10:48:21 +04:00