Fix for Bug #63916 #252

Closed
wants to merge 10,000 commits into
from
This pull request is big! We’re only showing the most recent 250 commits.
Commits on Dec 5, 2012
  1. Merge branch 'PHP-5.4' into PHP-5.5

    weltling committed Dec 5, 2012
    * PHP-5.4:
      Two tests deactivated until #63688 was fixed
  2. Merge branch 'PHP-5.5'

    weltling committed Dec 5, 2012
    * PHP-5.5:
      Two tests deactivated until #63688 was fixed
  3. Merge branch 'PHP-5.5'

    dstogov committed Dec 5, 2012
    * PHP-5.5:
      Slight performance improvement
  4. Merge branch 'master' of git.php.net:php-src

    dstogov committed Dec 5, 2012
    * 'master' of git.php.net:php-src:
      Two tests deactivated until #63688 was fixed
  5. Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

    dstogov committed Dec 5, 2012
    * 'PHP-5.5' of git.php.net:php-src:
      Two tests deactivated until #63688 was fixed
  6. Fixed comments

    dstogov committed Dec 5, 2012
  7. Merge branch 'PHP-5.5'

    dstogov committed Dec 5, 2012
    * PHP-5.5:
      Fixed comments
  8. Merge branch 'PHP-5.4' into PHP-5.5

    dstogov committed Dec 5, 2012
    * PHP-5.4:
      Fixed bug #63680 (Memleak in splfixedarray with cycle reference)
    
    Conflicts:
    	NEWS
  9. Merge branch 'PHP-5.5'

    dstogov committed Dec 5, 2012
    * PHP-5.5:
      Fixed bug #63680 (Memleak in splfixedarray with cycle reference)
  10. Merge branch 'PHP-5.4' into PHP-5.5

    dstogov committed Dec 5, 2012
    * PHP-5.4:
      Use get_gc instead of hacks of get_properties
  11. Merge branch 'PHP-5.5'

    dstogov committed Dec 5, 2012
    * PHP-5.5:
      Use get_gc instead of hacks of get_properties
  12. Merge branch 'PHP-5.3' into PHP-5.4

    johannes committed Dec 5, 2012
    Conflicts:
    	configure.in
    	main/php_version.h
  13. Merge branch 'PHP-5.5'

    johannes committed Dec 5, 2012
Commits on Dec 6, 2012
  1. Invoke re2c with --no-generation-date to prevent unintentional / unne…

    sebastianbergmann committed Dec 6, 2012
    …cessary changes in generated files.
  2. Leftover: Invoke re2c with --no-generation-date to prevent unintentio…

    sebastianbergmann committed Dec 6, 2012
    …nal / unnecessary changes in generated files.
  3. Merge branch 'PHP-5.5'

    dstogov committed Dec 6, 2012
    * PHP-5.5:
      Generatirs are going to be used less than regular functions
  4. Cleanup NEWS

    sebastianbergmann committed Dec 6, 2012
Commits on Dec 10, 2012
  1. Merge branch 'PHP-5.5'

    laruence committed Dec 10, 2012
  2. Fixed bug #63726 (Memleak with static properties and internal/user cl…

    laruence committed Dec 10, 2012
    …asses)
    
    No test scripts provided (will try to find one)
  3. Merge branch 'PHP-5.5'

    laruence committed Dec 10, 2012
  4. Merge branch 'PHP-5.5'

    johannes committed Dec 10, 2012
  5. Merge branch 'PHP-5.5'

    johannes committed Dec 10, 2012
  6. Deprecate ext/mysql.

    LawnGnome committed Dec 10, 2012
    Per https://wiki.php.net/rfc/mysql_deprecation, connecting to a MySQL database
    via ext/mysql now generates an E_DEPRECATED error. This commit includes the
    minimal EXPECTF updates required for the test suite to pass: it may be
    preferable to refactor some of the tests to suppress deprecation errors in
    situations where no other error is expected from mysql_[p]connect(), but I'm
    not enough of a MySQL expert to want to get my hands that dirty in a long
    standing test suite.
  7. Merge branch 'PHP-5.5'

    LawnGnome committed Dec 10, 2012
    * PHP-5.5:
      Deprecate ext/mysql.
