]> granicus.if.org Git - php/log
php
11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Dmitry Stogov [Fri, 8 Nov 2013 12:36:31 +0000 (16:36 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).

Conflicts:
NEWS

11 years agoFixed issue #115 (path issue when using phar).
Dmitry Stogov [Fri, 8 Nov 2013 12:35:05 +0000 (16:35 +0400)]
Fixed issue #115 (path issue when using phar).
Fixed issue #149 (Phar mount points not working with OPcache enabled).

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Dmitry Stogov [Fri, 8 Nov 2013 10:15:41 +0000 (14:15 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Added tests for PHAR/OPCahce incompatibilities
  Update NEWS
  Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
  Update NEWS
  Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
  NEWS entry
  NEWS entry

Conflicts:
NEWS

11 years agoAdded tests for PHAR/OPCahce incompatibilities
Dmitry Stogov [Fri, 8 Nov 2013 09:50:57 +0000 (13:50 +0400)]
Added tests for PHAR/OPCahce incompatibilities

11 years agoUpdate NEWS
Xinchen Hui [Fri, 8 Nov 2013 07:33:49 +0000 (15:33 +0800)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Fri, 8 Nov 2013 07:33:27 +0000 (15:33 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed bug #65947 (basename is no more working after fgetcsv in certain situation)
Xinchen Hui [Fri, 8 Nov 2013 07:32:28 +0000 (15:32 +0800)]
Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)

previous codes: "#define php_mblen(ptr, len) ((ptr) == NULL ? mbsinit(&BG(mblen_state)):
(int)mbrlen(ptr, len, &BG(mblen_state)))#

it use mbsinit there, seems try to initialize the mblen_state, but:
"This function does not change the state identified by ps. Typical ways
to make the state pointed by ps an initial state are:

memset (ps,0,sizeof(*ps));  // ps points to zero-valued object
"
http://www.cplusplus.com/reference/cwchar/mbsinit/?kw=mbsinit

11 years agoUpdate NEWS
Xinchen Hui [Fri, 8 Nov 2013 07:08:07 +0000 (15:08 +0800)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Fri, 8 Nov 2013 07:07:43 +0000 (15:07 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed Bug #66043 (Segfault calling bind_param() on mysqli)
Xinchen Hui [Fri, 8 Nov 2013 07:06:36 +0000 (15:06 +0800)]
Fixed Bug #66043 (Segfault calling bind_param() on mysqli)

Although the doc said it is (unsigned int *), but it is ulong* in the
libmysql 5.0 's source codes

11 years agoNEWS entry
Rasmus Lerdorf [Fri, 8 Nov 2013 02:16:12 +0000 (18:16 -0800)]
NEWS entry

11 years agoNEWS entry
Rasmus Lerdorf [Fri, 8 Nov 2013 02:15:15 +0000 (18:15 -0800)]
NEWS entry

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Rasmus Lerdorf [Fri, 8 Nov 2013 02:09:53 +0000 (18:09 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Rasmus Lerdorf [Fri, 8 Nov 2013 02:09:15 +0000 (18:09 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings

Conflicts:
ext/pdo/pdo_sql_parser.c

11 years agoFix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
Rasmus Lerdorf [Fri, 8 Nov 2013 02:05:08 +0000 (18:05 -0800)]
Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings

11 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Rasmus Lerdorf [Thu, 7 Nov 2013 15:55:26 +0000 (07:55 -0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src: (65 commits)
  Add a couple more test cases to parse_url() tests
  fix missing change from 'tcp_socket' to the more common 'server'
  fix many parallel test issues
  Cleanup temp test file
  Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
  Typo fix: umknown -> unknown
  Fix bug #66008
  5.4.23-dev
  Update NEWS
  Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
  add bundled libzip LICENSE, as required by BSD License terms
  - Updated to version 2013.8 (2013h)
  remove "PHP 6" staff
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
  - Updated to version 2013.7 (2013g)
  Fix Coverity issue reporting wrong sizeof()
  exif NEWS
  add tests for bug #62523
  Merged PR #293 (Exif crash on unknown encoding was fixed) By:  Draal Conflicts:  configure.in  main/php_version.h
  Just SKIP that test on travis
  ...

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Rasmus Lerdorf [Thu, 7 Nov 2013 15:54:08 +0000 (07:54 -0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Add a couple more test cases to parse_url() tests
  fix missing change from 'tcp_socket' to the more common 'server'
  fix many parallel test issues
  Cleanup temp test file
  Revert "Fixed issue #115 (path issue when using phar)."
  Remove outdate codes, make it clearer, although just a bit..
  Update NEWS
  Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
  Fixed coredump due to abnormal implemention of phar
  Typo fix: umknown -> unknown
  Fix bug #66008
  5.4.23-dev
  remove "PHP 6" staff

11 years agobump API versions
Ferenc Kovacs [Wed, 6 Nov 2013 10:17:58 +0000 (11:17 +0100)]
bump API versions

11 years agoMerge branch 'PHP-5.5'
Ferenc Kovacs [Wed, 6 Nov 2013 09:47:45 +0000 (10:47 +0100)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Ferenc Kovacs [Wed, 6 Nov 2013 09:46:34 +0000 (10:46 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
ext/spl/tests/SplFileObject_rewind_error001.phpt

11 years agoAdd a couple more test cases to parse_url() tests
Sara Golemon [Wed, 10 Jul 2013 15:26:47 +0000 (08:26 -0700)]
Add a couple more test cases to parse_url() tests

http://::# (valid but silly)
http://#   (invalid)

11 years agofix missing change from 'tcp_socket' to the more common 'server'
ptarjan [Thu, 26 Sep 2013 08:06:36 +0000 (01:06 -0700)]
fix missing change from 'tcp_socket' to the more common 'server'

11 years agofix many parallel test issues
ptarjan [Thu, 26 Sep 2013 07:18:05 +0000 (00:18 -0700)]
fix many parallel test issues

While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.

Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.

11 years agoCleanup temp test file
Christopher Jones [Wed, 10 Jul 2013 18:17:52 +0000 (11:17 -0700)]
Cleanup temp test file

11 years agoMerge branch 'PHP-5.5'
Xinchen Hui [Wed, 6 Nov 2013 09:01:24 +0000 (17:01 +0800)]
Merge branch 'PHP-5.5'

Conflicts:
ext/opcache/ZendAccelerator.c

11 years agoRevert "Fixed issue #115 (path issue when using phar)."
Xinchen Hui [Wed, 6 Nov 2013 08:53:45 +0000 (16:53 +0800)]
Revert "Fixed issue #115 (path issue when using phar)."

We need another better way to fix this

This reverts commit 098855433dc5d609e3970f0bc9d6766c007273f3.

Conflicts:
ext/opcache/ZendAccelerator.c

11 years agoUpdate LiteSpeed SAPI code to V6.4
George Wang [Tue, 5 Nov 2013 21:14:49 +0000 (16:14 -0500)]
Update LiteSpeed SAPI code to V6.4

11 years agoFixed typo in Makefile.frag
George Wang [Tue, 5 Nov 2013 20:38:08 +0000 (15:38 -0500)]
Fixed typo in Makefile.frag

11 years agoupdated NEWS
Anatol Belski [Tue, 5 Nov 2013 18:54:50 +0000 (19:54 +0100)]
updated NEWS

11 years agoMerge branch 'pull-request/500'
Anatol Belski [Tue, 5 Nov 2013 18:23:23 +0000 (19:23 +0100)]
Merge branch 'pull-request/500'

* pull-request/500:
  limit virtual_cwd_activate() duplicated call to ZTS only
  reverted the previous commit, both calls are needed in TS mode
  virtual_cwd_activate() should be called only in one place
  back to do_alloca()
  removed unnecessary call
  simplify the state free macros
  compact the code to preserve the error info after state freeing
  back to do_alloca(), reverted the wrong replacement
  enabled windows to use stack in both ts/nts mode, some more fixes
  moved to do_alloca() usage where appropriate
  fixed invalid free
  fixed virtual cwd header in phar
  updated NEWS
  fixed all the places where last error could be lost
  preserve the error code
  applied and fixed the original patch
  initial move on renaming files and fixing includes

Conflicts:
ext/opcache/ZendAccelerator.c

11 years agoMerge branch 'PHP-5.5'
Xinchen Hui [Tue, 5 Nov 2013 11:29:13 +0000 (19:29 +0800)]
Merge branch 'PHP-5.5'

Conflicts:
ext/phar/phar_internal.h
ext/phar/stream.c
ext/phar/util.c

11 years agoRemove outdate codes, make it clearer, although just a bit..
Xinchen Hui [Tue, 5 Nov 2013 10:47:12 +0000 (18:47 +0800)]
Remove outdate codes, make it clearer, although just a bit..

11 years agoMerge branch 'PHP-5.5'
Xinchen Hui [Tue, 5 Nov 2013 03:09:08 +0000 (11:09 +0800)]
Merge branch 'PHP-5.5'

11 years agoUpdate NEWS
Xinchen Hui [Tue, 5 Nov 2013 03:08:55 +0000 (11:08 +0800)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Tue, 5 Nov 2013 03:08:09 +0000 (11:08 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
configure.in
ext/mysqlnd/mysqlnd.c
main/php_version.h

11 years agoFixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an...
Xinchen Hui [Tue, 5 Nov 2013 03:04:55 +0000 (11:04 +0800)]
Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)

I know zend_call_function will initilize retval_ptr_ptr, but still set
it to NULL explict is more readable

11 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Xinchen Hui [Tue, 5 Nov 2013 03:03:47 +0000 (11:03 +0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

11 years agoMerge branch 'master' of git.php.net:php-src
Pierre Joye [Mon, 4 Nov 2013 21:26:40 +0000 (22:26 +0100)]
Merge branch 'master' of git.php.net:php-src

# By Remi Collet (2) and Xinchen Hui (2)
# Via Xinchen Hui (5) and Remi Collet (1)
* 'master' of git.php.net:php-src:
  NEWS + UPGRADING
  Sync ext/zip with pecl/zip version 1.3.2 - update libzip to version 1.11.1. We don't use any private symbol anymore - new method ZipArchive::setPassword($password) - add --with-libzip option to build with system libzip
  Fixed coredump due to abnormal implemention of phar
  remove "PHP 6" staff

11 years agoNEWS + UPGRADING
Remi Collet [Mon, 4 Nov 2013 12:32:45 +0000 (13:32 +0100)]
NEWS + UPGRADING

11 years agoSync ext/zip with pecl/zip version 1.3.2
Remi Collet [Mon, 4 Nov 2013 12:23:36 +0000 (13:23 +0100)]
Sync ext/zip with pecl/zip version 1.3.2
- update libzip to version 1.11.1. We don't use any private symbol anymore
- new method ZipArchive::setPassword($password)
- add --with-libzip option to build with system libzip

11 years agoMerge branch 'master' of git.php.net:php-src
Xinchen Hui [Mon, 4 Nov 2013 06:47:34 +0000 (14:47 +0800)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Xinchen Hui [Mon, 4 Nov 2013 06:47:16 +0000 (14:47 +0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agoMerge branch 'PHP-5.5'
Xinchen Hui [Mon, 4 Nov 2013 06:43:30 +0000 (14:43 +0800)]
Merge branch 'PHP-5.5'

11 years agoFixed coredump due to abnormal implemention of phar
Xinchen Hui [Mon, 4 Nov 2013 06:42:54 +0000 (14:42 +0800)]
Fixed coredump due to abnormal implemention of phar

11 years agoFix English here
Rasmus Lerdorf [Sat, 2 Nov 2013 17:46:37 +0000 (10:46 -0700)]
Fix English here

11 years agolimit virtual_cwd_activate() duplicated call to ZTS only
Anatol Belski [Sat, 2 Nov 2013 12:32:31 +0000 (13:32 +0100)]
limit virtual_cwd_activate() duplicated call to ZTS only

11 years agoreverted the previous commit, both calls are needed in TS mode
Anatol Belski [Fri, 1 Nov 2013 00:20:57 +0000 (01:20 +0100)]
reverted the previous commit, both calls are needed in TS mode

11 years agovirtual_cwd_activate() should be called only in one place
Anatol Belski [Thu, 31 Oct 2013 23:56:22 +0000 (00:56 +0100)]
virtual_cwd_activate() should be called only in one place

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Rasmus Lerdorf [Thu, 31 Oct 2013 23:23:38 +0000 (16:23 -0700)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src: (107 commits)
  Typo fix: umknown -> unknown
  add news entry about FPM backlog change
  Fix bug #66008
  updated libs_versions.txt
  Update NEWS
  Update NEWS
  Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
  add bundled libzip LICENSE, as required by BSD License terms
  - Updated to version 2013.8 (2013h)
  Use zval* instead of zval**
  Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
  Improved performance of array_merge() by eliminating useless copying
  Improved performance of func_get_args() by eliminating useless copying
  Link to more readmes
  increase backlog to the highest value everywhere
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
  - Updated to version 2013.7 (2013g)
  Increment version number, since this will be 5.5.6.
  Added Zend Debugger to the note about the load order (by trash4you at online dot de)
  ...

11 years agoTypo fix: umknown -> unknown
Lior Kaplan [Thu, 31 Oct 2013 21:12:41 +0000 (23:12 +0200)]
Typo fix: umknown -> unknown

11 years agoTypo fix: umknown -> unknown
Martin Hujer [Thu, 31 Oct 2013 20:59:42 +0000 (22:59 +0200)]
Typo fix: umknown -> unknown

11 years agoback to do_alloca()
Anatol Belski [Thu, 31 Oct 2013 20:42:55 +0000 (21:42 +0100)]
back to do_alloca()

11 years agoremoved unnecessary call
Anatol Belski [Thu, 31 Oct 2013 20:38:24 +0000 (21:38 +0100)]
removed unnecessary call

11 years agosimplify the state free macros
Anatol Belski [Thu, 31 Oct 2013 16:39:17 +0000 (17:39 +0100)]
simplify the state free macros

11 years agoadd news entry about FPM backlog change
Antony Dovgal [Thu, 31 Oct 2013 11:04:33 +0000 (15:04 +0400)]
add news entry about FPM backlog change

and move the other entry to its proper place

11 years agoMerge branch 'PHP-5.5'
Rasmus Lerdorf [Thu, 31 Oct 2013 10:18:36 +0000 (03:18 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix bug #66008

11 years agoFix bug #66008
Rasmus Lerdorf [Thu, 31 Oct 2013 10:18:07 +0000 (03:18 -0700)]
Fix bug #66008

11 years agoFix bug #66008
Rasmus Lerdorf [Thu, 31 Oct 2013 10:06:35 +0000 (03:06 -0700)]
Fix bug #66008

11 years agoRemoved unnecessary GC checks
Dmitry Stogov [Thu, 31 Oct 2013 07:33:39 +0000 (11:33 +0400)]
Removed unnecessary GC checks

11 years agoAdd crypt() change in UPGRADING
Yasuo Ohgaki [Wed, 30 Oct 2013 22:28:43 +0000 (07:28 +0900)]
Add crypt() change in UPGRADING

11 years agocompact the code to preserve the error info after state freeing
Anatol Belski [Wed, 30 Oct 2013 19:46:08 +0000 (20:46 +0100)]
compact the code to preserve the error info after state freeing

11 years agoback to do_alloca(), reverted the wrong replacement
Anatol Belski [Wed, 30 Oct 2013 19:13:14 +0000 (20:13 +0100)]
back to do_alloca(), reverted the wrong replacement

11 years agoMerge branch 'pull-request/287'
Sherif Ramadan [Wed, 30 Oct 2013 13:36:19 +0000 (09:36 -0400)]
Merge branch 'pull-request/287'

Add ability to use array keys with array_filter().
This adds a third (optional) argument to array_filter() that will determine
what gets passed to the callback, the array key, value or both.
The third argument can be one of two constants: ARRAY_FILTER_USE_BOTH or,
ARRAY_FILTER_USE_KEY.

11 years ago5.4.23-dev
Stanislav Malyshev [Wed, 30 Oct 2013 01:11:02 +0000 (18:11 -0700)]
5.4.23-dev

11 years agoFix bug #65997 by switching to Serializable for GMP
Nikita Popov [Tue, 29 Oct 2013 19:58:30 +0000 (20:58 +0100)]
Fix bug #65997 by switching to Serializable for GMP

Rather than using get_properties and __wakeup for serialization
the code now uses Serializable::serialize() and
Serializable::unserialize(). The get_properties handler is switched
to a get_debug_info handler. Thus get_gc will now return only
the normal properties and not do any modifications, thus fixing
the leak. This also avoids a $num property from being publicly
visible after the object was dumped or serialized, so that's an
extra plus.

11 years agoFix compile warning in GMP
Nikita Popov [Tue, 29 Oct 2013 19:07:34 +0000 (20:07 +0100)]
Fix compile warning in GMP

11 years agoFix ZTS build
Nikita Popov [Tue, 29 Oct 2013 19:01:37 +0000 (20:01 +0100)]
Fix ZTS build

11 years agoMerge branch 'bug50333' of github.com:weltling/php-src into bug50333
Anatol Belski [Tue, 29 Oct 2013 16:15:40 +0000 (17:15 +0100)]
Merge branch 'bug50333' of github.com:weltling/php-src into bug50333

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Tue, 29 Oct 2013 12:35:38 +0000 (13:35 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  updated libs_versions.txt

11 years agoupdated libs_versions.txt
Anatol Belski [Tue, 29 Oct 2013 12:35:02 +0000 (13:35 +0100)]
updated libs_versions.txt

11 years agoImplemented Change crypt() behavior w/o salt RFC
Yasuo Ohgaki [Tue, 29 Oct 2013 09:53:45 +0000 (18:53 +0900)]
Implemented Change crypt() behavior w/o salt RFC

11 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Yasuo Ohgaki [Tue, 29 Oct 2013 08:38:22 +0000 (17:38 +0900)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  add bundled libzip LICENSE, as required by BSD License terms

11 years agoMerge branch 'PHP-5.5'
Yasuo Ohgaki [Tue, 29 Oct 2013 08:30:58 +0000 (17:30 +0900)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed Bug 64760 var_export() does not use full precision for floating-point numbers

11 years agoMerge branch 'master' of git.php.net:php-src
Yasuo Ohgaki [Tue, 29 Oct 2013 08:30:47 +0000 (17:30 +0900)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src: (22 commits)
  add bundled libzip LICENSE, as required by BSD License terms
  Avoid copy in func_get_arg()
  - Updated to version 2013.8 (2013h)
  Use zval* instead of zval**
  Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
  Improved performance of array_merge() by eliminating useless copying
  Improved performance of func_get_args() by eliminating useless copying
  fix limitation of upload size == (U)INT_MAX in CGI
  Link to more readmes
  test commit
  increase backlog to the highest value everywhere
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
  - test3
  - test commit 2
  - test commit1
  ldap_escape() notes
  - Updated to version 2013.7 (2013g)
  Increment version number, since this will be 5.5.6.
  Added Zend Debugger to the note about the load order (by trash4you at online dot de)
  ...

11 years agoUpdate NEWS
Yasuo Ohgaki [Tue, 29 Oct 2013 08:29:53 +0000 (17:29 +0900)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Yasuo Ohgaki [Tue, 29 Oct 2013 08:28:35 +0000 (17:28 +0900)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update NEWS
  Fixed Bug 64760 var_export() does not use full precision for floating-point numbers

11 years agoUpdate NEWS
Yasuo Ohgaki [Tue, 29 Oct 2013 08:27:49 +0000 (17:27 +0900)]
Update NEWS

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Yasuo Ohgaki [Tue, 29 Oct 2013 08:24:48 +0000 (17:24 +0900)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  add bundled libzip LICENSE, as required by BSD License terms
  - Updated to version 2013.8 (2013h)
  Use zval* instead of zval**
  Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
  Improved performance of array_merge() by eliminating useless copying
  Improved performance of func_get_args() by eliminating useless copying
  Link to more readmes
  increase backlog to the highest value everywhere
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
  - Updated to version 2013.7 (2013g)
  Increment version number, since this will be 5.5.6.
  Added Zend Debugger to the note about the load order (by trash4you at online dot de)

11 years agoFixed Bug 64760 var_export() does not use full precision for floating-point numbers
Yasuo Ohgaki [Tue, 29 Oct 2013 08:24:23 +0000 (17:24 +0900)]
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Tue, 29 Oct 2013 08:02:58 +0000 (09:02 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  add bundled libzip LICENSE, as required by BSD License terms

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Tue, 29 Oct 2013 08:02:44 +0000 (09:02 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add bundled libzip LICENSE, as required by BSD License terms

11 years agoadd bundled libzip LICENSE, as required by BSD License terms
Remi Collet [Tue, 29 Oct 2013 08:02:24 +0000 (09:02 +0100)]
add bundled libzip LICENSE, as required by BSD License terms

11 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Yasuo Ohgaki [Tue, 29 Oct 2013 05:03:17 +0000 (14:03 +0900)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  - Updated to version 2013.8 (2013h)
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
  - Updated to version 2013.7 (2013g)

11 years agoAvoid copy in func_get_arg()
Nikita Popov [Mon, 28 Oct 2013 18:51:31 +0000 (19:51 +0100)]
Avoid copy in func_get_arg()

Complements dmitry's change to func_get_args()

11 years agoMerge branch 'PHP-5.5'
Derick Rethans [Mon, 28 Oct 2013 14:12:38 +0000 (15:12 +0100)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Mon, 28 Oct 2013 14:12:31 +0000 (15:12 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years ago- Updated to version 2013.8 (2013h)
Derick Rethans [Mon, 28 Oct 2013 14:12:30 +0000 (15:12 +0100)]
- Updated to version 2013.8 (2013h)

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Derick Rethans [Mon, 28 Oct 2013 14:09:13 +0000 (15:09 +0100)]
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
Derick Rethans [Mon, 28 Oct 2013 14:08:57 +0000 (15:08 +0100)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

11 years agoMerge branch 'master' of git.php.net:/php-src
Derick Rethans [Mon, 28 Oct 2013 14:02:37 +0000 (15:02 +0100)]
Merge branch 'master' of git.php.net:/php-src

11 years agoMerge branch 'PHP-5.5'
Dmitry Stogov [Mon, 28 Oct 2013 11:23:10 +0000 (15:23 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Use zval* instead of zval**

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

11 years agoUse zval* instead of zval**
Dmitry Stogov [Mon, 28 Oct 2013 10:44:07 +0000 (14:44 +0400)]
Use zval* instead of zval**

11 years agoMerge branch 'PHP-5.5'
Dmitry Stogov [Mon, 28 Oct 2013 10:22:05 +0000 (14:22 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)

Conflicts:
NEWS

11 years agoIncreased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
Dmitry Stogov [Mon, 28 Oct 2013 10:19:40 +0000 (14:19 +0400)]
Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Dmitry Stogov [Mon, 28 Oct 2013 09:50:04 +0000 (13:50 +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:
  increase backlog to the highest value everywhere
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters

Conflicts:
NEWS

11 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Mon, 28 Oct 2013 09:48:02 +0000 (13:48 +0400)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  increase backlog to the highest value everywhere
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters

11 years agoMerge branch 'PHP-5.5'
Dmitry Stogov [Mon, 28 Oct 2013 09:47:37 +0000 (13:47 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Improved performance of array_merge() by eliminating useless copying

Conflicts:
NEWS

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Antony Dovgal [Mon, 28 Oct 2013 09:47:13 +0000 (13:47 +0400)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Improved performance of func_get_args() by eliminating useless copying
  Link to more readmes
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Antony Dovgal [Mon, 28 Oct 2013 09:46:40 +0000 (13:46 +0400)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Improved performance of func_get_args() by eliminating useless copying
  fix limitation of upload size == (U)INT_MAX in CGI
  Link to more readmes
  test commit
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Yasuo Ohgaki [Mon, 28 Oct 2013 09:38:22 +0000 (18:38 +0900)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Improved performance of func_get_args() by eliminating useless copying
  Link to more readmes