Permalink
Commits on Mar 20, 2012
  1. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Bump copyright year.
    mj committed Mar 20, 2012
  2. Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      Bump copyright year.
    mj committed Mar 20, 2012
  3. Bump copyright year.

    Bug #61386
    mj committed Mar 20, 2012
  4. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Ignore the temporay files in sapi/*/tests/
    laruence committed Mar 20, 2012
  5. Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      Ignore the temporay files in sapi/*/tests/
    laruence committed Mar 20, 2012
  6. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Ignore the temporay files in sapi/*/tests/
    laruence committed Mar 20, 2012
  7. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Minor change, test using php mail address as account
    laruence committed Mar 20, 2012
  8. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Use newdoc instead of escape char
      adapt makedist to git
    laruence committed Mar 20, 2012
  9. adapt makedist to git

    smalyshev committed Mar 20, 2012
Commits on Mar 19, 2012
  1. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Minor text changes (to try new git repo)
      Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK
    Christopher Jones committed Mar 19, 2012
  2. Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      Minor text changes (to try new git repo)
    Christopher Jones committed Mar 19, 2012
  3. Minor text changes (to try new git repo)

    Christopher Jones committed Mar 19, 2012
  4. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK
    dsp committed Mar 19, 2012
  5. Merge branch 'pull-request/5' into PHP-5.4

    * pull-request/5:
      Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK
    dsp committed Mar 19, 2012
  6. Merge branch 'PHP-5.4'

    * PHP-5.4:
      fix tests failing due to corrected hash tiger
    m6w6 committed Mar 19, 2012
  7. fix tests failing due to corrected hash tiger

    mhash_00{1,3}.phpt were failing because of the corrected hash tiger byte
    output order
    
    fixes bug #60922:
     tests fail for mhash() and mhash_keygen_s2k() functions and MHASH_TIGER
    m6w6 committed Mar 19, 2012
  8. Merge branch 'PHP-5.4' of http://git.php.net/repository/php-src into 54

    * 'PHP-5.4' of http://git.php.net/repository/php-src:
      fix tests failing due to corrected hash tiger
    Ilia Alshanetsky committed Mar 19, 2012
  9. Add missing files.

    sebastianbergmann committed Mar 19, 2012
  10. Merge branch '54'

    * 54:
      add note about corrected tiger hash output
      Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
      MFH: 7dcada1 for 5.4
      MFH: 45a6f8d for 5.4.
    Ilia Alshanetsky committed Mar 19, 2012
  11. Merge branch 'PHP-5.4'

    sebastianbergmann committed Mar 19, 2012
  12. Merge branch '53' into 54

    * 53:
      Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
    Ilia Alshanetsky committed Mar 19, 2012
  13. MFH: 7dcada1 for 5.4

    - Fixed possible unsigned int wrap around in html.c. Note that 5.3 has the same
      (potential) problem; even though the code is substantially different, the
      variable name and the fashion it was incremented was kept.
    cataphract committed Feb 5, 2012
  14. MFH: 45a6f8d for 5.4.

    - Further fix for bug #60455 (stream_get_line misbehaves if EOF is not detected
      together with the last read).
    - Fixed bug #60817 (stream_get_line() reads from stream even when there is
      already sufficient data buffered). stream_get_line() now behaves more like
      fgets(), as is documented.
    cataphract committed Mar 19, 2012
  15. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Add .gitignore
    dsp committed Mar 19, 2012