Commits on Dec 11, 2012
  1. Tinker with the wording of the MySQL deprecation news post.

    LawnGnome committed Dec 11, 2012
    I know that in general NEWS is a very punchy "this is what happened" log, but
    Chris e-mailed me off-list to ask if it could be added to avoid any FUD — this
    merely brings the NEWS post into line with UPGRADING, the migration guide, and
    every other piece of advice we're giving out.
    
    I also forgot to add the RFC URL last night, so added that.
  2. Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare …

    LawnGnome committed Dec 11, 2012
    …numbers.
    
    Fixes bug #63737 (json_decode does not properly decode with options parameter).
  3. Merge branch 'PHP-5.4' into PHP-5.5

    LawnGnome committed Dec 11, 2012
    * PHP-5.4:
      Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.
  4. Merge branch 'PHP-5.5'

    LawnGnome committed Dec 11, 2012
  5. - generators API exported for extensions

    dstogov committed Dec 11, 2012
    - improved RETURN sequence to avoid redundant check if op_array is a generator
  6. Merge branch 'PHP-5.5'

    dstogov committed Dec 11, 2012
    * PHP-5.5:
      - generators API exported for extensions - improved RETURN sequence to avoid redundant check if op_array is a generator
  7. Fixed Bug #63738 unpack: back result with Z format

    remicollet committed Dec 11, 2012
    Fix result for empty string.
    Same output as perl
    perl -e 'print unpack("Z2","\0\0");' => ""
    perl -e 'print unpack("Z2","A\0");'  => "A"
    perl -e 'print unpack("Z2","AB\0");' => "AB"
    perl -e 'print unpack("Z2","ABC\0");'=> "AB"
  8. Merge branch 'PHP-5.5'

    remicollet committed Dec 11, 2012
    * PHP-5.5:
      Fixed Bug #63738 unpack: back result with Z format
Commits on Dec 12, 2012
  1. Fixed license

    lt committed Dec 12, 2012
    Looks like a find and replace gone wrong.
  2. Merge branch 'PHP-5.5'

    dstogov committed Dec 12, 2012
    * PHP-5.5:
      Restored proper generators behaviour in conjunction with "finally". (Nikita)
  3. Really fix test pdo_mysql_class_constants.phpt

    remicollet committed Dec 12, 2012
    - with mysqlnd, constant always present
    - with mysqli, check client library version
    - without mysqlnd and without mysqli
    	skip the test if no connection
    	use connection to check client library
    
    Note : MySQLPDOTest::getClientVersion() is broken with mysqlnd
    as PDO::ATTR_CLIENT_VERSION return "mysqlnd 5.0.11-dev - 20120503..."
    so, getClientVersion() return "11"
  4. Merge branch 'PHP-5.5'

    remicollet committed Dec 12, 2012
    * PHP-5.5:
      Really fix test pdo_mysql_class_constants.phpt
  5. An exception thrown in try or catch block is disacarded by return sta…

    dstogov committed Dec 12, 2012
    …tement in finally block.
  6. Merge branch 'PHP-5.5'

    dstogov committed Dec 12, 2012
    * PHP-5.5:
      An exception thrown in try or catch block is disacarded by return statement in finally block.
  7. Merge branch 'master' of git.php.net:php-src

    dstogov committed Dec 12, 2012
    * 'master' of git.php.net:php-src:
      Really fix test pdo_mysql_class_constants.phpt
  8. Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

    dstogov committed Dec 12, 2012
    * 'PHP-5.5' of git.php.net:php-src:
      Really fix test pdo_mysql_class_constants.phpt
