]> granicus.if.org Git - php/log
php
9 years agoUse NULL where possible for exception class
Aaron Piotrowski [Tue, 7 Jul 2015 17:10:22 +0000 (12:10 -0500)]
Use NULL where possible for exception class

Matches usage of zend_throw_exception()/zend_throw_exception_ex().

9 years agoAllow NULL for exception_ce
Aaron Piotrowski [Tue, 7 Jul 2015 16:37:33 +0000 (11:37 -0500)]
Allow NULL for exception_ce

9 years agoMerge branch 'PHP-5.6'
Anatol Belski [Tue, 7 Jul 2015 16:40:16 +0000 (18:40 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix C89 compat

9 years agofix C89 compat
Anatol Belski [Tue, 7 Jul 2015 16:39:33 +0000 (18:39 +0200)]
fix C89 compat

9 years agofix C89 compat
Kalle Sommer Nielsen [Tue, 7 Jul 2015 16:26:14 +0000 (18:26 +0200)]
fix C89 compat

9 years agoadded info about the user space stream context for pipes
Anatol Belski [Tue, 7 Jul 2015 15:11:24 +0000 (17:11 +0200)]
added info about the user space stream context for pipes

9 years agomention pcre.jit in the supplied php.ini-*
Anatol Belski [Tue, 7 Jul 2015 14:15:22 +0000 (16:15 +0200)]
mention pcre.jit in the supplied php.ini-*

9 years agoMerge branch 'PHP-5.6'
Julien Pauli [Tue, 7 Jul 2015 14:03:37 +0000 (16:03 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix test related to c22da81

Conflicts:
ext/standard/tests/general_functions/bug41037.phpt

9 years agoFix test related to c22da81
Julien Pauli [Tue, 7 Jul 2015 14:01:44 +0000 (16:01 +0200)]
Fix test related to c22da81

9 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Tue, 7 Jul 2015 13:50:02 +0000 (15:50 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add missing second argument for ucfirst to the proto

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Tue, 7 Jul 2015 13:49:44 +0000 (15:49 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add missing second argument for ucfirst to the proto

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
Ferenc Kovacs [Tue, 7 Jul 2015 13:49:16 +0000 (15:49 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add missing second argument for ucfirst to the proto

9 years agoadd missing second argument for ucfirst to the proto
Ferenc Kovacs [Tue, 7 Jul 2015 13:48:55 +0000 (15:48 +0200)]
add missing second argument for ucfirst to the proto

9 years agoMerge branch 'master' of git.php.net:php-src
Xinchen Hui [Tue, 7 Jul 2015 13:40:46 +0000 (21:40 +0800)]
Merge branch 'master' of git.php.net:php-src

9 years agoUpdate NEWs
Xinchen Hui [Tue, 7 Jul 2015 13:38:37 +0000 (21:38 +0800)]
Update NEWs

9 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Tue, 7 Jul 2015 13:38:24 +0000 (21:38 +0800)]
Merge branch 'PHP-5.6'

Conflicts:
ext/sqlite3/sqlite3.c

9 years agoFixed bug #69972 (Use-after-free vulnerability in sqlite3SafetyCheckSickOrOk())
Xinchen Hui [Tue, 7 Jul 2015 13:37:35 +0000 (21:37 +0800)]
Fixed bug #69972 (Use-after-free vulnerability in sqlite3SafetyCheckSickOrOk())

9 years agoupdated NEWS
Anatol Belski [Tue, 7 Jul 2015 13:34:04 +0000 (15:34 +0200)]
updated NEWS

9 years agoUpdate NEWs
Xinchen Hui [Tue, 7 Jul 2015 13:29:20 +0000 (21:29 +0800)]
Update NEWs

9 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Tue, 7 Jul 2015 13:28:51 +0000 (21:28 +0800)]
Merge branch 'PHP-5.6'

Conflicts:
ext/spl/spl_iterators.c

9 years agoFixed bug #69970 (Use-after-free vulnerability in spl_recursive_it_move_forward_ex())
Xinchen Hui [Tue, 7 Jul 2015 13:25:28 +0000 (21:25 +0800)]
Fixed bug #69970 (Use-after-free vulnerability in spl_recursive_it_move_forward_ex())

9 years agoMerge branch 'PHP-5.6'
Julien Pauli [Tue, 7 Jul 2015 13:03:58 +0000 (15:03 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed double ZEND_TICKS opcode generation for declare()

Conflicts:
Zend/zend_compile.c

9 years agoFixed double ZEND_TICKS opcode generation for declare()
Julien Pauli [Mon, 6 Jul 2015 13:46:48 +0000 (15:46 +0200)]
Fixed double ZEND_TICKS opcode generation for declare()

9 years agoTuned off dubugging of live ranges
Dmitry Stogov [Tue, 7 Jul 2015 12:43:14 +0000 (15:43 +0300)]
Tuned off dubugging of live ranges

9 years agoFixed bug #62210 (Exceptions can leak temporary variables. As a part of the fix serio...
Dmitry Stogov [Tue, 7 Jul 2015 12:41:12 +0000 (15:41 +0300)]
Fixed bug #62210 (Exceptions can leak temporary variables. As a part of the fix serious refactoring was done. op_array->brk_cont_array was removed, and replaced with more general and speed efficient op_array->T_liveliness. ZEND_GOTO opcode is always replaced by ZEND_JMP at compile time). (Bob, Dmitry, Laruence)

Squashed commit of the following:

commit 38e22106d4bdcc829dd2b64be1d3c6cdc089f3ed
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 15:12:19 2015 +0300

    Added NEWS entry

commit 0a355935bfb10b5a4c893f4db9496ea8abbcf71b
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 15:06:32 2015 +0300

    Inline function, to eliminate repeatable checks

commit d937584f3aef0baae6001377b61fd700b6f36e14
Merge: 0341626 32677f5
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 14:35:49 2015 +0300

    Merge branch 'master' into temporary_cleaning

    * master:
      Fixed bug #70006 (cli - function with default arg = STDOUT crash output).
      Fix x86 build
      Fixed use after free on closure_call_leak_with_exception.phpt
      Fixed test

commit 0341626ea94a5e474c660732d33884460847d5e7
Merge: 74869fa dec35de
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 12:00:53 2015 +0300

    Merge branch 'temporary_cleaning' of https://github.com/laruence/php-src into temporary_cleaning

    * 'temporary_cleaning' of https://github.com/laruence/php-src:
      Fixed checkpoint get
      Fixed crash of invalid pointer derefer
      cleanup

commit 74869fa67375b8daf772ac30b6b936fd2a2132c6
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 11:45:34 2015 +0300

    Fixed wrong GOTO resolution

commit dec35ded3294e3022e88a623188c3d1d71381675
Author: Xinchen Hui <laruence@gmail.com>
Date:   Tue Jul 7 15:58:49 2015 +0800

    Fixed checkpoint get

commit b0f419540ad24c44810c9b05da046965618ffc65
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 10:47:11 2015 +0300

    Fixed crash of invalid pointer derefer (laruence)

commit 7a428d98ca2899c5933914caa0cd17b4126e952c
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 10:35:47 2015 +0300

    Fixed identation

commit 9c3a4dce9ce02034d19d28182aa9c1298d528daf
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 10:33:52 2015 +0300

    Fixed invalid size

commit 653abc670b2a1f453b0fc3fc4a9eca919ee870cc
Author: Xinchen Hui <laruence@gmail.com>
Date:   Tue Jul 7 11:29:14 2015 +0800

    Fixed crash of invalid pointer derefer

commit e04500ceda606ac4f364d03bcd562327bdc74eee
Author: Xinchen Hui <laruence@gmail.com>
Date:   Tue Jul 7 11:28:26 2015 +0800

    cleanup

commit 34183e1687681038e77b650078927b35ee84e933
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 04:49:46 2015 +0300

    op_array->T_liveliness compression

commit 2f6ad845795a08c3d7ac219e9c42950565b20394
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 04:44:44 2015 +0300

    White spaces

commit be83f115a3f82a548c8d377c66574de5e5187410
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 04:42:26 2015 +0300

    Identation

commit 1f5084b99038c374ac012b017c4d1652bb5d4222
Merge: 91b620d 1adf3df
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 04:41:54 2015 +0300

    Merge branch 'master' into temporary_cleaning

    * master:
      Throw TypeError for invalid callback
      Fix crash when exception occurs during nested rope
      Fix crash when exception is thrown during ROPE_END
      Small cleanup in ternary compilation
      move the define to the right place
      fix ext/ldap build
      Rectify information about invalid shift warning being now ArithmeticError

commit 91b620d684c5a2296774432d5d0ff8f5d14397d6
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 04:32:04 2015 +0300

    Replace GOTO by FREE/FE_FREE and JMP at compile time

commit 7052e5697918fab83d2975977c3392f7188fbc87
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 02:25:08 2015 +0300

    Use zend_regenerate_var_liveliness_info() to regenerate information after pass two.

commit ae72b0dc6797815a846b8f95abccb36367422d27
Merge: a81c4bb a919fe8
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Jul 6 21:02:34 2015 +0300

    Merge branch 'master' into temporary_cleaning

    * master:
      Do not display EXT_TYPE_UNUSED in phpdbg opcodes
      Run debug build with opcache on travis

commit a81c4bb8c6f1ba8124a5a7636694480ff0f1328c
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Jul 6 20:59:34 2015 +0300

    Improved algorithm. It's actually the same algorithm with second loop removed and simpler temporary data structures. The only difference may be in "re-defined" vatriable handling. Now live-range in that case started from the seconnd definition (this must be more safe).

commit 9a16810f7a7c10373603c5250d985616acf45e97
Merge: bbfbe47 001ecd3
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Jul 6 17:57:45 2015 +0300

    Merge branch 'master' into temporary_cleaning

    * master:
      Simplify TMP var number decoding (without HashTable)

commit bbfbe470c865cb8b3cae8bf6518e6d06af525522
Merge: 0bda4ab 436b01e
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Jul 6 17:02:01 2015 +0300

    Merge branch 'master' into temporary_cleaning

    * master:
      Avoid dangerous optimization
      Fixed JMPZNZ instruction printing
      Attempt at falling back on ldap_find_control for Mac OS

commit 0bda4abea7ba0a51c2ec125edb547645d0329792
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Jul 6 16:05:33 2015 +0300

    Fixed live-range construction for OP_DATA opcode
    Added comments about algorithm assumtions

commit 521ad9df98fdf1dd8b7c212799ddeb1a84483e6f
Merge: 4398dab a09dcb0
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Mon Jul 6 14:54:15 2015 +0200

    Merge branch 'master' of https://github.com/php/php-src into temporary_cleaning

commit 4398dab82f9a5ce64df55b24988ce7d31e24074f
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Mon Jul 6 13:51:27 2015 +0200

    Add a few phpt tests related to temporary cleaning

commit 739656f83ff5b570bb311d2c7cb2d72380a3c759
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Jul 6 14:28:49 2015 +0300

    Fixed Zend/tests/foreach_004.phpt failure (FE_FETCH shouldn't be included into TMP vatriablr live range)

commit 3df462a2bcf5fa8f9244ea299178152a5d436277
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Jul 6 13:41:02 2015 +0300

    Improve data layout (reduce the op_array structure size on 64-bit systems)

commit 883b73c56e6dab6489ae4cda2c1331b53a995586
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Jul 6 13:28:45 2015 +0300

    Removed op_array->brk_cont_array

commit ae5e58b59843513505e84e396c1446ac35cb1b94
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Mon Jul 6 04:22:58 2015 +0200

    Fix bug with brk_cont variable free / free loop vars via temporary liveliness info

commit b4223ca62771e1003c9ab778a09a177ad71e6d57
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Mon Jul 6 04:07:07 2015 +0200

    Fix bugs / cleanup fixes

commit ea33189d220c7fc0884848571635abe3cddd2f4d
Author: Xinchen Hui <laruence@gmail.com>
Date:   Sun Jul 5 20:58:38 2015 +0800

    Removed useless TsTop

commit 1dbb007e4addba9ac3bfc227db27a651cbcf5ede
Merge: 550bbf8 3a8af24
Author: Xinchen Hui <laruence@gmail.com>
Date:   Sat Jul 4 15:06:44 2015 +0800

    Merge branch 'temporary_cleaning' of https://github.com/dstogov/php-src into temporary_cleaning

commit 3a8af245290ceb507108340831254672f24022fa
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 3 16:15:36 2015 +0300

    More exceptions from regular liveliness analyses (with explanation in comments).
    Mark old "unexplained" exceptions with ???.

commit ba721efa2cbd2136668fec956ef3b034ac1a29d6
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 3 14:16:09 2015 +0300

    Print list of live temp variables (at least for internal debugging)

commit 8d1f88fe91e62b4333703c58b871d85b66fb7b70
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 3 13:31:56 2015 +0300

    Use op_array->T_liveliness to free incomplete ropes and restore error_reporting level on exception

commit 80c1d0d779e6e9609a211907838f3727aa7b301a
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 3 11:05:39 2015 +0300

    Don't keep empty T_liveliness

commit 501ae8aaac0a92368b50e9f342b04d7334d263f6
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Jul 2 22:31:48 2015 +0300

    Reverted changes to Zend/zend_arena.h.
    Reuse CG(arena) instead of creating a new one.

commit a4fce36907147df5ac1af78b44135e3f07c1844c
Merge: 6ff7246 fd0fcce
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Jul 2 22:01:42 2015 +0300

    Merge branch 'temporary_cleaning' of github.com:bwoebi/php-src into temporary_cleaning

    * 'temporary_cleaning' of github.com:bwoebi/php-src:
      Fix remaining issues with compacted temporaries
      Fix regression from last commit (+1 ?!)
      Fix off-by-one (opcache may remove last ZEND_RETURN)
      Speed algorithm up, more fail safety when reusing temporaries
      Dumb bug in opcode.c (forgot to update Ts[i])
      Fix opcache support
      Exempt ROPE temporaries from freeing
      Hmm, we need temporary info for all the opcodes
      Add opcache support for cleaning in optimization step (Opcache seems to have a few unrelated issues which blow up together with that patch)
      Add proper temporary cleaning upon frame abortion
      Fix arena on small sizes (size < sizeof(zend_arena))

commit fd0fcce81177717f3a05ac87192b5ed05eead0a1
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Thu Jul 2 20:00:33 2015 +0200

    Fix remaining issues with compacted temporaries

commit 427dc58bbb93022d1c2077f874afcdb9dd82d5c5
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Wed Jul 1 22:49:12 2015 +0200

    Fix regression from last commit (+1 ?!)

commit 1adcf56a6e9f09e7ad06331d4d6280035b17a7d1
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Wed Jul 1 22:17:07 2015 +0200

    Fix off-by-one (opcache may remove last ZEND_RETURN)

commit 25b231b7841fa4078c65976cabdd843845a6cbe6
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Wed Jul 1 20:59:24 2015 +0200

    Speed algorithm up, more fail safety when reusing temporaries

commit 22d9d05350e35d180018d0bccbad6f173cb4797d
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Wed Jul 1 16:48:46 2015 +0200

    Dumb bug in opcode.c (forgot to update Ts[i])

commit 6538269bfa5bcbad34fc2f051b0fd5e4ebf2ff00
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Wed Jul 1 13:05:52 2015 +0200

    Fix opcache support

commit 333a7c4a8813a45dc79ce55b8e9c0a0b98671e13
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Sat Jun 27 22:40:21 2015 +0200

    Exempt ROPE temporaries from freeing

commit 02585f77085427baea48448c134a96c542af3337
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Fri Jun 26 16:20:55 2015 +0200

    Hmm, we need temporary info for all the opcodes

commit cbcaedbd78199897e5cacffd700b706f21590abf
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Fri Jun 26 01:04:09 2015 +0200

    Add opcache support for cleaning in optimization step
    (Opcache seems to have a few unrelated issues which blow up together with that patch)

commit fef649f4067823a1f96f85340cf715e5877310bc
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Fri Jun 26 01:02:27 2015 +0200

    Add proper temporary cleaning upon frame abortion

commit 1cec2e7271b789b84601f8acf385950af1bb0c7c
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Thu Jun 25 23:33:21 2015 +0200

    Fix arena on small sizes (size < sizeof(zend_arena))

9 years agoMerge branch 'master' of git.php.net:php-src
Xinchen Hui [Tue, 7 Jul 2015 11:21:54 +0000 (19:21 +0800)]
Merge branch 'master' of git.php.net:php-src

9 years agoFixed bug #70006 (cli - function with default arg = STDOUT crash output).
Xinchen Hui [Tue, 7 Jul 2015 11:21:02 +0000 (19:21 +0800)]
Fixed bug #70006 (cli - function with default arg = STDOUT crash output).

9 years agoMerge branch 'master' of https://git.php.net/push/php-src
Kalle Sommer Nielsen [Tue, 7 Jul 2015 10:43:58 +0000 (12:43 +0200)]
Merge branch 'master' of https://git.php.net/push/php-src

9 years agoFix x86 build
Kalle Sommer Nielsen [Tue, 7 Jul 2015 10:41:05 +0000 (12:41 +0200)]
Fix x86 build

9 years agoFixed use after free on closure_call_leak_with_exception.phpt
Xinchen Hui [Tue, 7 Jul 2015 10:19:57 +0000 (18:19 +0800)]
Fixed use after free on closure_call_leak_with_exception.phpt

9 years agoFixed test
Dmitry Stogov [Tue, 7 Jul 2015 07:14:37 +0000 (10:14 +0300)]
Fixed test

9 years agoThrow TypeError for invalid callback
Aaron Piotrowski [Mon, 6 Jul 2015 20:03:35 +0000 (15:03 -0500)]
Throw TypeError for invalid callback

Matches behavior of zend_internal_type_error() if E_ERROR is passed to
zend_wrong_callback_error().

9 years agoFix crash when exception occurs during nested rope
Nikita Popov [Mon, 6 Jul 2015 18:53:54 +0000 (20:53 +0200)]
Fix crash when exception occurs during nested rope

Adds extra condition that the rope var of INIT/ADD must match the
one one END.

9 years agoFix crash when exception is thrown during ROPE_END
Nikita Popov [Mon, 6 Jul 2015 18:12:07 +0000 (20:12 +0200)]
Fix crash when exception is thrown during ROPE_END

The CHECK_EXCEPTION() was done at a point where the old opline is
still used, thus redirecting the write to the result var into
EX(call) instead.

Handling the exception in-place to avoid leaking result.

9 years agoSmall cleanup in ternary compilation
Nikita Popov [Mon, 6 Jul 2015 15:41:29 +0000 (17:41 +0200)]
Small cleanup in ternary compilation

9 years agomove the define to the right place
Anatol Belski [Mon, 6 Jul 2015 17:43:35 +0000 (19:43 +0200)]
move the define to the right place

thanks Kalle )

9 years agofix ext/ldap build
Anatol Belski [Mon, 6 Jul 2015 17:35:29 +0000 (19:35 +0200)]
fix ext/ldap build

9 years agoRectify information about invalid shift warning being now ArithmeticError
Bob Weinand [Mon, 6 Jul 2015 16:09:36 +0000 (18:09 +0200)]
Rectify information about invalid shift warning being now ArithmeticError

9 years agoDo not display EXT_TYPE_UNUSED in phpdbg opcodes
Bob Weinand [Mon, 6 Jul 2015 16:05:03 +0000 (18:05 +0200)]
Do not display EXT_TYPE_UNUSED in phpdbg opcodes

9 years agoRun debug build with opcache on travis
Bob Weinand [Mon, 6 Jul 2015 15:41:06 +0000 (17:41 +0200)]
Run debug build with opcache on travis

9 years agoSimplify TMP var number decoding (without HashTable)
Dmitry Stogov [Mon, 6 Jul 2015 14:56:48 +0000 (17:56 +0300)]
Simplify TMP var number decoding (without HashTable)

9 years agoAvoid dangerous optimization
Dmitry Stogov [Mon, 6 Jul 2015 13:52:38 +0000 (16:52 +0300)]
Avoid dangerous optimization

9 years agoFixed JMPZNZ instruction printing
Dmitry Stogov [Mon, 6 Jul 2015 13:30:50 +0000 (16:30 +0300)]
Fixed JMPZNZ instruction printing

9 years agoMerge branch 'PHP-5.6'
Côme Bernigaud [Mon, 6 Jul 2015 12:56:20 +0000 (14:56 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Attempt at falling back on ldap_find_control for Mac OS

9 years agoAttempt at falling back on ldap_find_control for Mac OS
Côme Bernigaud [Mon, 6 Jul 2015 12:54:04 +0000 (14:54 +0200)]
Attempt at falling back on ldap_find_control for Mac OS

9 years agoMerge branch 'PHP-5.6'
Côme Bernigaud [Mon, 6 Jul 2015 12:28:01 +0000 (14:28 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated README, added test to create LDAP base if missing and ease tests

9 years agoupdate NEWS about #69900
Anatol Belski [Mon, 6 Jul 2015 12:27:17 +0000 (14:27 +0200)]
update NEWS about #69900

backport for 5.6 to go

9 years agoUpdated README, added test to create LDAP base if missing and ease tests
Côme Bernigaud [Mon, 6 Jul 2015 12:26:49 +0000 (14:26 +0200)]
Updated README, added test to create LDAP base if missing and ease tests

9 years agoFixed test (shift operators throw Error)
Dmitry Stogov [Mon, 6 Jul 2015 09:28:14 +0000 (12:28 +0300)]
Fixed test (shift operators throw Error)

9 years agoFixed return value
Dmitry Stogov [Mon, 6 Jul 2015 08:25:19 +0000 (11:25 +0300)]
Fixed return value

9 years agoMerge branch 'signed_char' of https://github.com/antonblanchard/php-src
Xinchen Hui [Mon, 6 Jul 2015 07:36:55 +0000 (15:36 +0800)]
Merge branch 'signed_char' of https://github.com/antonblanchard/php-src

9 years agoReorder the conditions
Xinchen Hui [Mon, 6 Jul 2015 07:24:51 +0000 (15:24 +0800)]
Reorder the conditions

9 years agoFixed segfault while with generating ext info
Xinchen Hui [Mon, 6 Jul 2015 07:22:40 +0000 (15:22 +0800)]
Fixed segfault while with generating ext info

9 years agohttp parser code assumes char is signed
Anton Blanchard [Sun, 5 Jul 2015 23:41:09 +0000 (09:41 +1000)]
http parser code assumes char is signed

A char can be either signed or unsigned, and on PowerPC and ARM it is
unsigned. The following code will always be false on these architectures:

        if (c == -1) goto error;

9 years agobring back the division by zero warning
Anatol Belski [Sun, 5 Jul 2015 18:18:17 +0000 (20:18 +0200)]
bring back the division by zero warning

9 years agoMerge branch 'pull-request/1368'
Stanislav Malyshev [Sun, 5 Jul 2015 08:24:35 +0000 (01:24 -0700)]
Merge branch 'pull-request/1368'

* pull-request/1368:
  moved function warning test to money_format_error.phpt file

9 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Sun, 5 Jul 2015 08:10:29 +0000 (01:10 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Cleaned white spaces in PHP_INI definition of phar

9 years agoCleaned white spaces in PHP_INI definition of phar
Dominic [Fri, 19 Jun 2015 10:31:03 +0000 (12:31 +0200)]
Cleaned white spaces in PHP_INI definition of phar

Removes unnecessary white spaces.

9 years agoMerge branch 'pull-request/1351'
Stanislav Malyshev [Sun, 5 Jul 2015 08:04:22 +0000 (01:04 -0700)]
Merge branch 'pull-request/1351'

* pull-request/1351:
  Cleaned white spaces in PHP_INI definition of phar

9 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Sun, 5 Jul 2015 08:01:27 +0000 (01:01 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix typo, see #68476

9 years agoMerge branch 'pull-request/1324' into PHP-5.6
Stanislav Malyshev [Sun, 5 Jul 2015 08:01:00 +0000 (01:01 -0700)]
Merge branch 'pull-request/1324' into PHP-5.6

* pull-request/1324:
  fix typo, see #68476

9 years agoFix use after free with opcache (interned strings)
Bob Weinand [Sun, 5 Jul 2015 00:00:38 +0000 (02:00 +0200)]
Fix use after free with opcache (interned strings)

9 years agoThis macro check is not needed (Anatol)
Kalle Sommer Nielsen [Sat, 4 Jul 2015 19:21:15 +0000 (21:21 +0200)]
This macro check is not needed (Anatol)

9 years agoReplace references to PHP_WIN32 and TSRM_WIN32 with ZEND_WIN32 in Zend/, this also...
Kalle Sommer Nielsen [Sat, 4 Jul 2015 16:55:22 +0000 (18:55 +0200)]
Replace references to PHP_WIN32 and TSRM_WIN32 with ZEND_WIN32 in Zend/, this also fixes 1 instance of where fflush(stderr) was misplaced (zend_extensions.c)

9 years agoFixed bug #69983 (get_browser fails with user agent of null)
Xinchen Hui [Sat, 4 Jul 2015 03:05:50 +0000 (11:05 +0800)]
Fixed bug #69983 (get_browser fails with user agent of null)

9 years agoSwitch code on thrown Errors to 0, update related tests
Aaron Piotrowski [Fri, 3 Jul 2015 22:28:11 +0000 (17:28 -0500)]
Switch code on thrown Errors to 0, update related tests

9 years agoRemove E_EXCEPTION
Aaron Piotrowski [Fri, 3 Jul 2015 21:47:16 +0000 (16:47 -0500)]
Remove E_EXCEPTION

9 years agoSwitch macro with __VA_ARGS__ to function
Aaron Piotrowski [Fri, 3 Jul 2015 21:21:02 +0000 (16:21 -0500)]
Switch macro with __VA_ARGS__ to function

9 years agoRemove need to pass error level
Aaron Piotrowski [Fri, 3 Jul 2015 21:04:33 +0000 (16:04 -0500)]
Remove need to pass error level

9 years agoEnable throwing custom exceptions from errors
Aaron Piotrowski [Fri, 3 Jul 2015 18:41:17 +0000 (13:41 -0500)]
Enable throwing custom exceptions from errors

9 years agoAlways report object leaks
Nikita Popov [Fri, 3 Jul 2015 16:32:09 +0000 (18:32 +0200)]
Always report object leaks

Previously cycles were excluded from leak reports, however the
situation here has improved a lot in the meantime and we can
report all leaks.

9 years agoDon't leak generator cycle in ReflectionGenerator test
Nikita Popov [Fri, 3 Jul 2015 16:38:12 +0000 (18:38 +0200)]
Don't leak generator cycle in ReflectionGenerator test

This is tracked by bug #69989.

9 years agoSwitch position of ce in exception ce variable names
Aaron Piotrowski [Fri, 3 Jul 2015 14:45:03 +0000 (09:45 -0500)]
Switch position of ce in exception ce variable names

9 years agoChange zend_exception_get_default() to zend_exception_ce
Aaron Piotrowski [Fri, 3 Jul 2015 14:44:48 +0000 (09:44 -0500)]
Change zend_exception_get_default() to zend_exception_ce

9 years agoCleanup exception ce API
Aaron Piotrowski [Fri, 3 Jul 2015 01:57:53 +0000 (20:57 -0500)]
Cleanup exception ce API

Removed recently added functions to get Error ce's and marked the old functions
fetching default_exception_ce and error_exception_ce as deprecated.

9 years agoMerge branch 'PHP-5.6'
Anatol Belski [Fri, 3 Jul 2015 14:22:01 +0000 (16:22 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix backport mistake

9 years agofix backport mistake
Anatol Belski [Fri, 3 Jul 2015 14:21:02 +0000 (16:21 +0200)]
fix backport mistake

in 5.6 it has to be explicitly copied to avoid double free

9 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Fri, 3 Jul 2015 11:32:05 +0000 (13:32 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed fix #69975 wrt. ODBCVER < 0x0300

9 years agofixed fix #69975 wrt. ODBCVER < 0x0300
Christoph M. Becker [Fri, 3 Jul 2015 11:30:39 +0000 (13:30 +0200)]
fixed fix #69975 wrt. ODBCVER < 0x0300

9 years agoimprove info about the applink
Anatol Belski [Fri, 3 Jul 2015 10:45:59 +0000 (12:45 +0200)]
improve info about the applink

9 years agoadded openssl applink shim note to UPGRADING.INTERNALS
Anatol Belski [Fri, 3 Jul 2015 10:40:18 +0000 (12:40 +0200)]
added openssl applink shim note to UPGRADING.INTERNALS

9 years agoadd missing item in the content table
Anatol Belski [Fri, 3 Jul 2015 09:46:30 +0000 (11:46 +0200)]
add missing item in the content table

9 years agoMerge branch 'PHP-5.6'
Anatol Belski [Fri, 3 Jul 2015 09:17:16 +0000 (11:17 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  backport c01943bffc8b719e552d307f522820d50f783a4c into 5.6

9 years agobackport c01943bffc8b719e552d307f522820d50f783a4c into 5.6
Anatol Belski [Fri, 3 Jul 2015 09:16:02 +0000 (11:16 +0200)]
backport c01943bffc8b719e552d307f522820d50f783a4c into 5.6

9 years agofix improper behavior
Anatol Belski [Fri, 3 Jul 2015 08:15:52 +0000 (10:15 +0200)]
fix improper behavior

openssl_spki_export() is documented to return string, but it's
obviously not achieved writing it to stdout :)

9 years agointegrate the applink shim in the other bins
Anatol Belski [Fri, 3 Jul 2015 05:10:46 +0000 (07:10 +0200)]
integrate the applink shim in the other bins

9 years agointegrate the openssl applink shim
Anatol Belski [Thu, 2 Jul 2015 17:49:40 +0000 (19:49 +0200)]
integrate the openssl applink shim

This fixes ext/openssl/tests/openssl_spki_export.phpt failing
with the no OPENSSL_Applink error. Applink is also an interesting
technique documented in the OpenSSL FAQ
https://www.openssl.org/support/faq.html#PROG2
which allows under circumstances using different OpenSSL binaries
than those a program was linked with.

9 years agoCatch the specifical exception
Xinchen Hui [Fri, 3 Jul 2015 03:18:53 +0000 (11:18 +0800)]
Catch the specifical exception

9 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Fri, 3 Jul 2015 01:12:09 +0000 (03:12 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Added more tests to improve function coverage

9 years agoAdded more tests to improve function coverage
Edgar R. Sandi [Tue, 30 Jun 2015 01:02:19 +0000 (22:02 -0300)]
Added more tests to improve function coverage

9 years agoAllow integer default for float type
Aaron Piotrowski [Thu, 2 Jul 2015 22:46:51 +0000 (17:46 -0500)]
Allow integer default for float type

9 years agoupdated NEWS
Christoph M. Becker [Thu, 2 Jul 2015 22:29:44 +0000 (00:29 +0200)]
updated NEWS

9 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Thu, 2 Jul 2015 22:25:03 +0000 (00:25 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns

9 years agoupdated NEWS
Christoph M. Becker [Thu, 2 Jul 2015 22:23:44 +0000 (00:23 +0200)]
updated NEWS

9 years agoFix #69975: PHP segfaults when accessing nvarchar(max) defined columns
Christoph M. Becker [Thu, 2 Jul 2015 22:04:50 +0000 (00:04 +0200)]
Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns

The SQL Server Native Client 11.0 and maybe other ODBC drivers report
NVARCHAR(MAX) columns as SQL_WVARCHAR with size 0. This causes too small a
buffer to be emalloc'd, likely causing a segfault in the following. As we don't
know the real size of the column data, we treat such colums as
SQL_WLONGVARCHAR.

The related bug #67437 suggests that some drivers report a size of ~4GB. It is
not certain that this is really the case (there might be some integer overflow
involved, and anyway, there has been no feedback), so we do not cater for this
now. However, it would not be hard to treat all sizes above a certain threshold
in a similar way, i.e. as SQL_WLONGVARCHAR.

9 years agoUpdate NEWS for bug #69957
Bob Weinand [Thu, 2 Jul 2015 19:19:26 +0000 (21:19 +0200)]
Update NEWS for bug #69957

9 years agoCorrect type hint name for booleans in method signatures
Niklas Keller [Thu, 2 Jul 2015 18:34:49 +0000 (20:34 +0200)]
Correct type hint name for booleans in method signatures

9 years agoXFAILED tests are not "You may have found a problem in PHP"
Bob Weinand [Thu, 2 Jul 2015 18:49:30 +0000 (20:49 +0200)]
XFAILED tests are not "You may have found a problem in PHP"

9 years agoIntroduce ArithmeticError
Bob Weinand [Thu, 2 Jul 2015 18:47:44 +0000 (20:47 +0200)]
Introduce ArithmeticError

9 years agoCleanup (avoid reallocation)
Dmitry Stogov [Thu, 2 Jul 2015 17:29:06 +0000 (20:29 +0300)]
Cleanup (avoid reallocation)