]> granicus.if.org Git - php/log
php
11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Adam Harvey [Sun, 10 Nov 2013 21:11:28 +0000 (16:11 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update NEWS and remove the unnecessary UPGRADING note.
  UPGRADING and NEWS
  Better test: Check combined leading/trailing
  Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")

11 years agoUpdate NEWS and remove the unnecessary UPGRADING note.
Adam Harvey [Sun, 10 Nov 2013 20:46:31 +0000 (15:46 -0500)]
Update NEWS and remove the unnecessary UPGRADING note.

11 years agoMerge remote-tracking branch 'ajf/JSONWhitespaceFix' into PHP-5.4
Adam Harvey [Sun, 10 Nov 2013 20:43:56 +0000 (15:43 -0500)]
Merge remote-tracking branch 'ajf/JSONWhitespaceFix' into PHP-5.4

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Rasmus Lerdorf [Sat, 9 Nov 2013 17:46:43 +0000 (09:46 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix broken test

11 years agoFix broken test
Rasmus Lerdorf [Sat, 9 Nov 2013 17:45:52 +0000 (09:45 -0800)]
Fix broken test

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 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.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 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 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 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 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 '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 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 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 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 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 ago5.4.23-dev
Stanislav Malyshev [Wed, 30 Oct 2013 01:11:02 +0000 (18:11 -0700)]
5.4.23-dev

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 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 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.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 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 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 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 '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 '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

11 years agoImproved performance of array_merge() by eliminating useless copying
Dmitry Stogov [Mon, 28 Oct 2013 09:31:44 +0000 (13:31 +0400)]
Improved performance of array_merge() by eliminating useless copying

11 years agoImproved performance of func_get_args() by eliminating useless copying
Dmitry Stogov [Mon, 28 Oct 2013 09:17:55 +0000 (13:17 +0400)]
Improved performance of func_get_args() by eliminating useless copying

11 years agoLink to more readmes
Hannes Magnusson [Sun, 27 Oct 2013 23:40:37 +0000 (16:40 -0700)]
Link to more readmes

11 years agoincrease backlog to the highest value everywhere
Antony Dovgal [Sun, 27 Oct 2013 18:54:47 +0000 (22:54 +0400)]
increase backlog to the highest value everywhere

It makes no sense to use -1 for *BSD (which is the highest value there)
and still use 128 for Linux.
Lets raise it right to up the limit and let the people lower it if they
think that 3.5Mb is too much for a process.
IMO this is better than silently dropping connections.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Sun, 27 Oct 2013 08:53:13 +0000 (16:53 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Xinchen Hui [Sun, 27 Oct 2013 08:53:05 +0000 (16:53 +0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

11 years agoremove "PHP 6" staff
Xinchen Hui [Sun, 27 Oct 2013 08:52:43 +0000 (16:52 +0800)]
remove "PHP 6" staff

11 years agoUpdate NEWS
Yasuo Ohgaki [Sat, 26 Oct 2013 01:42:55 +0000 (10:42 +0900)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Yasuo Ohgaki [Sat, 26 Oct 2013 01:42:18 +0000 (10:42 +0900)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  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 [Sat, 26 Oct 2013 01:41:53 +0000 (10:41 +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:
  Increment version number, since this will be 5.5.6.

11 years agoFixed bug #65950 Field name truncation if the field name is bigger than 32 characters
Yasuo Ohgaki [Sat, 26 Oct 2013 01:31:21 +0000 (10:31 +0900)]
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Wed, 23 Oct 2013 21:33:54 +0000 (22:33 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years ago- Updated to version 2013.7 (2013g)
Derick Rethans [Wed, 23 Oct 2013 21:33:53 +0000 (22:33 +0100)]
- Updated to version 2013.7 (2013g)

11 years agoIncrement version number, since this will be 5.5.6.
Adam Harvey [Wed, 23 Oct 2013 19:36:27 +0000 (12:36 -0700)]
Increment version number, since this will be 5.5.6.

11 years agoAdded Zend Debugger to the note about the load order (by trash4you at online dot de)
Xinchen Hui [Wed, 23 Oct 2013 11:26:24 +0000 (19:26 +0800)]
Added Zend Debugger to the note about the load order (by trash4you at online dot de)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Yasuo Ohgaki [Tue, 22 Oct 2013 03:29:01 +0000 (12:29 +0900)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix Coverity issue reporting wrong sizeof()

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Yasuo Ohgaki [Tue, 22 Oct 2013 03:27:47 +0000 (12:27 +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: (178 commits)
  Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)
  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
  fix bug #65936 (dangling context pointer causes crash)
  remove TRAVIS check in test source
  Fixed compilation warning
  Just SKIP that test on travis
  Fixed issue #115 (path issue when using phar).
  fix memory leak on error (from Coverity scan)
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
  fix argument type & remove warning
  fix const warnings in intl methods
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  fix possibility of access to *storedType without initialization
  5.4.21 release date
  Fix typo
  These getpwnam('') tests are silly and not portable
  ...

11 years agoFix Coverity issue reporting wrong sizeof()
Yasuo Ohgaki [Tue, 22 Oct 2013 03:27:18 +0000 (12:27 +0900)]
Fix Coverity issue reporting wrong sizeof()

11 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Yasuo Ohgaki [Tue, 22 Oct 2013 03:23:07 +0000 (12:23 +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: (101 commits)
  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
  fix memory leak on error (from Coverity scan)
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
  Fix typo
  Clean up this weird safe_emalloc() call
  Minor Coverity tweaks
  - Moved NULL check before dereferencing
  - Fixed possible NULL ptr dereference
  - Fixed possible uninitialized scalar variable usage (spotted by Coverity)
  Remove senseless check here
  - Fix extern declaration according to definition
  - Fix possible memory leak
  - Moved allocation to if block to make Coverity happy
  - Fixed possible memory leak
  Fix unitialized opened_path here - found by Coverity
  ...

11 years agoFixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode...
Christopher Jones [Mon, 21 Oct 2013 21:20:35 +0000 (14:20 -0700)]
Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Mon, 21 Oct 2013 20:44:53 +0000 (22:44 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  exif NEWS

11 years agoexif NEWS
Michael Wallner [Mon, 21 Oct 2013 20:44:37 +0000 (22:44 +0200)]
exif NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Mon, 21 Oct 2013 20:15:55 +0000 (22:15 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add tests for bug #62523
  Merged PR #293 (Exif crash on unknown encoding was fixed) By:  Draal Conflicts:  configure.in  main/php_version.h

11 years agoadd tests for bug #62523
Michael Wallner [Mon, 21 Oct 2013 20:15:09 +0000 (22:15 +0200)]
add tests for bug #62523

11 years agoMerged PR #293 (Exif crash on unknown encoding was fixed)
Michael Wallner [Mon, 21 Oct 2013 19:48:27 +0000 (21:48 +0200)]
Merged PR #293 (Exif crash on unknown encoding was fixed)
By:
Draal
Conflicts:
configure.in
main/php_version.h

11 years agofix bug #65936 (dangling context pointer causes crash)
Antony Dovgal [Mon, 21 Oct 2013 11:09:29 +0000 (15:09 +0400)]
fix bug #65936 (dangling context pointer causes crash)

reported by Leon Sorokin

11 years agoMerge remote-tracking branch 'refs/remotes/origin/PHP-5.5' into PHP-5.5
Michael Wallner [Mon, 21 Oct 2013 10:23:01 +0000 (12:23 +0200)]
Merge remote-tracking branch 'refs/remotes/origin/PHP-5.5' into PHP-5.5

* refs/remotes/origin/PHP-5.5:
  Fixed compilation warning

11 years agoremove TRAVIS check in test source
Michael Wallner [Mon, 21 Oct 2013 10:18:58 +0000 (12:18 +0200)]
remove TRAVIS check in test source

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Mon, 21 Oct 2013 10:18:10 +0000 (12:18 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Just SKIP that test on travis

11 years agoFixed compilation warning
Dmitry Stogov [Mon, 21 Oct 2013 10:17:10 +0000 (14:17 +0400)]
Fixed compilation warning

11 years agoJust SKIP that test on travis
Michael Wallner [Mon, 21 Oct 2013 10:16:41 +0000 (12:16 +0200)]
Just SKIP that test on travis

11 years agoFixed issue #115 (path issue when using phar).
Xinchen Hui [Mon, 21 Oct 2013 09:40:39 +0000 (17:40 +0800)]
Fixed issue #115 (path issue when using phar).

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 21 Oct 2013 07:02:21 +0000 (00:02 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix memory leak on error (from Coverity scan)

11 years agofix memory leak on error (from Coverity scan)
Stanislav Malyshev [Mon, 21 Oct 2013 07:01:24 +0000 (00:01 -0700)]
fix memory leak on error (from Coverity scan)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 21 Oct 2013 06:04:26 +0000 (23:04 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date

11 years agoFix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
Stanislav Malyshev [Mon, 21 Oct 2013 05:04:21 +0000 (22:04 -0700)]
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag

11 years ago5.4.21 release date
Stanislav Malyshev [Mon, 21 Oct 2013 02:59:39 +0000 (19:59 -0700)]
5.4.21 release date

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Stanislav Malyshev [Mon, 21 Oct 2013 06:04:03 +0000 (23:04 -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:
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.

11 years agofix argument type & remove warning
Stanislav Malyshev [Mon, 21 Oct 2013 05:59:07 +0000 (22:59 -0700)]
fix argument type & remove warning

11 years agofix const warnings in intl methods
Stanislav Malyshev [Mon, 21 Oct 2013 05:32:20 +0000 (22:32 -0700)]
fix const warnings in intl methods

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Rasmus Lerdorf [Mon, 21 Oct 2013 05:18:15 +0000 (22:18 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.

11 years agoWhen src->src is null this doesn't get initialized
Rasmus Lerdorf [Mon, 21 Oct 2013 05:15:35 +0000 (22:15 -0700)]
When src->src is null this doesn't get initialized
but it is still used, so the passed in *ze will point
to unitialized memory. Hopefully src->src is never
null, but just in case this initialization doesn't hurt.