Commits on Dec 13, 2012
  1. Merge branch 'PHP-5.5'

    laruence committed Dec 13, 2012
  2. Merge branch 'PHP-5.4' into PHP-5.5

    dstogov committed Dec 13, 2012
    * PHP-5.4:
      Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)
    
    Conflicts:
    	NEWS
  3. Merge branch 'PHP-5.5'

    dstogov committed Dec 13, 2012
    * PHP-5.5:
      Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)
  4. Merge branch 'PHP-5.5'

    dstogov committed Dec 13, 2012
    * PHP-5.5:
      Removed redundand checks from release build
  5. Removed unnecessary checks

    dstogov committed Dec 13, 2012
  6. Merge branch 'PHP-5.5'

    dstogov committed Dec 13, 2012
    * PHP-5.5:
      Removed unnecessary checks
  7. Removed unreachable code

    dstogov committed Dec 13, 2012
  8. Merge branch 'PHP-5.5'

    dstogov committed Dec 13, 2012
    * PHP-5.5:
      Removed unreachable code
  9. Merge branch 'PHP-5.4' into PHP-5.5

    weltling committed Dec 13, 2012
    * PHP-5.4:
      Fixed mysqlnd compilation in debug mode on windows
  10. Merge branch 'PHP-5.5'

    weltling committed Dec 13, 2012
    * PHP-5.5:
      Fixed mysqlnd compilation in debug mode on windows
  11. Merge branch 'PHP-5.5'

    johannes committed Dec 13, 2012
  12. Fix #63379 - Don't reset mod_user_is_open in destroy

    arraypad committed Dec 13, 2012
    The parent handler is still open so the reset here was in error.
  13. Merge branch 'PHP-5.4' into PHP-5.5

    arraypad committed Dec 13, 2012
    * PHP-5.4:
      Fix #63379 - Don't reset mod_user_is_open in destroy
Commits on Dec 14, 2012
  1. Merge branch 'PHP-5.5'

    arraypad committed Dec 14, 2012
    * PHP-5.5:
      Fix #63379 - Don't reset mod_user_is_open in destroy
  2. Merge branch 'PHP-5.4'

    rlerdorf committed Dec 14, 2012
  3. Merge branch 'PHP-5.5'

    rlerdorf committed Dec 14, 2012
  4. Merge branch 'PHP-5.5'

    rlerdorf committed Dec 14, 2012
  5. Merge branch 'PHP-5.5'

    dstogov committed Dec 14, 2012
    * PHP-5.5:
      Fixed uninitialized EX(call)->called_scope
  6. Add test for bug #63741

    laruence committed Dec 14, 2012
  7. Add test for bug #63741

    laruence committed Dec 14, 2012
  8. Merge branch 'PHP-5.5'

    laruence committed Dec 14, 2012
  9. Merge branch 'PHP-5.5'

    laruence committed Dec 14, 2012
  10. Merge branch 'PHP-5.5'

    laruence committed Dec 14, 2012
  11. update list of common Mime Types in PHP development server to support…

    pascalchevrel authored and lstrojny committed Dec 11, 2012
    … Web audio/video formats (Webm ,and Ogg containers) + have jpeg mime types listed together
  12. Merge branch 'PHP-5.5'

    lstrojny committed Dec 14, 2012
Commits on Dec 15, 2012
Commits on Dec 16, 2012
Commits on Dec 17, 2012
  1. Merge branch 'PHP-5.5'

    laruence committed Dec 17, 2012
  2. Merge branch 'PHP-5.5'

    laruence committed Dec 17, 2012
Commits on Dec 18, 2012
  1. Fixed bug that exception won't be catched

    laruence committed Dec 18, 2012
    related failed test Zend/tests/bug35437.phpt (after he latest
    execute_data improvement, run with non CALL vm kind)
  2. Revert "Fixed bug that exception won't be catched"

    laruence committed Dec 18, 2012
    This reverts commit 28db07a.
    
    Unexpected vm kind change
  3. ixed bug that exception won't be catched

    laruence committed Dec 18, 2012
    Related failed test Zend/tests/bug35437.phpt (after he latest
    execute_data improvement, run with non CALL vm kind)
  4. be cautious about the result of strrchr

    Andrey Hristov
    Andrey Hristov committed Dec 18, 2012
  5. News for PHP 5.5.0 Alphas

    dsp committed Dec 14, 2012
  6. Merge branch 'PHP-5.5'

    dsp committed Dec 18, 2012
    * PHP-5.5:
      News for PHP 5.5.0 Alphas
  7. Fix leak when generator ignores sent value

    nikic committed Dec 18, 2012
    When the return value of yield wasn't used it was leaked.
    
    This is fixed by using a TMP_VAR return value instead of VAR. TMP_VARs are
    automatically freed when they aren't used.
  8. Merge branch 'PHP-5.5'

    nikic committed Dec 18, 2012
