Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master

Dec 09, 2013

  1. Merge branch 'PHP-5.6'

    Ard Biesheuvel authored
  2. cli: don't cast away const in select() timeout argument

    The timeout argument to select() is modified to reflect the time
    remaining when the function returns on a non-timeout condition.
    Passing a pointer to const data and casting away the const-ness is
    asking for trouble, but for some reason, this trouble manifests
    itself only on non-x86 architectures [whose implementation of select()
    in glibc is different from the one supplied for x86]
    
    Fix this by passing a stack copy of the timeout argument to select()
    Ard Biesheuvel authored
  3. Stanislav Malyshev

    Merge branch 'PHP-5.6'

    * PHP-5.6:
      Replace invalid code with a proper #error
    smalyshev authored

Dec 08, 2013

  1. Stanislav Malyshev

    Merge branch 'PHP-5.5' into PHP-5.6

    * PHP-5.5:
      Replace invalid code with a proper #error
    smalyshev authored
  2. Stanislav Malyshev

    Merge branch 'PHP-5.4' into PHP-5.5

    * PHP-5.4:
      Replace invalid code with a proper #error
    smalyshev authored
  3. Lior Kaplan

    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 authored smalyshev committed

Dec 06, 2013

  1. Ferenc Kovacs

    Merge branch 'PHP-5.6'

    Tyrael authored
  2. Ferenc Kovacs

    Merge branch 'igorw-use-function' into PHP-5.6

    Tyrael authored
  3. Michael Wallner

    Merge branch 'PHP-5.6'

    * PHP-5.6:
      BFN
    m6w6 authored
  4. Michael Wallner

    Merge branch 'PHP-5.5' into PHP-5.6

    * PHP-5.5:
      BFN
    m6w6 authored
  5. Michael Wallner

    BFN

    m6w6 authored
  6. Michael Wallner

    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 authored
  7. Michael Wallner

    Merge branch 'PHP-5.5' into PHP-5.6

    * PHP-5.5:
      Fixed bug #61645 (fopen and O_NONBLOCK)
      fix possibly uninitialized value
    m6w6 authored
  8. Michael Wallner

    Merge branch 'PHP-5.4' into PHP-5.5

    * PHP-5.4:
      Fixed bug #61645 (fopen and O_NONBLOCK)
      fix possibly uninitialized value
    m6w6 authored
  9. Michael Wallner

    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 authored
  10. Michael Wallner

    fix possibly uninitialized value

    m6w6 authored
  11. Ferenc Kovacs

    Merge branch 'use-function' of git://github.com/igorw/php-src into ig…

    …orw-use-function
    Tyrael authored

Dec 05, 2013

  1. Michael Wallner

    BFN

    m6w6 authored
  2. Michael Wallner

    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 authored
  3. Michael Wallner

    fix bug #62490

    inifiles delete handler did not return false if the key was not found
    m6w6 authored

Dec 04, 2013

  1. Sara Golemon

    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 authored
  2. Adam Harvey

    Renumber the comments in php_request_shutdown() to be in order.

    What, me OCD?
    LawnGnome authored
  3. Merge branch 'master' of git.php.net:php-src

    Conflicts:
    	NEWS
    Andrey Hristov authored
  4. Sara Golemon

    Merge branch 'PHP-5.5' into PHP-5.6

    * PHP-5.5:
      Use 'user@example.com' rather than 'user@company.com' in tests
    sgolemon authored
  5. Sara Golemon

    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 authored
  6. Merge branch 'PHP-5.6'

    Conflicts:
    	NEWS
    	UPGRADING
    Andrey Hristov authored
  7. Merge branch 'PHP-5.5' into PHP-5.6

    Andrey Hristov authored
  8. Merge branch 'PHP-5.4' into PHP-5.5

    Andrey Hristov authored
  9. Fix loss of precision

    Andrey Hristov authored
  10. Sara Golemon

    Merge branch 'PHP-5.6'

    * PHP-5.6:
      Fix php_module_startup() when loading more than one additional module
    sgolemon authored
  11. Sara Golemon

    Merge branch 'PHP-5.5' into PHP-5.6

    * PHP-5.5:
      Fix php_module_startup() when loading more than one additional module
    sgolemon authored
  12. Sara Golemon

    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 authored

Dec 03, 2013

  1. Adam Harvey

    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 authored
  2. Adam Harvey

    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 authored
  3. Adam Harvey

    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 authored
Something went wrong with that request. Please try again.