Permalink
Switch branches/tags
Commits on Jul 18, 2012
  1. 5.4.5

    smalyshev committed Jul 18, 2012
Commits on Jul 17, 2012
  1. Revert "Fix bug #62112: number_format() is not binary safe"

    smalyshev committed Jul 17, 2012
    This reverts commit 3e62aae.
Commits on Jul 4, 2012
  1. 5.4.5 RC1

    smalyshev committed Jul 4, 2012
Commits on Jul 2, 2012
Commits on Jul 1, 2012
  1. Fix accidential change of php_version.h

    nikic committed Jul 1, 2012
    For some reason the merge reverts changed the version :/
  2. Revert JSON merges to 5.4

    nikic committed Jul 1, 2012
    This reverts the following merge commits (-m 1):
    
    405ebfc
    d372b33
    36fa17a
  3. Merge branch 'PHP-5.3' into PHP-5.4

    nikic committed Jul 1, 2012
    * PHP-5.3:
      Revert JSON changes to PHP 5.3
  4. Revert JSON changes to PHP 5.3

    nikic committed Jul 1, 2012
    This reverts the following commits:
    
    9743246
    4662151
    84fe2cc
    
    This does not revert the JSON changes released in PHP 5.3.14.
  5. Merge branch 'PHP-5.3' into PHP-5.4

    smalyshev committed Jul 1, 2012
    * PHP-5.3:
      remove duplicates, fix order
  6. update NEWS

    smalyshev committed Jul 1, 2012
  7. remove duplicates, fix order

    smalyshev committed Jul 1, 2012
Commits on Jun 30, 2012
  1. Merge branch 'PHP-5.3' into PHP-5.4

    felipensp committed Jun 30, 2012
    * PHP-5.3:
      - Fixed bug #62415 (Undefined variable: diff in run-tests.php on line 2093 for successful XFAIL)
  2. - Fixed bug #62415 (Undefined variable: diff in run-tests.php on line…

    felipensp committed Jun 30, 2012
    … 2093 for successful XFAIL)
Commits on Jun 29, 2012
  1. merge

    andrey committed Jun 29, 2012
  2. Merge branch 'PHP-5.3' into PHP-5.4

    andrey committed Jun 29, 2012
  3. Merge branch 'PHP-5.3' into PHP-5.4

    andrey committed Jun 29, 2012
  4. Merge branch 'PHP-5.3' into PHP-5.4

    nikic committed Jun 29, 2012
    * PHP-5.3:
      Fix some lengths in crypt()
    
    Conflicts:
    	ext/standard/crypt.c
  5. Fix some lengths in crypt()

    nikic committed Jun 29, 2012
    Use salt_len_in instead of strlen(salt) or PHP_MAX_SALT_LEN, otherwise too
    much memory will be allocated.
    
    sha512 has a 86 character checksum, not 43. That probably was a copy&paste
    from the sha256 code which indeed has 43.
    
    The allocation also was using sizeof(char *), thus allocating 4 or 8 times
    as much memory as necessary. The sizeof(char *) was removed in the 5.4
    branch in b7a92c9 but forgotten on 5.3.
    
    The memset 0 call was using PHP_MAX_SALT_LEN which can be smaller than the
    output buffer and thus not zeroing out everything. Use the size of the
    output buffer (needed) instead.
  6. Merge branch 'PHP-5.3' into PHP-5.4

    andrey committed Jun 29, 2012
  7. new charsets

    andrey committed Jun 29, 2012
  8. fix NEWS order

    smalyshev committed Jun 29, 2012
  9. Merge branch 'PHP-5.3' into PHP-5.4

    Anthony Ferrara committed Jun 29, 2012
    * PHP-5.3:
      Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)
  10. Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)

    Anthony Ferrara committed Jun 29, 2012
    Fixed a memory allocation bug in crypt() SHA256/512 that can
    cause segmentation faults when passed in salts with a null byte
    early.
Commits on Jun 28, 2012
  1. Merge branch 'PHP-5.3' into PHP-5.4

    nikic committed Jun 28, 2012
    * PHP-5.3:
      Add json_last_error_msg() function
  2. Add json_last_error_msg() function

    nikic committed Jun 28, 2012
    This replaces json_last_error(true) and is consistent with other custom
    error handling functions.
Commits on Jun 27, 2012
  1. Merge branch 'PHP-5.3' into PHP-5.4

    johannes committed Jun 27, 2012
    * PHP-5.3:
      Fix #62432 ReflectionMethod random corrupt memory on high concurrent
    
    Conflicts:
    	ext/date/php_date.c
    	ext/fileinfo/fileinfo.c
    	ext/pdo/pdo_dbh.c
    	ext/pdo/pdo_stmt.c
    	ext/reflection/php_reflection.c
    	ext/spl/spl_array.c
    	ext/spl/spl_directory.c
    	ext/spl/spl_dllist.c
    	ext/spl/spl_fixedarray.c
    	ext/spl/spl_heap.c
    	ext/spl/spl_iterators.c
    	ext/spl/spl_observer.c
    	ext/sqlite/sqlite.c
    	ext/sqlite3/sqlite3.c
    	ext/tidy/tidy.c
    	ext/xmlreader/php_xmlreader.c
    	ext/xmlwriter/php_xmlwriter.c
    	ext/xsl/php_xsl.c
    	ext/zip/php_zip.c
  2. Fix #62432 ReflectionMethod random corrupt memory on high concurrent

    johannes committed Jun 27, 2012
    This fixes the same issue in multiple extensions. This isn't needed
    in later branches as 5.4 introduced object_properties_init()
  3. Merge branch 'PHP-5.3' into PHP-5.4

    nikic committed Jun 27, 2012
    * PHP-5.3:
      Improve JSON error handling
    
    Conflicts:
    	ext/json/tests/bug54058.phpt
    	ext/json/tests/bug61537.phpt
  4. Improve JSON error handling

    nikic committed Jun 27, 2012
    json_encode() no longer throws warnings. Instead only the error code for
    json_last_error() is set.
    
    As it is hard to debug the error from just an error code an optional
    $as_string parameter was added to json_last_error(), which returns an
    error message instead of an error code.