Commits on Dec 19, 2012
  1. Merge branch 'PHP-5.4' into PHP-5.5

    remicollet committed Dec 19, 2012
    * PHP-5.4:
      fix failing test on Linux build
  2. Merge branch 'PHP-5.5'

    remicollet committed Dec 19, 2012
    * PHP-5.5:
      fix failing test on Linux build
  3. Merge branch 'PHP-5.4'

    Andrey Hristov
    Andrey Hristov committed Dec 19, 2012
    Conflicts:
    	ext/mysqlnd/mysqlnd_alloc.c
  4. Merge branch 'master' of ssh://git.php.net/php-src

    Andrey Hristov
    Andrey Hristov committed Dec 19, 2012
  5. Add missing zend_do_free call

    nikic committed Dec 19, 2012
    This is a followup to d53f1bf. When the yield *statement* is used its
    return value still needs to be freed.
  6. Merge branch 'PHP-5.5'

    nikic committed Dec 19, 2012
  7. Merge branch 'PHP-5.4'

    Andrey Hristov
    Andrey Hristov committed Dec 19, 2012
  8. Merge branch 'master' of ssh://git.php.net/php-src

    Andrey Hristov
    Andrey Hristov committed Dec 19, 2012
  9. Merge branch 'PHP-5.4' into PHP-5.5

    Andrey Hristov
    Andrey Hristov committed Dec 19, 2012
    Conflicts:
    	ext/mysqlnd/mysqlnd_alloc.c
  10. Merge branch 'PHP-5.5'

    Andrey Hristov
    Andrey Hristov committed Dec 19, 2012
  11. Merge branch 'PHP-5.5'

    johannes committed Dec 19, 2012
Commits on Dec 20, 2012
  1. Merge branch 'PHP-5.3' into PHP-5.4

    adoy committed Dec 20, 2012
    * PHP-5.3:
      Fixed bug #55438 (Curlwapper is not sending http header randomly)
  2. Merge branch 'PHP-5.4' into PHP-5.5

    adoy committed Dec 20, 2012
    * PHP-5.4:
      Fixed bug #55438 (Curlwapper is not sending http header randomly)
  3. Merge branch 'PHP-5.5'

    adoy committed Dec 20, 2012
    * PHP-5.5:
      Fixed bug #55438 (Curlwapper is not sending http header randomly)
  4. Fix for bug #63811

    rlerdorf committed Dec 20, 2012
  5. Merge branch 'PHP-5.5'

    rlerdorf committed Dec 20, 2012
  6. Do not add a ref to EX(object) on generator clone

    nikic committed Dec 20, 2012
    If a ref has to be added it will be already added while walking the call
    slots.
  7. Merge branch 'PHP-5.5'

    nikic committed Dec 20, 2012
Commits on Dec 21, 2012
  1. Fix bug #63822: Crash when using closures with ArrayAccess

    nikic committed Dec 21, 2012
    op_array->T was used after the closure's op_array was already freed. This just
    swaps the freeing order.
  2. Merge branch 'PHP-5.5'

    nikic committed Dec 21, 2012
  3. Fix crash when last yielded value is a closure

    nikic committed Dec 21, 2012
    If zend_generator_close is called from within zend_generator_resume (e.g.
    due to a return statement) then all the EGs will still be using the values
    from the generator. That's why the stack frame has to be the last thing
    that is dtored, otherwise some other dtor that is using
    EG(current_execute_data) might access the already freed memory segment.
    This was the case with the closure dtor.
    
    The fix is to move the dtors for key and value to the start of the handler.
    This way the stack frame is the last thing that is freed.
  4. Merge branch 'PHP-5.5'

    nikic committed Dec 21, 2012
  5. Fix test

    adoy committed Dec 21, 2012
    This test is only valid if libcurl < 7.28.1 since
    libcurl removed support for the 1 value in CURLOPT_SSL_VERIFYHOST.
  6. Merge branch 'PHP-5.4' into PHP-5.5

    adoy committed Dec 21, 2012
    * PHP-5.4:
      Fix test
  7. Merge branch 'PHP-5.5'

    adoy committed Dec 21, 2012
    * PHP-5.5:
      Fix test
  8. Merge branch 'PHP-5.3' into PHP-5.4

    adoy committed Dec 21, 2012
    * PHP-5.3:
      Fix test to work on every libcurl version
      - Fixed typo on "SKIPIF" (causing make test to abort on some systems)
    
    Conflicts:
    	tests/output/bug63377.phpt
  9. Merge branch 'PHP-5.4' into PHP-5.5

    adoy committed Dec 21, 2012
    * PHP-5.4:
      Fix test to work on every libcurl version
      - Fixed typo on "SKIPIF" (causing make test to abort on some systems)
  10. Merge branch 'PHP-5.5'

    adoy committed Dec 21, 2012
    * PHP-5.5:
      Fix test to work on every libcurl version
      - Fixed typo on "SKIPIF" (causing make test to abort on some systems)
