clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,229 Commits 494 Branches 1,367 Tags 801 MiB
70c700cf8c
Commit Graph

31648 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Xinchen Hui
676e737f5b Fix other typos & add test script 2013-04-19 11:21:44 +08:00
Xinchen Hui
580d6fe94d Fix typo 2013-04-19 10:55:11 +08:00
Felipe Pena
1192cfa58c - Fixed ZTS build 2013-04-18 19:27:02 -03:00
Dmitry Stogov
3735d96ce0 Disable FCALL optimization pass for PHP older than 5.4 
Added an optimization pass to convert FCALL_BY_NAME into DO_FCALL.
 2013-04-18 22:26:37 +04:00
Dmitry Stogov
60a59d27b4 Disable FCALL optimization pass for PHP older than 5.4 2013-04-18 22:22:48 +04:00
Dmitry Stogov
edfeab8bf2 Added an optimization pass to convert FCALL_BY_NAME into DO_FCALL. 2013-04-18 22:12:31 +04:00
Dmitry Stogov
7deb3d41eb Merge branch 'PHP-5.5' into PHP-5.5-opcache 
* PHP-5.5:
  Fixed compiler warning "cast from pointer to integer of different size"
 2013-04-18 14:19:17 +04:00
Xinchen Hui
0acdeec743 Merge branch 'PHP-5.5' 2013-04-18 17:33:21 +08:00
Xinchen Hui
0704e4badb Fixed compiler warning "cast from pointer to integer of different size" 2013-04-18 17:32:46 +08:00
Dmitry Stogov
745531b120 Merge identical constants (and related cache_slots) in op_array->literals table. 2013-04-18 10:50:40 +04:00
Dmitry Stogov
2bfb523f45 Merge identical constants (and related cache_slots) in op_array->literals table. 2013-04-18 10:48:16 +04:00
Dmitry Stogov
36d343c0c4 Merge branch 'PHP-5.5' into PHP-5.5-opcache 
* PHP-5.5:
  Initialize literals hash_value and cache_slot
  Added curl config test for windows
  updated lib versions
  updated lib versions
  fixed EOL
  updated lib versions
  allow lcov 1.10
  allow lcov 1.10

Conflicts:
	ext/opcache/Optimizer/zend_optimizer.c
 2013-04-17 21:32:08 +04:00
Dmitry Stogov
bc959fbaff Merge branch 'PHP-5.5' 
* PHP-5.5:
  Initialize literals hash_value and cache_slot

Conflicts:
	ext/opcache/Optimizer/zend_optimizer.c
 2013-04-17 21:27:19 +04:00
Dmitry Stogov
5a897009a8 Initialize literals hash_value and cache_slot 2013-04-17 21:19:56 +04:00
Anatol Belski
cd3dc3308b Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added curl config test for windows
 2013-04-17 14:26:26 +02:00
Anatol Belski
2d9cbf720d Added curl config test for windows 2013-04-17 14:25:45 +02:00
Dmitry Stogov
e16f24327d Merge branch 'PHP-5.5' into PHP-5.5-opcache 
* PHP-5.5:
  allow lcov 1.10
  Fixed bug (Wrong ce cached)
  apply change from opcache readme to php.ini
  lucky that the name is not used, fix name of encoder
 2013-04-15 12:09:02 +04:00
Dmitry Stogov
a0e3ca1c98 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Fixed bug (Wrong ce cached)
  apply change from opcache readme to php.ini
  lucky that the name is not used, fix name of encoder
 2013-04-11 15:32:54 +04:00
Dmitry Stogov
a78c7a4206 Added script level constant replacement 2013-04-11 15:31:35 +04:00
Dmitry Stogov
276847caba Added script level constant replacement 2013-04-11 15:18:35 +04:00
Pierre Joye
e2f3c7f2bc Merge branch 'PHP-5.5' 
* PHP-5.5:
  lucky that the name is not used, fix name of encoder
 2013-04-11 07:08:58 +02:00