]> granicus.if.org Git - php/log
php
8 years agoImplemented FR #72385 (Update SQLite bundle lib(3.13.0))
Xinchen Hui [Tue, 14 Jun 2016 00:53:31 +0000 (17:53 -0700)]
Implemented FR #72385 (Update SQLite bundle lib(3.13.0))

8 years agoMerge branch 'master' of git.php.net:/php-src
Xinchen Hui [Tue, 14 Jun 2016 00:36:26 +0000 (17:36 -0700)]
Merge branch 'master' of git.php.net:/php-src

8 years agoCleanup
Xinchen Hui [Tue, 14 Jun 2016 00:36:03 +0000 (17:36 -0700)]
Cleanup

8 years agoAdd support for "instanceof" pi nodes
Nikita Popov [Tue, 7 Jun 2016 19:52:47 +0000 (21:52 +0200)]
Add support for "instanceof" pi nodes

8 years agoUse union for pi constraints
Nikita Popov [Tue, 7 Jun 2016 19:16:29 +0000 (21:16 +0200)]
Use union for pi constraints

This will make it easier to extend pi constraints without impacting
structure sizes.

8 years agoCleanup
Xinchen Hui [Mon, 13 Jun 2016 16:33:19 +0000 (09:33 -0700)]
Cleanup

8 years agoMerge branch 'master' of git.php.net:/php-src
Xinchen Hui [Mon, 13 Jun 2016 16:21:34 +0000 (09:21 -0700)]
Merge branch 'master' of git.php.net:/php-src

8 years agoFixed bug #72395 (list() regression)
Xinchen Hui [Mon, 13 Jun 2016 16:21:14 +0000 (09:21 -0700)]
Fixed bug #72395 (list() regression)

8 years agoSwitch zend_print_zval_r to use smart_str
Nikita Popov [Wed, 7 Oct 2015 09:35:43 +0000 (11:35 +0200)]
Switch zend_print_zval_r to use smart_str

Instead of directly writing to stdout. This allows doing a print_r
into a string, without using output buffering.

The motivation for this is bug #67467: print_r() in return mode
will still dump the string to stdout (causing a potential information
leak) if a fatal error occurs.

8 years agofix test portability
Anatol Belski [Mon, 13 Jun 2016 13:46:28 +0000 (15:46 +0200)]
fix test portability