Commits on Dec 22, 2012
  1. Merge branch 'PHP-5.3' into PHP-5.4

    adoy committed Dec 22, 2012
    * PHP-5.3:
      Update NEWS file
      Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers)
      CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)
    
    Conflicts:
    	ext/curl/interface.c
    	ext/curl/tests/bug63363.phpt
  2. Merge branch 'PHP-5.4' into PHP-5.5

    adoy committed Dec 22, 2012
    * PHP-5.4:
      Update NEWS file
      Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers)
      CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)
  3. Merge branch 'PHP-5.5'

    adoy committed Dec 22, 2012
    * PHP-5.5:
      Update NEWS file
      Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers)
      CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)
Commits on Dec 23, 2012
  1. Merge branch 'PHP-5.3' into PHP-5.4

    adoy committed Dec 23, 2012
    * PHP-5.3:
      Fixed segfault due to libcurl connection caching
  2. Update NEWS file

    adoy committed Dec 23, 2012
  3. Merge branch 'PHP-5.4' into PHP-5.5

    adoy committed Dec 23, 2012
    * PHP-5.4:
      Update NEWS file
      Fixed segfault due to libcurl connection caching
  4. Merge branch 'PHP-5.5'

    adoy committed Dec 23, 2012
    * PHP-5.5:
      Update NEWS file
      Fixed segfault due to libcurl connection caching
  5. Add curl_multi_setopt and clean curl_share_setopt

    adoy committed Dec 23, 2012
    curl_multi_setopt is now available and supports CURLMOPT_PIPELINING
    and CURLMOPT_MAXCONNECTS
  6. Support for curl_strerror and curl_multi_strerror

    adoy committed Dec 23, 2012
    Add the support for both curl_strerror and curl_multi_strerror.
    Those function will return a string describing the error code
    passed in the argument errornum
  7. New curl_pause() function

    adoy committed Dec 23, 2012
    Add the curl_pause function (binding of curl_easy_pause).
    Using this function, you can explicitly mark a running connection
    to get paused, and you can unpause a connection that was
    previously paused.
  8. Update NEWS

    adoy committed Dec 23, 2012
  9. Merge branch 'PHP-5.5'

    adoy committed Dec 23, 2012
    * PHP-5.5:
      Update NEWS
      New curl_pause() function
      Support for curl_strerror and curl_multi_strerror
      Add curl_multi_setopt and clean curl_share_setopt
      Remove duplicated function definition
  10. Implement Generator::throw() method

    nikic committed Dec 17, 2012
    Generator::throw($exception) throws an exception into the generator. The
    exception is thrown at the current point of suspension within the generator.
    It basically behaves as if the current yield statement were replaced with
    a throw statement and the generator subsequently resumed.
  11. Merge branch 'PHP-5.5'

    nikic committed Dec 23, 2012
Commits on Dec 25, 2012
  1. Traits refactoring

    dstogov committed Dec 25, 2012
  2. Merge branch 'PHP-5.4' into PHP-5.5

    dstogov committed Dec 25, 2012
    * PHP-5.4:
      Traits refactoring
  3. Merge branch 'PHP-5.5'

    dstogov committed Dec 25, 2012
    * PHP-5.5:
      Traits refactoring
  4. Removed deprecated fields

    dstogov committed Dec 25, 2012
  5. Merge branch 'PHP-5.5'

    dstogov committed Dec 25, 2012
    * PHP-5.5:
      Removed deprecated fields
  6. Fixed ZTS build

    dstogov committed Dec 25, 2012
  7. Merge branch 'PHP-5.4' into PHP-5.5

    dstogov committed Dec 25, 2012
    * PHP-5.4:
      Fixed ZTS build
  8. Merge branch 'PHP-5.5'

    dstogov committed Dec 25, 2012
    * PHP-5.5:
      Fixed ZTS build
  9. spelling

    dstogov committed Dec 25, 2012
  10. Merge branch 'PHP-5.4' into PHP-5.5

    dstogov committed Dec 25, 2012
    * PHP-5.4:
      spelling
  11. Merge branch 'PHP-5.5'

    dstogov committed Dec 25, 2012
    * PHP-5.5:
      spelling
  12. spelling

    dstogov committed Dec 25, 2012
  13. Merge branch 'PHP-5.5'

    dstogov committed Dec 25, 2012
    * PHP-5.5:
      spelling
