Permalink
Commits on Dec 9, 2013
  1. Merge branch 'PHP-5.6'

    * PHP-5.6:
      Replace invalid code with a proper #error
    smalyshev committed Dec 9, 2013
Commits on Dec 8, 2013
  1. Merge branch 'PHP-5.5' into PHP-5.6

    * PHP-5.5:
      Replace invalid code with a proper #error
    smalyshev committed Dec 8, 2013
  2. Merge branch 'PHP-5.4' into PHP-5.5

    * PHP-5.4:
      Replace invalid code with a proper #error
    smalyshev committed Dec 8, 2013
  3. Replace invalid code with a proper #error

    This code creates a nasty error as mentioned in bugs #31131, #37062
    Patch taken from Debian's PHP package: 044-strtod_arm_fix
    kaplanlior committed with smalyshev Oct 4, 2013
Commits on Dec 6, 2013
  1. Merge branch 'PHP-5.6'

    Tyrael committed Dec 6, 2013
  2. Merge branch 'PHP-5.6'

    * PHP-5.6:
      BFN
    m6w6 committed Dec 6, 2013
  3. Merge branch 'PHP-5.5' into PHP-5.6

    * PHP-5.5:
      BFN
    m6w6 committed Dec 6, 2013
  4. BFN

    m6w6 committed Dec 6, 2013
  5. Merge branch 'PHP-5.6'

    * PHP-5.6:
      Fixed bug #61645 (fopen and O_NONBLOCK)
      fix possibly uninitialized value
      Use 'user@example.com' rather than 'user@company.com' in tests
    m6w6 committed Dec 6, 2013
  6. Merge branch 'PHP-5.5' into PHP-5.6

    * PHP-5.5:
      Fixed bug #61645 (fopen and O_NONBLOCK)
      fix possibly uninitialized value
    m6w6 committed Dec 6, 2013
  7. Merge branch 'PHP-5.4' into PHP-5.5

    * PHP-5.4:
      Fixed bug #61645 (fopen and O_NONBLOCK)
      fix possibly uninitialized value
    m6w6 committed Dec 6, 2013
  8. Fixed bug #61645 (fopen and O_NONBLOCK)

    if a mode like "rn" was passed to fopen(), then
    php_stream_parse_fopen_modes() would assign O_WRONLY to
    flags, because O_NONBLOCK tainted flags for the r/w/+ check
    m6w6 committed Dec 6, 2013
  9. fix possibly uninitialized value

    m6w6 committed Dec 6, 2013
Commits on Dec 5, 2013
  1. BFN

    m6w6 committed Dec 5, 2013
  2. Merge branch 'dba'

    * dba:
      fix bug #62490
      more test fixes
      fix test
      fix php_stream_copy_to_stream_ex usage
      add missing clean section
      remove test for already removed feature
    m6w6 committed Dec 5, 2013
  3. fix bug #62490

    inifiles delete handler did not return false if the key was not found
    m6w6 committed Dec 5, 2013
Commits on Dec 4, 2013
  1. Use 'user@example.com' rather than 'user@company.com' in tests

    Using some arbitrary 3rd party's domain name is clowny,
    even if it never tries to send.
    sgolemon committed Dec 4, 2013
  2. Merge branch 'master' of git.php.net:php-src

    Conflicts:
    	NEWS
    Andrey Hristov committed Dec 4, 2013
  3. Merge branch 'PHP-5.5' into PHP-5.6

    * PHP-5.5:
      Use 'user@example.com' rather than 'user@company.com' in tests
    sgolemon committed Dec 4, 2013
  4. Use 'user@example.com' rather than 'user@company.com' in tests

    Using some arbitrary 3rd party's domain name is clowny,
    even if it never tries to send.
    sgolemon committed Dec 4, 2013
  5. Merge branch 'PHP-5.6'

    Conflicts:
    	NEWS
    	UPGRADING
    Andrey Hristov committed Dec 4, 2013
  6. Merge branch 'PHP-5.5' into PHP-5.6

    Andrey Hristov committed Dec 4, 2013
  7. Merge branch 'PHP-5.4' into PHP-5.5

    Andrey Hristov committed Dec 4, 2013
  8. Fix loss of precision

    Andrey Hristov committed Dec 4, 2013
  9. Merge branch 'PHP-5.6'

    * PHP-5.6:
      Fix php_module_startup() when loading more than one additional module
    sgolemon committed Dec 4, 2013
  10. Merge branch 'PHP-5.5' into PHP-5.6

    * PHP-5.5:
      Fix php_module_startup() when loading more than one additional module
    sgolemon committed Dec 4, 2013
  11. Fix php_module_startup() when loading more than one additional module

    Dereferencing addition_modules within php_module_startup would
    point to a vector entirely on the stack (which is of course, wrong).
    
    Use a specialized helper to keep BC with the current php_module_startup()
    calling semantics.
    
    Fixes 63159
    Thanks to @a-j-k
    sgolemon committed Dec 4, 2013
Commits on Dec 3, 2013
  1. Merge branch 'PHP-5.6'

    * PHP-5.6:
      Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
    LawnGnome committed Dec 3, 2013
  2. Merge branch 'PHP-5.5' into PHP-5.6

    * PHP-5.5:
      Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
    LawnGnome committed Dec 3, 2013
  3. Merge branch 'PHP-5.4' into PHP-5.5

    * PHP-5.4:
      Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
    LawnGnome committed Dec 3, 2013
  4. Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.

    These were returned to the general allocation pool by RFC 3330, and hence
    shouldn't cause an IP address validation failure due to being reserved. At
    least 128.0.0.0/16 is in use on the public Internet today.
    
    Fixes bug #66229 (128.0.0.0/16 isn't reserved any longer).
    LawnGnome committed Dec 3, 2013
  5. more test fixes

    m6w6 committed Dec 3, 2013