]>
granicus.if.org Git - php/log
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.
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
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
Dmitry Stogov [Wed, 10 Apr 2013 11:33:08 +0000 (15:33 +0400)]
Numeric string constants used as array indeces have to be converted to long at compile time
Johannes Schlüter [Wed, 10 Apr 2013 07:48:37 +0000 (09:48 +0200)]
Merge branch 'PHP-5.5'
Johannes Schlüter [Wed, 10 Apr 2013 07:48:15 +0000 (09:48 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Wed, 10 Apr 2013 07:45:16 +0000 (09:45 +0200)]
PHP 5.4.14 release date
Johannes Schlüter [Wed, 10 Apr 2013 07:44:34 +0000 (09:44 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 10 Apr 2013 07:41:21 +0000 (09:41 +0200)]
PHP 5.3.24 release date
Xinchen Hui [Wed, 10 Apr 2013 05:48:38 +0000 (13:48 +0800)]
Merge branch 'PHP-5.5'
Michael Moravec [Tue, 9 Apr 2013 21:49:02 +0000 (23:49 +0200)]
Fixed typo - inconsistent notice for undefined property (introduced by fix for #49348)
David Soria Parra [Tue, 9 Apr 2013 18:34:50 +0000 (20:34 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
NEWS section for next beta
NEWS for PHP 5.5.0 Beta 3
David Soria Parra [Tue, 9 Apr 2013 18:27:22 +0000 (20:27 +0200)]
NEWS section for next beta
David Soria Parra [Tue, 9 Apr 2013 18:26:58 +0000 (20:26 +0200)]
NEWS for PHP 5.5.0 Beta 3
Dmitry Stogov [Tue, 9 Apr 2013 13:49:45 +0000 (17:49 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed CFG construction bugs
Dmitry Stogov [Tue, 9 Apr 2013 13:48:45 +0000 (17:48 +0400)]
Fixed CFG construction bugs
Dmitry Stogov [Tue, 9 Apr 2013 08:11:26 +0000 (12:11 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
fix possible NULL deref
Dmitry Stogov [Tue, 9 Apr 2013 08:10:54 +0000 (12:10 +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:
fix possible NULL deref
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
Dmitry Stogov [Tue, 9 Apr 2013 08:10:06 +0000 (12:10 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
Pierre Joye [Tue, 9 Apr 2013 08:09:54 +0000 (10:09 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix possible NULL deref
Pierre Joye [Tue, 9 Apr 2013 08:09:47 +0000 (10:09 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix possible NULL deref
Pierre Joye [Tue, 9 Apr 2013 08:09:36 +0000 (10:09 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix possible NULL deref
Dmitry Stogov [Tue, 9 Apr 2013 08:09:33 +0000 (12:09 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed ZTS build
Pierre Joye [Tue, 9 Apr 2013 08:09:17 +0000 (10:09 +0200)]
fix possible NULL deref
Pierre Joye [Tue, 9 Apr 2013 08:06:49 +0000 (10:06 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Pierre Joye [Tue, 9 Apr 2013 08:06:00 +0000 (10:06 +0200)]
Merge branch 'master' of git.php.net:php-src
Pierre Joye [Tue, 9 Apr 2013 08:04:41 +0000 (10:04 +0200)]
Merge branch 'PHP-5.5'
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.5:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)