Commits on Dec 26, 2012
  1. Merge branch 'PHP-5.3' into PHP-5.4

    adoy committed Dec 26, 2012
    * PHP-5.3:
      Remove a useless memory write in zend_llist_del_element
  2. Merge branch 'PHP-5.4' into PHP-5.5

    adoy committed Dec 26, 2012
    * PHP-5.4:
      Remove a useless memory write in zend_llist_del_element
  3. Merge branch 'PHP-5.5'

    adoy committed Dec 26, 2012
    * PHP-5.5:
      Remove a useless memory write in zend_llist_del_element
  4. Fix ext/curl tests to work on every libcurl versions

    adoy committed Dec 26, 2012
    Thanks Laruence :)
  5. Merge branch 'PHP-5.5'

    adoy committed Dec 26, 2012
    * PHP-5.5:
      Fix ext/curl tests to work on every libcurl versions
  6. Merge branch 'PHP-5.4' into PHP-5.5

    adoy committed Dec 26, 2012
    * PHP-5.4:
      Revert "Remove a useless memory write in zend_llist_del_element"
  7. Merge branch 'PHP-5.5'

    adoy committed Dec 26, 2012
    * PHP-5.5:
      Revert "Remove a useless memory write in zend_llist_del_element"
Commits on Dec 27, 2012
  1. Fixed #63859 Memory leak when reusing curl-handle

    adoy committed Dec 27, 2012
    When CURLOPT_POSTFIELDS is called more than once on the same
    curl handle, php/curl did not free the memory of the previous
    post data. This commit will fix the problem unless the curl
    handle was previously duplicated using the curl_copy_handle()
    function in which case we can not know if the post data is
    still in use or not by any curl handle
  2. Merge branch 'PHP-5.4' into PHP-5.5

    adoy committed Dec 27, 2012
    * PHP-5.4:
      Fixed #63859 Memory leak when reusing curl-handle
  3. Merge branch 'PHP-5.5'

    adoy committed Dec 27, 2012
    * PHP-5.5:
      Fixed #63859 Memory leak when reusing curl-handle
Commits on Dec 28, 2012
  1. Add new curl options

    adoy committed Dec 28, 2012
    Addes new curl options CURLOPT_TELNETOPTIONS, CURLOPT_GSSAPI_DELEGATION,
    CURLOPT_ACCEPTTIMEOUT_MS, CURLOPT_SSL_OPTIONS, CURLOPT_TCP_KEEPALIVE,
    CURLOPT_TCP_KEEPIDLE and CURLOPT_TCP_KEEPINTVL.
  2. Merge branch 'PHP-5.5'

    adoy committed Dec 28, 2012
    * PHP-5.5:
      Add new curl options
Commits on Dec 29, 2012
  1. Treat "+0" and "-0" as valid integers just like var_dump() does.

    mj authored and lstrojny committed Dec 24, 2012
    This fixes bug #54096.
  2. Add more tests for the new +0/-0 behaviour.

    mj authored and lstrojny committed Dec 26, 2012
  3. Merge branch 'PHP-5.5'

    lstrojny committed Dec 29, 2012
Commits on Dec 30, 2012
  1. Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)

    adoy committed Dec 30, 2012
    T_END_HEREDOC don't carry a token value anymore since commit 4cf90e0
    Bugfix by Nikita for bug #60097
  2. Merge branch 'PHP-5.5'

    adoy committed Dec 30, 2012
    * PHP-5.5:
      Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)
Commits on Jan 1, 2013
  1. Happy New Year

    laruence committed Jan 1, 2013
  2. Happy New Year

    laruence committed Jan 1, 2013
  3. Merge branch 'PHP-5.5'

    laruence committed Jan 1, 2013
