]> granicus.if.org Git - php/log
php
11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 24 Apr 2013 05:03:42 +0000 (22:03 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update credits

11 years agoupdate credits
Stanislav Malyshev [Wed, 24 Apr 2013 04:50:23 +0000 (21:50 -0700)]
update credits

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 24 Apr 2013 04:46:03 +0000 (21:46 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Stanislav Malyshev [Wed, 24 Apr 2013 04:43:55 +0000 (21:43 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #64458 (dns_get_record result with string of length -1)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 24 Apr 2013 04:45:10 +0000 (21:45 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #64458 (dns_get_record result with string of length -1)

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Stanislav Malyshev [Wed, 24 Apr 2013 04:43:55 +0000 (21:43 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #64458 (dns_get_record result with string of length -1)

11 years agoFix bug #64458 (dns_get_record result with string of length -1)
Stanislav Malyshev [Wed, 24 Apr 2013 04:42:15 +0000 (21:42 -0700)]
Fix bug #64458 (dns_get_record result with string of length -1)

11 years agoRemove curl wrappers
Pierrick Charron [Tue, 23 Apr 2013 21:01:17 +0000 (17:01 -0400)]
Remove curl wrappers

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Tue, 23 Apr 2013 19:59:00 +0000 (23:59 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.

Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Dmitry Stogov [Tue, 23 Apr 2013 19:55:47 +0000 (23:55 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.

Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

11 years agoFixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_stat...
Dmitry Stogov [Tue, 23 Apr 2013 19:43:23 +0000 (23:43 +0400)]
Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.

11 years agofix copy/paste in error message
Remi Collet [Tue, 23 Apr 2013 11:53:00 +0000 (13:53 +0200)]
fix copy/paste in error message

11 years agoenable WebP with system libgd when available
Remi Collet [Tue, 23 Apr 2013 11:46:10 +0000 (13:46 +0200)]
enable WebP with system libgd when available

11 years ago(re)allow WBMP detection with system libgd
Remi Collet [Tue, 23 Apr 2013 11:43:57 +0000 (13:43 +0200)]
(re)allow WBMP detection with system libgd
provide getbmi and skipheader not exported functions in gd_compat.

11 years agoarray_column() - Use entire subject array when NULL passed for second param.
Sara Golemon [Mon, 22 Apr 2013 23:19:21 +0000 (16:19 -0700)]
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.

11 years agoAllow array_column() to take -1 as a valid value in third param
Sara Golemon [Mon, 22 Apr 2013 21:57:05 +0000 (14:57 -0700)]
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.

11 years agoHarden array_column_basic.phpt against resource renumbering.
Sara Golemon [Mon, 22 Apr 2013 20:36:40 +0000 (13:36 -0700)]
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.

11 years agoupdated NEWS
Anatol Belski [Mon, 22 Apr 2013 16:59:47 +0000 (18:59 +0200)]
updated NEWS

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatol Belski [Mon, 22 Apr 2013 16:59:11 +0000 (18:59 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed stream_socket_pair() on Windows x64 and

11 years agoFixed stream_socket_pair() on Windows x64 and
Anatol Belski [Mon, 22 Apr 2013 16:53:52 +0000 (18:53 +0200)]
Fixed stream_socket_pair() on Windows x64 and

improved errorhandling in the socketpair() implementation.

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Derick Rethans [Mon, 22 Apr 2013 16:51:43 +0000 (17:51 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

11 years ago- Updated to version 2013.3 (2013c)
Derick Rethans [Mon, 22 Apr 2013 16:51:41 +0000 (17:51 +0100)]
- Updated to version 2013.3 (2013c)

11 years agoFix handling of double keys in array_column
Sara Golemon [Mon, 22 Apr 2013 05:21:40 +0000 (22:21 -0700)]
Fix handling of double keys in array_column

Also fix resource test to not localize __FILE__ to cwd.

11 years agoupdated NEWS
Anatol Belski [Mon, 22 Apr 2013 17:00:46 +0000 (19:00 +0200)]
updated NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Mon, 22 Apr 2013 17:00:13 +0000 (19:00 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated NEWS
  Fixed stream_socket_pair() on Windows x64 and

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Mon, 22 Apr 2013 16:51:47 +0000 (17:51 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agotemporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader...
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

11 years agooverflow2 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

11 years agoFixed linkage with C++
Dmitry Stogov [Mon, 22 Apr 2013 11:39:50 +0000 (15:39 +0400)]
Fixed linkage with C++

11 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Xinchen Hui [Sun, 21 Apr 2013 03:11:02 +0000 (11:11 +0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
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

11 years agoMerge branch 'PHP-5.4' 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

11 years agoIncludes 5 new phpTests to check that the error message DOM_NOT_FOUND is properly...
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.

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
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

11 years agofix 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

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into 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

11 years agoFixed bug #64677 (execution operator `` stealing surrounding arguments)
Xinchen Hui [Sat, 20 Apr 2013 07:23:49 +0000 (15:23 +0800)]
Fixed bug #64677 (execution operator `` stealing surrounding arguments)

11 years agoFixed 5.2 ZTS build
Dmitry Stogov [Fri, 19 Apr 2013 17:37:24 +0000 (21:37 +0400)]
Fixed 5.2 ZTS build

11 years agoMerge branch 'PHP-5.4' into 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

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Andrey Hristov [Fri, 19 Apr 2013 13:55:46 +0000 (15:55 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

11 years agolower the limit, should fit in a byte
Andrey Hristov [Fri, 19 Apr 2013 13:54:35 +0000 (15:54 +0200)]
lower the limit, should fit in a byte

11 years agoFixed compiler warning "cast from pointer to integer of different size"
Xinchen Hui [Thu, 18 Apr 2013 09:32:46 +0000 (17:32 +0800)]
Fixed compiler warning "cast from pointer to integer of different size"

11 years agoInitialize literals hash_value and cache_slot
Dmitry Stogov [Wed, 17 Apr 2013 17:19:56 +0000 (21:19 +0400)]
Initialize literals hash_value and cache_slot

11 years agoAdded curl config test for windows
Anatol Belski [Wed, 17 Apr 2013 12:25:45 +0000 (14:25 +0200)]
Added curl config test for windows

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoupdated lib versions
Anatol Belski [Wed, 17 Apr 2013 11:20:23 +0000 (13:20 +0200)]
updated lib versions

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

11 years agoupdated lib versions
Anatol Belski [Wed, 17 Apr 2013 11:17:32 +0000 (13:17 +0200)]
updated lib versions

11 years agofixed EOL
Anatol Belski [Wed, 17 Apr 2013 11:15:08 +0000 (13:15 +0200)]
fixed EOL

11 years agoupdated lib versions
Anatol Belski [Wed, 17 Apr 2013 11:12:18 +0000 (13:12 +0200)]
updated lib versions

11 years agoallow lcov 1.10
Nuno Lopes [Sat, 13 Apr 2013 20:56:30 +0000 (16:56 -0400)]
allow lcov 1.10

11 years agoallow lcov 1.10
Nuno Lopes [Sat, 13 Apr 2013 20:56:30 +0000 (16:56 -0400)]
allow lcov 1.10

11 years agoallow lcov 1.10
Nuno Lopes [Sat, 13 Apr 2013 20:51:58 +0000 (16:51 -0400)]
allow lcov 1.10

11 years agoMerge branch 'PHP-5.4' into 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

11 years agoFixed bug (Wrong ce cached)
Xinchen Hui [Thu, 11 Apr 2013 06:28:42 +0000 (14:28 +0800)]
Fixed bug (Wrong ce cached)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoapply 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

11 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
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

11 years agolucky that the name is not used, fix name of encoder
Pierre Joye [Thu, 11 Apr 2013 04:42:38 +0000 (06:42 +0200)]
lucky that the name is not used, fix name of encoder

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
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

11 years agoAdded opcache related entries
Dmitry Stogov [Wed, 10 Apr 2013 19:10:43 +0000 (23:10 +0400)]
Added opcache related entries

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
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

11 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
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

11 years agoMerge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
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

11 years agoupdate NEWS
Anatol Belski [Wed, 10 Apr 2013 18:47:28 +0000 (20:47 +0200)]
update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoupdated NEWS
Anatol Belski [Wed, 10 Apr 2013 18:44:41 +0000 (20:44 +0200)]
updated NEWS

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

11 years agoFixed 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

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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+

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
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+

11 years agoadd 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+

11 years agoAllow wilcards in opcache.blacklist_filename
Dmitry Stogov [Wed, 10 Apr 2013 17:41:30 +0000 (21:41 +0400)]
Allow wilcards in opcache.blacklist_filename

11 years agoFixed support for PHP-5.3
Dmitry Stogov [Wed, 10 Apr 2013 17:27:06 +0000 (21:27 +0400)]
Fixed support for PHP-5.3

11 years agoAdded missing ARG_INFO
Dmitry Stogov [Wed, 10 Apr 2013 12:45:59 +0000 (16:45 +0400)]
Added missing ARG_INFO

11 years agoNumeric string constants used as array indeces have to be converted to long at compil...
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

11 years agoMerge branch 'PHP-5.4' into 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

11 years agoPHP 5.4.14 release date
Johannes Schlüter [Wed, 10 Apr 2013 07:45:16 +0000 (09:45 +0200)]
PHP 5.4.14 release date

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 10 Apr 2013 07:44:34 +0000 (09:44 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

11 years agoPHP 5.3.24 release date
Johannes Schlüter [Wed, 10 Apr 2013 07:41:21 +0000 (09:41 +0200)]
PHP 5.3.24 release date

11 years agoFixed typo - inconsistent notice for undefined property (introduced by fix for #49348)
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)

11 years agoNEWS section for next beta
David Soria Parra [Tue, 9 Apr 2013 18:27:22 +0000 (20:27 +0200)]
NEWS section for next beta

11 years agoNEWS for PHP 5.5.0 Beta 3
David Soria Parra [Tue, 9 Apr 2013 18:26:58 +0000 (20:26 +0200)]
NEWS for PHP 5.5.0 Beta 3

11 years agoFixed CFG construction bugs
Dmitry Stogov [Tue, 9 Apr 2013 13:48:45 +0000 (17:48 +0400)]
Fixed CFG construction bugs

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
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)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

11 years agofix possible NULL deref
Pierre Joye [Tue, 9 Apr 2013 08:09:17 +0000 (10:09 +0200)]
fix possible NULL deref

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Pierre Joye [Tue, 9 Apr 2013 08:04:32 +0000 (10:04 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.4:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Pierre Joye [Tue, 9 Apr 2013 08:04:17 +0000 (10:04 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.3:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)

11 years agofix null deref
Pierre Joye [Tue, 9 Apr 2013 08:04:01 +0000 (10:04 +0200)]
fix null deref

11 years agoFixed ZTS build
Dmitry Stogov [Tue, 9 Apr 2013 08:03:41 +0000 (12:03 +0400)]
Fixed ZTS build

11 years agoFixed issue #26 (added opcache_invalidate(string $filename [, bool $force = false...
Dmitry Stogov [Tue, 9 Apr 2013 07:57:28 +0000 (11:57 +0400)]
Fixed issue #26 (added opcache_invalidate(string $filename [, bool $force = false]) function)

11 years agoFixed issue #82 (allow comments in blacklist file, lines started with ";")
Dmitry Stogov [Tue, 9 Apr 2013 06:51:19 +0000 (10:51 +0400)]
Fixed issue #82 (allow comments in blacklist file, lines started with ";")

11 years agows and comment for recommended aa method
Pierre Joye [Tue, 9 Apr 2013 05:04:52 +0000 (07:04 +0200)]
ws and comment for recommended aa method

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Pierre Joye [Tue, 9 Apr 2013 04:47:21 +0000 (06:47 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agofix some unitialized values and typo
Pierre Joye [Tue, 9 Apr 2013 04:44:45 +0000 (06:44 +0200)]
fix some unitialized values and typo

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Mon, 8 Apr 2013 14:24:20 +0000 (16:24 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch