Skip to content
Commits on May 26, 2016
  1. @Tyrael

    Merge branch 'PHP-7.0'

    * PHP-7.0:
      update NEWS
    Tyrael committed May 26, 2016
  2. @Tyrael

    Merge branch 'PHP-5.6' into PHP-7.0

    * PHP-5.6:
      update NEWS
    Tyrael committed May 26, 2016
  3. @Tyrael

    update NEWS

    Tyrael committed May 26, 2016
Commits on May 25, 2016
  1. @weltling

    Expose missing flags from libzip at least >= 0.11.x

    These are helpful with reading/writing zips containing non UTF-8
    filenames to mitigate possibly changed libzip behaviors.
    weltling committed May 25, 2016
  2. @LawnGnome

    Merge branch 'PHP-7.0'

    * PHP-7.0:
      Fix typo in phpdbg help.
    LawnGnome committed May 25, 2016
  3. @LawnGnome

    Merge branch 'PHP-5.6' into PHP-7.0

    * PHP-5.6:
      Fix typo in phpdbg help.
    LawnGnome committed May 25, 2016
  4. @LawnGnome

    Fix typo in phpdbg help.

    Sorry, I would have included this in the last push had I spotted it a
    minute earlier.
    LawnGnome committed May 25, 2016
  5. @LawnGnome

    Merge branch 'PHP-7.0'

    * PHP-7.0:
      Add missing newlines to phpdbg's help for the run command.
    LawnGnome committed May 25, 2016
  6. @LawnGnome

    Merge branch 'PHP-5.6' into PHP-7.0

    * PHP-5.6:
      Add missing newlines to phpdbg's help for the run command.
    LawnGnome committed May 25, 2016
  7. @LawnGnome

    Add missing newlines to phpdbg's help for the run command.

    This is not at all related to needing screenshots for a talk I'm giving
    in two days. No sir. Not at all.
    LawnGnome committed May 25, 2016
  8. @remicollet

    Merge branch 'PHP-7.0'

    * PHP-7.0:
      Skip test which is 64bits only
    remicollet committed May 25, 2016
  9. @remicollet

    Merge branch 'PHP-5.6' into PHP-7.0

    * PHP-5.6:
      Skip test which is 64bits only
    remicollet committed May 25, 2016
  10. @remicollet

    Skip test which is 64bits only

    Diff from test output
    001+ Warning: fread(): Length parameter must be greater than 0 in ...
    001- Warning: fread(): Length parameter must be no more than 2147483647 in ...
    remicollet committed May 25, 2016
  11. @weltling

    Merge branch 'PHP-7.0'

    * PHP-7.0:
      update NEWS
    weltling committed May 25, 2016
  12. @weltling

    update NEWS

    weltling committed May 25, 2016
  13. @weltling

    Merge branch 'PHP-7.0'

    * PHP-7.0:
      fix test portability
    weltling committed May 25, 2016
  14. @weltling

    Merge branch 'PHP-5.6' into PHP-7.0

    * PHP-5.6:
      fix test portability
    weltling committed May 25, 2016
  15. @weltling

    fix test portability

    weltling committed May 25, 2016
  16. @weltling

    Merge branch 'PHP-7.0'

    * PHP-7.0:
      prepare for 5.6.22RC1
    weltling committed May 25, 2016
  17. @weltling

    Merge branch 'PHP-5.6' into PHP-7.0

    * PHP-5.6:
      prepare for 5.6.22RC1
    weltling committed May 25, 2016
  18. @smalyshev

    Merge branch 'PHP-7.0'

    * PHP-7.0:
      Fix memory leak in imagescale()
      Update NEWS
      Better fix for bug #72135
      Fixed bug #72227: imagescale out-of-bounds read
      Fix bug #72241: get_icu_value_internal out-of-bounds read
      Fix bug #72135 - don't create strings with lengths outside int range
      set versions
      Add check for string overflow to all string add operations
      Fix bug #72114 - int/size_t confusion in fread
      Updated NEWS
      Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
    smalyshev committed May 24, 2016
  19. @smalyshev

    Merge branch 'PHP-7.0.7' into PHP-7.0

    * PHP-7.0.7:
      Fix memory leak in imagescale()
      Update NEWS
      Better fix for bug #72135
      Fixed bug #72227: imagescale out-of-bounds read
      Fix bug #72241: get_icu_value_internal out-of-bounds read
      Fix bug #72135 - don't create strings with lengths outside int range
      set versions
      Add check for string overflow to all string add operations
      Fix bug #72114 - int/size_t confusion in fread
      Updated NEWS
      Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
    
    Conflicts:
    	configure.in
    	main/php_version.h
    smalyshev committed May 24, 2016
  20. @smalyshev

    Merge branch 'PHP-5.5' into PHP-7.0.7

    * PHP-5.5:
      Fix memory leak in imagescale()
      Update NEWS
      Better fix for bug #72135
      Fixed bug #72227: imagescale out-of-bounds read
      Fix bug #72241: get_icu_value_internal out-of-bounds read
      Fix bug #72135 - don't create strings with lengths outside int range
      Add check for string overflow to all string add operations
      Fix bug #72114 - int/size_t confusion in fread
      Updated NEWS
      Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
    
    Conflicts:
    	Zend/zend_operators.c
    	ext/intl/locale/locale_methods.c
    	ext/phar/dirstream.c
    	ext/phar/tests/bug71331.phpt
    	ext/standard/file.c
    	ext/standard/html.c
    smalyshev committed May 24, 2016
  21. @smalyshev

    Merge branch 'PHP-5.6.22' into PHP-5.6

    * PHP-5.6.22:
      Fix memory leak in imagescale()
      Update NEWS
      Better fix for bug #72135
      Fixed bug #72227: imagescale out-of-bounds read
      Fix bug #72241: get_icu_value_internal out-of-bounds read
      Fix bug #72135 - don't create strings with lengths outside int range
      prepare for 5.6.22RC1
      Add check for string overflow to all string add operations
      Fix bug #72114 - int/size_t confusion in fread
      Updated NEWS
      Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
    
    Conflicts:
    	configure.in
    	main/php_version.h
    smalyshev committed May 24, 2016
Commits on May 24, 2016
  1. @smalyshev

    Merge branch 'PHP-5.5' into PHP-5.6.22

    * PHP-5.5:
      Fix memory leak in imagescale()
      Update NEWS
      Better fix for bug #72135
      Fixed bug #72227: imagescale out-of-bounds read
      Fix bug #72241: get_icu_value_internal out-of-bounds read
      Fix bug #72135 - don't create strings with lengths outside int range
      Add check for string overflow to all string add operations
      Fix bug #72114 - int/size_t confusion in fread
      Updated NEWS
      Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
    
    Conflicts:
    	Zend/zend_operators.c
    	ext/phar/dirstream.c
    	ext/phar/tests/bug71331.phpt
    smalyshev committed May 24, 2016
  2. @smalyshev
  3. @smalyshev

    Update NEWS

    smalyshev committed May 24, 2016
  4. @smalyshev

    Better fix for bug #72135

    smalyshev committed May 24, 2016
  5. @dstogov

    Fixed bug #72213 (Finally leaks on nested exceptions).

    Squashed commit of the following:
    
    commit 8461b04
    Author: Dmitry Stogov <dmitry@zend.com>
    Date:   Wed May 25 00:34:42 2016 +0300
    
        Rmoved zend_try_catch_element.parent and walk through op_array.try_catch_array backward from the current try_cacth_offset.
    
    commit 0c71e24
    Author: Dmitry Stogov <dmitry@zend.com>
    Date:   Wed May 25 00:04:53 2016 +0300
    
        Move SAVE_OPLINE() to its original place
    
    commit 111432a
    Author: Dmitry Stogov <dmitry@zend.com>
    Date:   Wed May 25 00:01:10 2016 +0300
    
        Separate the common part of ZEND_HANDLE_EXCEPTION and FAST_RET into zend_dispatch_try_catch_finally_helper.
    
    commit 4f21c06
    Author: Nikita Popov <nikic@php.net>
    Date:   Tue May 24 14:55:27 2016 +0200
    
        Improve finally fix
    
    commit da5c727
    Author: Dmitry Stogov <dmitry@zend.com>
    Date:   Tue May 24 10:36:08 2016 +0300
    
        Fixed Zend/tests/try/bug70228_3.phpt and Zend/tests/try/bug70228_4.phpt
    
    commit cfcedf2
    Author: Dmitry Stogov <dmitry@zend.com>
    Date:   Tue May 24 02:59:27 2016 +0300
    
        Added test
    
    commit 4c6aa93
    Author: Dmitry Stogov <dmitry@zend.com>
    Date:   Tue May 24 00:38:20 2016 +0300
    
        Added tests
    
    commit 8a8f470
    Author: Dmitry Stogov <dmitry@zend.com>
    Date:   Mon May 23 23:27:34 2016 +0300
    
        Fixed bug #72213 (Finally leaks on nested exceptions)
    dstogov committed May 25, 2016
  6. @nikic
  7. @nikic

    Allow empty property names

    Conflicts:
    	Zend/zend_compile.c
    nikic committed Mar 23, 2016
  8. @nikic
  9. @nikic

    Replace BB end with BB len

    And support empty blocks everywhere.
    nikic committed May 18, 2016
  10. @dstogov

    Fixed white-spaces

    dstogov committed May 24, 2016
Commits on May 23, 2016
  1. @smalyshev
Something went wrong with that request. Please try again.