8 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 13 Jun 2016 13:08:23 +0000 (21:08 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #72306 (Heap overflow through proc_open and $env parameter)

8 years agoFixed bug #72306 (Heap overflow through proc_open and $env parameter)
Xinchen Hui [Mon, 13 Jun 2016 13:08:04 +0000 (21:08 +0800)]
Fixed bug #72306 (Heap overflow through proc_open and $env parameter)

8 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 13 Jun 2016 06:20:11 +0000 (08:20 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  update NEWS
  Fix #66387: Stack overflow with imagefilltoborder
  Skip test which is 64bits only
  5.5.37 now

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Mon, 13 Jun 2016 06:19:19 +0000 (08:19 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update NEWS
  Fix #66387: Stack overflow with imagefilltoborder
  Skip test which is 64bits only
  5.5.37 now

8 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Mon, 13 Jun 2016 06:15:31 +0000 (08:15 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  Fix #66387: Stack overflow with imagefilltoborder
  Skip test which is 64bits only
  5.5.37 now

8 years agoupdate NEWS
Anatol Belski [Mon, 13 Jun 2016 06:12:22 +0000 (08:12 +0200)]
update NEWS

8 years agoFix #66387: Stack overflow with imagefilltoborder
Christoph M. Becker [Mon, 20 Jul 2015 21:24:55 +0000 (23:24 +0200)]
Fix #66387: Stack overflow with imagefilltoborder

The stack overflow is caused by the recursive algorithm in combination with a
very large negative coordinate passed to gdImageFillToBorder(). As there is
already a clipping for large positive coordinates to the width and height of
the image, it seems to be consequent to clip to zero also.

8 years agoValue should not be a reference here
Xinchen Hui [Mon, 13 Jun 2016 05:40:53 +0000 (13:40 +0800)]
Value should not be a reference here

8 years agoMerge branch 'PHP-7.0'
Jakub Zelenka [Sun, 12 Jun 2016 17:40:24 +0000 (18:40 +0100)]
Merge branch 'PHP-7.0'

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Jakub Zelenka [Sun, 12 Jun 2016 17:39:32 +0000 (18:39 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix bug #71915 (openssl_random_pseudo_bytes is not fork-safe)
Jakub Zelenka [Sun, 12 Jun 2016 17:11:38 +0000 (18:11 +0100)]
Fix bug #71915 (openssl_random_pseudo_bytes is not fork-safe)

Add time to the entropy before using RAND_bytes

8 years agoFix bug #72336 (openssl_pkey_new does not fail for invalid DSA params)
Jakub Zelenka [Sun, 12 Jun 2016 16:57:08 +0000 (17:57 +0100)]
Fix bug #72336 (openssl_pkey_new does not fail for invalid DSA params)

8 years agoUpdate openssl_error_string to run and be more forgiving
Jakub Zelenka [Sun, 12 Jun 2016 16:54:37 +0000 (17:54 +0100)]
Update openssl_error_string to run and be more forgiving

8 years agoMerge branch 'PHP-7.0'
Christoph M. Becker [Sun, 12 Jun 2016 11:22:32 +0000 (13:22 +0200)]
Merge branch 'PHP-7.0'

8 years agoFix #71554: FTP has not built-in support
Christoph M. Becker [Sun, 12 Jun 2016 11:22:02 +0000 (13:22 +0200)]
Fix #71554: FTP has not built-in support

8 years agoEG(fake_scope) was always set to NULL wrongly
Xinchen Hui [Sun, 12 Jun 2016 07:17:03 +0000 (15:17 +0800)]
EG(fake_scope) was always set to NULL wrongly

8 years agocast const away
Xinchen Hui [Sat, 11 Jun 2016 08:11:40 +0000 (16:11 +0800)]
cast const away

8 years agoFixed bug #72373
Nikita Popov [Fri, 10 Jun 2016 13:57:18 +0000 (15:57 +0200)]
Fixed bug #72373

8 years agofix test out
Anatol Belski [Thu, 9 Jun 2016 18:16:09 +0000 (20:16 +0200)]
fix test out

8 years agofix test
Anatol Belski [Thu, 9 Jun 2016 18:12:49 +0000 (20:12 +0200)]
fix test

8 years agosync with deleted file
Anatol Belski [Thu, 9 Jun 2016 14:13:04 +0000 (16:13 +0200)]
sync with deleted file

8 years agofix tests
Anatol Belski [Thu, 9 Jun 2016 13:22:12 +0000 (15:22 +0200)]
fix tests

8 years agoadd flags to suppress the verbosity
Anatol Belski [Thu, 9 Jun 2016 11:39:19 +0000 (13:39 +0200)]
add flags to suppress the verbosity

8 years agoRequest #69489
Xinchen Hui [Tue, 21 Apr 2015 14:19:56 +0000 (22:19 +0800)]
Request #69489

8 years agoMerge branch 'pull-request/1912'
Christoph M. Becker [Thu, 9 Jun 2016 14:30:52 +0000 (16:30 +0200)]
Merge branch 'pull-request/1912'

8 years agoMerge branch 'master' of http://git.php.net/repository/php-src
Christoph M. Becker [Thu, 9 Jun 2016 13:58:09 +0000 (15:58 +0200)]
Merge branch 'master' of http://git.php.net/repository/php-src

8 years agoMerge branch 'PHP-7.0'
Christoph M. Becker [Thu, 9 Jun 2016 13:45:54 +0000 (15:45 +0200)]
Merge branch 'PHP-7.0'

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 9 Jun 2016 13:35:28 +0000 (15:35 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoMerge branch 'pull-request/1930' into PHP-5.6
Christoph M. Becker [Thu, 9 Jun 2016 13:28:58 +0000 (15:28 +0200)]
Merge branch 'pull-request/1930' into PHP-5.6

8 years agoOptimization
Dmitry Stogov [Thu, 9 Jun 2016 13:01:55 +0000 (16:01 +0300)]
Optimization

8 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Thu, 9 Jun 2016 12:09:09 +0000 (15:09 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #72369 (array_merge() produces references in PHP7)

8 years agoFixed bug #72369 (array_merge() produces references in PHP7)
Dmitry Stogov [Thu, 9 Jun 2016 12:07:44 +0000 (15:07 +0300)]
Fixed bug #72369 (array_merge() produces references in PHP7)

8 years agoDelay IS_ERROR checks
Dmitry Stogov [Thu, 9 Jun 2016 09:39:38 +0000 (12:39 +0300)]
Delay IS_ERROR checks

8 years agoMerge branch 'PHP-7.0'
Ferenc Kovacs [Thu, 9 Jun 2016 08:53:12 +0000 (10:53 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  5.6.24 will be next

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Thu, 9 Jun 2016 08:52:26 +0000 (10:52 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  5.6.24 will be next

8 years ago5.6.24 will be next
Ferenc Kovacs [Thu, 9 Jun 2016 08:51:02 +0000 (10:51 +0200)]
5.6.24 will be next

8 years agoMerge branch 'PHP-7.0'
Jakub Zelenka [Wed, 8 Jun 2016 17:37:32 +0000 (18:37 +0100)]
Merge branch 'PHP-7.0'

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Jakub Zelenka [Wed, 8 Jun 2016 17:36:36 +0000 (18:36 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix bug #72140 (segfault after calling ERR_free_strings())
Jakub Zelenka [Wed, 8 Jun 2016 17:21:39 +0000 (18:21 +0100)]
Fix bug #72140 (segfault after calling ERR_free_strings())

8 years agotypo
Dmitry Stogov [Wed, 8 Jun 2016 16:01:28 +0000 (19:01 +0300)]
typo

8 years agoFollowup for bug #53432
Nikita Popov [Wed, 8 Jun 2016 13:33:11 +0000 (15:33 +0200)]
Followup for bug #53432

Assign-ops and nested accesses now get the same treatment.

8 years agocleanup
Dmitry Stogov [Wed, 8 Jun 2016 09:55:31 +0000 (12:55 +0300)]
cleanup

8 years agoReplaced wrong check with proper ZEND_ASSERT()
Dmitry Stogov [Wed, 8 Jun 2016 09:11:47 +0000 (12:11 +0300)]
Replaced wrong check with proper ZEND_ASSERT()

8 years agoRemoved useless reference counting
Dmitry Stogov [Wed, 8 Jun 2016 08:24:53 +0000 (11:24 +0300)]
Removed useless reference counting

8 years agoThis test was fixed together with fix for bug #70228
Dmitry Stogov [Wed, 8 Jun 2016 08:14:06 +0000 (11:14 +0300)]
This test was fixed together with fix for bug #70228

8 years agofix php_log_err macro
Anatol Belski [Wed, 8 Jun 2016 06:10:09 +0000 (08:10 +0200)]
fix php_log_err macro

8 years agoMerge branch 'PHP-5.6'
Pierre Joye [Wed, 8 Jun 2016 04:13:27 +0000 (11:13 +0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  prevent invalid color index (palette only), may lead to crash
  Add CVE to #66387

Conflicts:
NEWS

8 years agoMerge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
Pierre Joye [Wed, 8 Jun 2016 04:08:05 +0000 (11:08 +0700)]
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Pierre Joye [Wed, 8 Jun 2016 04:07:32 +0000 (11:07 +0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  prevent invalid color index (palette only), may lead to crash
  Add CVE to #66387
  add missing NEWS entry

8 years agoprevent invalid color index (palette only), may lead to crash
Pierre Joye [Wed, 8 Jun 2016 04:06:48 +0000 (11:06 +0700)]
prevent invalid color index (palette only), may lead to crash

8 years agoBetter fix for bug #70228 (memleak if return in finally block)
Dmitry Stogov [Tue, 7 Jun 2016 23:20:45 +0000 (02:20 +0300)]
Better fix for bug #70228 (memleak if return in finally block)

8 years agoFixed bug #70228 (Memleak if return in finally block)
Dmitry Stogov [Tue, 7 Jun 2016 21:23:33 +0000 (00:23 +0300)]
Fixed bug #70228 (Memleak if return in finally block)

8 years agoFixed bug #71266 (Missing separation of properties HT in foreach etc).
Dmitry Stogov [Tue, 7 Jun 2016 20:18:52 +0000 (23:18 +0300)]
Fixed bug #71266 (Missing separation of properties HT in foreach etc).

8 years agoAdd CVE to #66387
Lior Kaplan [Tue, 7 Jun 2016 18:46:59 +0000 (21:46 +0300)]
Add CVE to #66387

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Lior Kaplan [Tue, 7 Jun 2016 18:46:25 +0000 (21:46 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Add CVE to #66387

8 years agoAdd CVE to #66387
Lior Kaplan [Tue, 7 Jun 2016 18:45:24 +0000 (21:45 +0300)]
Add CVE to #66387

8 years agoUse LCA for object(ce) type joins
Nikita Popov [Tue, 7 Jun 2016 18:36:54 +0000 (20:36 +0200)]
Use LCA for object(ce) type joins

For B, C extending A the join of object(B) and object(C) should
be object(instanceof A). For simplicity we only handle the class
hierarchy, as computing the least common unique ancestor for
interfaces would be more involved.

Also ignore phi sources that don't have an object type: The join
of null and object(A) is now null|object(A) rather than
null|object.

8 years agoCleanup
Nikita Popov [Mon, 6 Jun 2016 19:55:20 +0000 (21:55 +0200)]
Cleanup

8 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 7 Jun 2016 16:45:46 +0000 (18:45 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix NEWS
  add missing NEWS entry
  update NEWS

8 years agofix NEWS
Anatol Belski [Tue, 7 Jun 2016 16:44:40 +0000 (18:44 +0200)]
fix NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Tue, 7 Jun 2016 16:42:55 +0000 (18:42 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  add missing NEWS entry

8 years agoadd missing NEWS entry
Anatol Belski [Tue, 7 Jun 2016 16:41:17 +0000 (18:41 +0200)]
add missing NEWS entry

8 years agobump news file
Joe Watkins [Tue, 7 Jun 2016 13:10:27 +0000 (14:10 +0100)]
bump news file

8 years agoRevert "bump news file"
Joe Watkins [Tue, 7 Jun 2016 13:09:09 +0000 (14:09 +0100)]
Revert "bump news file"

This reverts commit 61b848833d572e514971e17c23d426a49384758a.

8 years agoMerge branch 'master' of https://github.com/php/php-src
Joe Watkins [Tue, 7 Jun 2016 12:12:34 +0000 (13:12 +0100)]
Merge branch 'master' of https://github.com/php/php-src

8 years agobump news file
Joe Watkins [Tue, 7 Jun 2016 12:12:00 +0000 (13:12 +0100)]
bump news file

8 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Tue, 7 Jun 2016 11:08:41 +0000 (14:08 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  #72337 invalid dimensions can lead to segv
  7.0.9 next

8 years agoAdded test
Dmitry Stogov [Tue, 7 Jun 2016 11:08:12 +0000 (14:08 +0300)]
Added test

8 years agoFixed bug #72202 (curl_close doesn't close cURL handle)
Dmitry Stogov [Tue, 7 Jun 2016 11:03:14 +0000 (14:03 +0300)]
Fixed bug #72202 (curl_close doesn't close cURL handle)
Now curl_close() forces connection close, independently of other links to the same resource.

This reverts commit 3ba4f8263d7940312668f4c364c988a67be2461a.

8 years agoupdate NEWS
Pierre Joye [Tue, 7 Jun 2016 10:40:55 +0000 (17:40 +0700)]
update NEWS

8 years agoMerge branch 'master' of git.php.net:php-src
Pierre Joye [Tue, 7 Jun 2016 10:39:22 +0000 (17:39 +0700)]
Merge branch 'master' of git.php.net:php-src

8 years agoMerge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
Pierre Joye [Tue, 7 Jun 2016 10:38:41 +0000 (17:38 +0700)]
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0

8 years agoMerge branch 'PHP-5.6'
Pierre Joye [Tue, 7 Jun 2016 10:19:17 +0000 (17:19 +0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  #72337 invalid dimensions can lead to segv

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Pierre Joye [Tue, 7 Jun 2016 10:18:14 +0000 (17:18 +0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  #72337 invalid dimensions can lead to segv

8 years ago#72337 invalid dimensions can lead to segv
Pierre Joye [Tue, 7 Jun 2016 10:16:40 +0000 (17:16 +0700)]
#72337 invalid dimensions can lead to segv

8 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 7 Jun 2016 08:04:58 +0000 (10:04 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  7.0.9 next

8 years ago7.0.9 next
Anatol Belski [Tue, 7 Jun 2016 08:04:25 +0000 (10:04 +0200)]
7.0.9 next

8 years agocleanup
Dmitry Stogov [Mon, 6 Jun 2016 22:14:53 +0000 (01:14 +0300)]
cleanup

8 years agoFixed mixed declarations and code
Dmitry Stogov [Mon, 6 Jun 2016 22:01:48 +0000 (01:01 +0300)]
Fixed mixed declarations and code

8 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 6 Jun 2016 19:08:18 +0000 (21:08 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Add test for bug #53735

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Mon, 6 Jun 2016 19:07:45 +0000 (21:07 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Add test for bug #53735

8 years agoAdd test for bug #53735
Anatol Belski [Mon, 6 Jun 2016 19:06:06 +0000 (21:06 +0200)]
Add test for bug #53735

8 years agomicro-optimization
Dmitry Stogov [Mon, 6 Jun 2016 17:45:10 +0000 (20:45 +0300)]
micro-optimization

8 years agosimplification
Dmitry Stogov [Mon, 6 Jun 2016 12:50:06 +0000 (15:50 +0300)]
simplification

8 years agoImprove type narrowing (check only SSA definitions).
Dmitry Stogov [Mon, 6 Jun 2016 11:57:02 +0000 (14:57 +0300)]
Improve type narrowing (check only SSA definitions).

8 years agoFix correctness issues with type narrowing
Nikita Popov [Sun, 5 Jun 2016 13:36:14 +0000 (15:36 +0200)]
Fix correctness issues with type narrowing

Fixes bug #72335.

8 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 6 Jun 2016 11:33:39 +0000 (13:33 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix ibase handle initialization, mostly compiler warnings

8 years agofix ibase handle initialization, mostly compiler warnings
Anatol Belski [Mon, 6 Jun 2016 11:30:17 +0000 (13:30 +0200)]
fix ibase handle initialization, mostly compiler warnings

8 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 6 Jun 2016 06:58:40 +0000 (08:58 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix typo

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Mon, 6 Jun 2016 06:58:08 +0000 (08:58 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix typo