]>
granicus.if.org Git - php/log
Remi Collet [Mon, 22 Apr 2013 15:48:43 +0000 (17:48 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported
Remi Collet [Mon, 22 Apr 2013 15:48:28 +0000 (17:48 +0200)]
temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported
Remi Collet [Mon, 22 Apr 2013 15:39:54 +0000 (17:39 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
overflow2 is not exported by system libgd
Remi Collet [Mon, 22 Apr 2013 15:39:35 +0000 (17:39 +0200)]
overflow2 is not exported by system libgd
Dmitry Stogov [Mon, 22 Apr 2013 11:40:46 +0000 (15:40 +0400)]
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]).
Dmitry Stogov [Mon, 22 Apr 2013 11:39:50 +0000 (15:39 +0400)]
Fixed linkage with C++
Xinchen Hui [Sun, 21 Apr 2013 03:10:41 +0000 (11:10 +0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Xinchen Hui [Sun, 21 Apr 2013 03:09:18 +0000 (11:09 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Antonio Diaz Ruiz [Mon, 15 Apr 2013 21:30:58 +0000 (23:30 +0200)]
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.
Xinchen Hui [Sun, 21 Apr 2013 03:04:27 +0000 (11:04 +0800)]
Merge branch 'master' of https://github.com/dejalatele/php-src
Pierre Joye [Sat, 20 Apr 2013 16:24:04 +0000 (18:24 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Pierre Joye [Sat, 20 Apr 2013 16:23:21 +0000 (18:23 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix x64 opcache, still uses fugly fixed addresses, see TODO entry for explanaton
Pierre Joye [Sat, 20 Apr 2013 16:22:39 +0000 (18:22 +0200)]
fix x64 opcache, still uses fugly fixed addresses, see TODO entry for explanaton
Antonio Diaz Ruiz [Sat, 20 Apr 2013 14:37:45 +0000 (16:37 +0200)]
Merge branch 'master' of https://github.com/dejalatele/php-src
Antonio Diaz Ruiz [Mon, 15 Apr 2013 21:30:58 +0000 (23:30 +0200)]
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.
Xinchen Hui [Sat, 20 Apr 2013 07:24:48 +0000 (15:24 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Sat, 20 Apr 2013 07:24:18 +0000 (15:24 +0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Xinchen Hui [Sat, 20 Apr 2013 07:23:49 +0000 (15:23 +0800)]
Fixed bug #64677 (execution operator `` stealing surrounding arguments)
Dmitry Stogov [Fri, 19 Apr 2013 17:44:00 +0000 (21:44 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed 5.2 ZTS build
Dmitry Stogov [Fri, 19 Apr 2013 17:37:24 +0000 (21:37 +0400)]
Fixed 5.2 ZTS build
Andrey Hristov [Fri, 19 Apr 2013 14:47:47 +0000 (16:47 +0200)]
Merge branch 'PHP-5.5'
Andrey Hristov [Fri, 19 Apr 2013 14:29:53 +0000 (16:29 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Fri, 19 Apr 2013 13:55:46 +0000 (15:55 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
Andrey Hristov [Fri, 19 Apr 2013 13:54:35 +0000 (15:54 +0200)]
lower the limit, should fit in a byte
Dmitry Stogov [Fri, 19 Apr 2013 06:48:46 +0000 (10:48 +0400)]
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
Dmitry Stogov [Fri, 19 Apr 2013 06:48:21 +0000 (10:48 +0400)]
Fixed ZTS build
Dmitry Stogov [Fri, 19 Apr 2013 06:43:00 +0000 (10:43 +0400)]
Fixed ZTS build
Xinchen Hui [Fri, 19 Apr 2013 03:06:38 +0000 (11:06 +0800)]
Fix other typos & add test script
Xinchen Hui [Fri, 19 Apr 2013 02:55:11 +0000 (10:55 +0800)]
Fix typo
Felipe Pena [Thu, 18 Apr 2013 22:27:02 +0000 (19:27 -0300)]
- Fixed ZTS build
Dmitry Stogov [Thu, 18 Apr 2013 18:26:37 +0000 (22:26 +0400)]
Disable FCALL optimization pass for PHP older than 5.4
Added an optimization pass to convert FCALL_BY_NAME into DO_FCALL.
Dmitry Stogov [Thu, 18 Apr 2013 18:22:48 +0000 (22:22 +0400)]
Disable FCALL optimization pass for PHP older than 5.4
Dmitry Stogov [Thu, 18 Apr 2013 18:12:31 +0000 (22:12 +0400)]
Added an optimization pass to convert FCALL_BY_NAME into DO_FCALL.
Dmitry Stogov [Thu, 18 Apr 2013 10:19:17 +0000 (14:19 +0400)]
Merge branch 'PHP-5.5' into PHP-5.5-opcache
* PHP-5.5:
Fixed compiler warning "cast from pointer to integer of different size"
Xinchen Hui [Thu, 18 Apr 2013 09:33:21 +0000 (17:33 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Thu, 18 Apr 2013 09:32:46 +0000 (17:32 +0800)]
Fixed compiler warning "cast from pointer to integer of different size"
Dmitry Stogov [Thu, 18 Apr 2013 07:54:27 +0000 (11:54 +0400)]
Optimizer may hide some repeating error messages
Dmitry Stogov [Thu, 18 Apr 2013 07:53:44 +0000 (11:53 +0400)]
Optimizer may hide some repeating error messages
Dmitry Stogov [Thu, 18 Apr 2013 06:50:40 +0000 (10:50 +0400)]
Merge identical constants (and related cache_slots) in op_array->literals table.
Dmitry Stogov [Thu, 18 Apr 2013 06:48:16 +0000 (10:48 +0400)]
Merge identical constants (and related cache_slots) in op_array->literals table.
Antonio Diaz Ruiz [Wed, 17 Apr 2013 21:06:36 +0000 (23:06 +0200)]
Fixs the name of the variable in the assertion
Antonio Diaz Ruiz [Wed, 17 Apr 2013 20:30:04 +0000 (22:30 +0200)]
Using absolute path to get the file note.xml
Antonio Diaz Ruiz [Wed, 17 Apr 2013 20:09:05 +0000 (22:09 +0200)]
Fix the path of the book.xml file
Dmitry Stogov [Wed, 17 Apr 2013 17:32:08 +0000 (21:32 +0400)]
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
Dmitry Stogov [Wed, 17 Apr 2013 17:27:19 +0000 (21:27 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Initialize literals hash_value and cache_slot
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
Dmitry Stogov [Wed, 17 Apr 2013 17:19:56 +0000 (21:19 +0400)]
Initialize literals hash_value and cache_slot
Anatol Belski [Wed, 17 Apr 2013 12:26:26 +0000 (14:26 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Added curl config test for windows
Anatol Belski [Wed, 17 Apr 2013 12:25:45 +0000 (14:25 +0200)]
Added curl config test for windows
Anatol Belski [Wed, 17 Apr 2013 11:21:20 +0000 (13:21 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
updated lib versions
updated lib versions
fixed EOL
updated lib versions
allow lcov 1.10
allow lcov 1.10
allow lcov 1.10
Anatol Belski [Wed, 17 Apr 2013 11:20:46 +0000 (13:20 +0200)]
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
Anatol Belski [Wed, 17 Apr 2013 11:20:23 +0000 (13:20 +0200)]
updated lib versions
Anatol Belski [Wed, 17 Apr 2013 11:18:00 +0000 (13:18 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
updated lib versions
allow lcov 1.10
Anatol Belski [Wed, 17 Apr 2013 11:17:32 +0000 (13:17 +0200)]
updated lib versions
Anatol Belski [Wed, 17 Apr 2013 11:15:08 +0000 (13:15 +0200)]
fixed EOL
Anatol Belski [Wed, 17 Apr 2013 11:12:18 +0000 (13:12 +0200)]
updated lib versions
Antonio Diaz Ruiz [Mon, 15 Apr 2013 21:30:58 +0000 (23:30 +0200)]
PHP tests to check the DOM_NOT_FOUND error message is properly raised by the DOMNode::insertBefore method
Dmitry Stogov [Mon, 15 Apr 2013 08:09:02 +0000 (12:09 +0400)]
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
Nuno Lopes [Sat, 13 Apr 2013 20:56:30 +0000 (16:56 -0400)]
allow lcov 1.10
Nuno Lopes [Sat, 13 Apr 2013 20:56:30 +0000 (16:56 -0400)]
allow lcov 1.10
Nuno Lopes [Sat, 13 Apr 2013 20:51:58 +0000 (16:51 -0400)]
allow lcov 1.10
Nuno Lopes [Sat, 13 Apr 2013 20:51:58 +0000 (16:51 -0400)]
allow lcov 1.10
Dmitry Stogov [Thu, 11 Apr 2013 11:32:54 +0000 (15:32 +0400)]
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
Dmitry Stogov [Thu, 11 Apr 2013 11:31:35 +0000 (15:31 +0400)]
Added script level constant replacement
Dmitry Stogov [Thu, 11 Apr 2013 11:18:35 +0000 (15:18 +0400)]
Added script level constant replacement
Xinchen Hui [Thu, 11 Apr 2013 06:29:51 +0000 (14:29 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Thu, 11 Apr 2013 06:29:09 +0000 (14:29 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 11 Apr 2013 06:28:42 +0000 (14:28 +0800)]
Fixed bug (Wrong ce cached)
Pierre Joye [Thu, 11 Apr 2013 05:08:58 +0000 (07:08 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
lucky that the name is not used, fix name of encoder
Pierre Joye [Thu, 11 Apr 2013 05:08:39 +0000 (07:08 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
lucky that the name is not used, fix name of encoder
Remi Collet [Thu, 11 Apr 2013 05:06:36 +0000 (07:06 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
apply change from opcache readme to php.ini
Remi Collet [Thu, 11 Apr 2013 05:05:56 +0000 (07:05 +0200)]
apply change from opcache readme to php.ini
Pierre Joye [Thu, 11 Apr 2013 04:58:04 +0000 (06:58 +0200)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Pierre Joye [Thu, 11 Apr 2013 04:42:38 +0000 (06:42 +0200)]
lucky that the name is not used, fix name of encoder
Dmitry Stogov [Wed, 10 Apr 2013 19:12:48 +0000 (23:12 +0400)]
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
Dmitry Stogov [Wed, 10 Apr 2013 19:12:25 +0000 (23:12 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
update NEWS
updated NEWS
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
Dmitry Stogov [Wed, 10 Apr 2013 19:11:35 +0000 (23:11 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Added opcache related entries
Dmitry Stogov [Wed, 10 Apr 2013 19:10:43 +0000 (23:10 +0400)]
Added opcache related entries
Anatol Belski [Wed, 10 Apr 2013 18:52:29 +0000 (20:52 +0200)]
Merge branch 'master' of git.php.net:php-src
Anatol Belski [Wed, 10 Apr 2013 18:51:58 +0000 (20:51 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Anatol Belski [Wed, 10 Apr 2013 18:51:32 +0000 (20:51 +0200)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Anatol Belski [Wed, 10 Apr 2013 18:50:57 +0000 (20:50 +0200)]
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
Anatol Belski [Wed, 10 Apr 2013 18:47:55 +0000 (20:47 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
update NEWS
updated NEWS
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
Anatol Belski [Wed, 10 Apr 2013 18:47:28 +0000 (20:47 +0200)]
update NEWS
Anatol Belski [Wed, 10 Apr 2013 18:45:28 +0000 (20:45 +0200)]
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
Anatol Belski [Wed, 10 Apr 2013 18:44:41 +0000 (20:44 +0200)]
updated NEWS
Anatol Belski [Wed, 10 Apr 2013 18:40:28 +0000 (20:40 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
Anatol Belski [Wed, 10 Apr 2013 18:39:17 +0000 (20:39 +0200)]
Fixed bug #64342 ZipArchive::addFile() has to check for file existence
Pierre Joye [Wed, 10 Apr 2013 18:15:03 +0000 (20:15 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Pierre Joye [Wed, 10 Apr 2013 18:14:46 +0000 (20:14 +0200)]
Merge branch 'master' of git.php.net:php-src
Pierre Joye [Wed, 10 Apr 2013 18:14:00 +0000 (20:14 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
add external 2.1 detection and fix gd_compat for 2.1+
Pierre Joye [Wed, 10 Apr 2013 18:13:46 +0000 (20:13 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add external 2.1 detection and fix gd_compat for 2.1+
Pierre Joye [Wed, 10 Apr 2013 18:13:18 +0000 (20:13 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
add external 2.1 detection and fix gd_compat for 2.1+
Pierre Joye [Wed, 10 Apr 2013 18:12:25 +0000 (20:12 +0200)]
add external 2.1 detection and fix gd_compat for 2.1+
Dmitry Stogov [Wed, 10 Apr 2013 17:42:50 +0000 (21:42 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Allow wilcards in opcache.blacklist_filename
Dmitry Stogov [Wed, 10 Apr 2013 17:41:30 +0000 (21:41 +0400)]
Allow wilcards in opcache.blacklist_filename
Dmitry Stogov [Wed, 10 Apr 2013 17:27:54 +0000 (21:27 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed support for PHP-5.3
Dmitry Stogov [Wed, 10 Apr 2013 17:27:06 +0000 (21:27 +0400)]
Fixed support for PHP-5.3
Dmitry Stogov [Wed, 10 Apr 2013 12:47:13 +0000 (16:47 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Added missing ARG_INFO
Dmitry Stogov [Wed, 10 Apr 2013 12:45:59 +0000 (16:45 +0400)]
Added missing ARG_INFO
Dmitry Stogov [Wed, 10 Apr 2013 11:34:36 +0000 (15:34 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Numeric string constants used as array indeces have to be converted to long at compile time