1
0
mirror of https://github.com/php/php-src.git synced 2026-04-06 15:43:13 +02:00
Commit Graph

73553 Commits

Author SHA1 Message Date
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
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
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
6889a0d1f5 overflow2 is not exported by system libgd 2013-04-22 17:39:35 +02:00
Dmitry Stogov
13b039ff9a Fixed linkage with C++ 2013-04-22 15:39:50 +04: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
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
14d9f3450b fix x64 opcache, still uses fugly fixed addresses, see TODO entry for explanaton 2013-04-20 18:22:39 +02: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
c7cf9b68b6 Fixed 5.2 ZTS build 2013-04-19 21:37:24 +04: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
0704e4badb Fixed compiler warning "cast from pointer to integer of different size" 2013-04-18 17:32:46 +08:00
Dmitry Stogov
5a897009a8 Initialize literals hash_value and cache_slot 2013-04-17 21:19:56 +04:00
Anatol Belski
2d9cbf720d Added curl config test for windows 2013-04-17 14:25:45 +02:00
Anatol Belski
c76cdb8067 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated lib versions
  fixed EOL
  updated lib versions
  allow lcov 1.10
  allow lcov 1.10
2013-04-17 13:20:46 +02:00
Anatol Belski
ca425a67c4 updated lib versions 2013-04-17 13:20:23 +02:00
Anatol Belski
ecf76e2da8 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  updated lib versions
  allow lcov 1.10
2013-04-17 13:18:00 +02:00
Anatol Belski
fb955a613c updated lib versions 2013-04-17 13:17:32 +02:00
Anatol Belski
4fbe1173eb fixed EOL 2013-04-17 13:15:08 +02:00
Anatol Belski
323fdb9879 updated lib versions 2013-04-17 13:12:18 +02:00
Nuno Lopes
a9271a8b0d allow lcov 1.10 2013-04-13 16:57:25 -04:00
Nuno Lopes
e694d40963 allow lcov 1.10 2013-04-13 16:56:30 -04:00
Nuno Lopes
adc17bff57 allow lcov 1.10 2013-04-13 16:53:39 -04:00
Xinchen Hui
a5cfe57e08 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-11 14:29:09 +08:00
Xinchen Hui
ba292b037f Fixed bug (Wrong ce cached) 2013-04-11 14:28:42 +08:00
Pierre Joye
e71b794569 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  lucky that the name is not used, fix name of encoder
2013-04-11 07:08:39 +02:00
Remi Collet
6df1e8d3fe apply change from opcache readme to php.ini 2013-04-11 07:05:56 +02:00
Pierre Joye
4475dbf11d Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-04-11 06:58:04 +02:00
Pierre Joye
684f4d5272 lucky that the name is not used, fix name of encoder 2013-04-11 06:42:38 +02:00
Dmitry Stogov
88e14d01bf Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  update NEWS
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 23:12:48 +04:00
Dmitry Stogov
193e1865ad Added opcache related entries 2013-04-10 23:10:43 +04:00
Anatol Belski
7133eee5f2 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-10 20:51:58 +02:00
Anatol Belski
b6d54faa92 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-04-10 20:51:32 +02:00
Anatol Belski
56b028e590 Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3 2013-04-10 20:50:57 +02:00
Anatol Belski
fc658f442d update NEWS 2013-04-10 20:47:28 +02:00
Anatol Belski
0655ab7c26 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:45:28 +02:00
Anatol Belski
782085bbfb updated NEWS 2013-04-10 20:44:41 +02:00
Anatol Belski
ceb5b684e0 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:40:28 +02:00