Commits on Jan 2, 2013
  1. Remove passwd handler from struct when not needed

    adoy committed Jan 2, 2013
    CURLOPT_PASSWDFUNCTION was removed in cURL 7.15.5, the passwd field
    will not be used for version greater than this one
  2. Merge branch 'PHP-5.5'

    adoy committed Jan 2, 2013
    * PHP-5.5:
      Remove passwd handler from struct when not needed
  3. fix NEWS

    smalyshev committed Dec 31, 2012
  4. Bug #43177: If an eval() has a parse error, the overall exit status a…

    smalyshev committed Jan 2, 2013
    …nd return code should not be affected.
    
    Without this fix, a webpage using eval() may return code 500.  That might display
    fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
  5. Merge branch 'PHP-5.4' into PHP-5.5

    smalyshev committed Jan 2, 2013
    * PHP-5.4:
      Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
      fix NEWS
    
    Conflicts:
    	main/main.c
  6. Merge branch 'PHP-5.5'

    smalyshev committed Jan 2, 2013
    * PHP-5.5:
      Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
      fix NEWS
  7. add fix #43177

    smalyshev committed Jan 2, 2013
  8. Merge branch 'PHP-5.4' into PHP-5.5

    smalyshev committed Jan 2, 2013
    * PHP-5.4:
      add fix #43177
  9. Merge branch 'PHP-5.5'

    smalyshev committed Jan 2, 2013
    * PHP-5.5:
      add fix #43177
  10. add bug #63762

    smalyshev committed Jan 2, 2013
  11. Merge branch 'PHP-5.4' into PHP-5.5

    smalyshev committed Jan 2, 2013
    * PHP-5.4:
      add bug #63762
  12. Merge branch 'PHP-5.5'

    smalyshev committed Jan 2, 2013
    * PHP-5.5:
      add bug #63762
  13. Merge branch 'PHP-5.5'

    remicollet committed Jan 2, 2013
    * PHP-5.5:
      remove set but not used variables
Commits on Jan 3, 2013
  1. Merge branch 'PHP-5.3' into PHP-5.4

    johannes committed Jan 3, 2013
    Conflicts:
    	configure.in
    	main/php_version.h
  2. Merge branch 'PHP-5.5'

    johannes committed Jan 3, 2013
Commits on Jan 4, 2013
  1. 5.4.12-dev

    smalyshev committed Jan 4, 2013
  2. Merge branch 'PHP-5.4' into PHP-5.5

    smalyshev committed Jan 4, 2013
    * PHP-5.4:
      5.4.12-dev
      This will be PHP 5.3.22
    
    Conflicts:
    	configure.in
    	main/php_version.h
  3. Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

    smalyshev committed Jan 4, 2013
    * 'PHP-5.5' of git.php.net:php-src:
      remove set but not used variables
  4. Merge branch 'PHP-5.5'

    smalyshev committed Jan 4, 2013
    * PHP-5.5:
      5.4.12-dev
  5. Update NEWS

    laruence committed Jan 4, 2013
  6. Merge branch 'PHP-5.5'

    laruence committed Jan 4, 2013
Commits on Jan 5, 2013
  1. Improve resource management for curl handle

    adoy committed Jan 5, 2013
    Previous implementation was using its own refcounting (uses field of
    the php_curl struct). zend_list_add/remove already implements its own
    refcount, so we don't need to use an other one.
  2. Merge branch 'PHP-5.5'

    adoy committed Jan 5, 2013
    * PHP-5.5:
      Improve resource management for curl handle
Commits on Jan 6, 2013
  1. Bug #63699 performance improvements for ext/date by only validating t…

    lstrojny committed Jan 6, 2013
    …imezone when timezone is set
  2. Merge branch 'PHP-5.5'

    lstrojny committed Jan 6, 2013
  3. Adding test from 5.5

    lstrojny committed Jan 6, 2013
  4. bump year

    laruence committed Jan 6, 2013
  5. Merge branch 'PHP-5.5'

    lstrojny committed Jan 6, 2013
  6. Merge branch 'PHP-5.5'

    laruence committed Jan 6, 2013
  7. Fixes Bug #63916 PDO::PARAM_INT casts to 32bit int internally even on…

    srgoogleguy committed Jan 6, 2013
    … 64bit builds in pdo_sqlite.