Permalink
Switch branches/tags
Commits on Oct 8, 2012
  1. Merge branch 'PHP-5.4'

    laruence committed Oct 8, 2012
Commits on Oct 5, 2012
  1. use zend_execute_internal

    smalyshev committed Jul 22, 2012
Commits on Oct 4, 2012
  1. Merge branch 'PHP-5.4'

    weltling committed Oct 4, 2012
    * PHP-5.4:
      exposing the libxpm version in phpinfo
      5.4.9-dev
    
    Conflicts:
    	NEWS
    	configure.in
    	main/php_version.h
  2. Merge branch 'PHP-5.3' into PHP-5.4

    weltling committed Oct 4, 2012
    * PHP-5.3:
      exposing the libxpm version in phpinfo
  3. update

    Andrey Hristov
    Andrey Hristov committed Oct 4, 2012
  4. 5.4.9-dev

    smalyshev committed Oct 4, 2012
  5. Merge branch 'PHP-5.4'

    johannes committed Oct 4, 2012
  6. Merge branch 'PHP-5.3' into PHP-5.4

    johannes committed Oct 4, 2012
    Conflicts:
    	configure.in
    	main/php_version.h
Commits on Oct 3, 2012
  1. add a check for libmysql

    Andrey Hristov
    Andrey Hristov committed Oct 3, 2012
  2. Merge branch 'master' of ssh://git.php.net/php-src

    Andrey Hristov
    Andrey Hristov committed Oct 3, 2012
  3. if ssl has been switched on transmit clear-text password

    Andrey Hristov
    Andrey Hristov committed Oct 3, 2012
Commits on Oct 2, 2012
  1. Merge branch 'PHP-5.4'

    weltling committed Oct 2, 2012
    * PHP-5.4:
      reverted the previous fix for libpng include
  2. Merge branch 'PHP-5.3' into PHP-5.4

    weltling committed Oct 2, 2012
    * PHP-5.3:
      reverted the previous fix for libpng include
  3. Merge branch 'PHP-5.4'

    weltling committed Oct 2, 2012
    * PHP-5.4:
      fixed include checks for libpng under win
  4. Merge branch 'PHP-5.3' into PHP-5.4

    weltling committed Oct 2, 2012
    * PHP-5.3:
      fixed include checks for libpng under win
Commits on Oct 1, 2012
  1. Merge branch 'PHP-5.4'

    laruence committed Oct 1, 2012
  2. Add test for #35895

    laruence committed Oct 1, 2012
  3. Merge branch 'PHP-5.4'

    laruence committed Oct 1, 2012
  4. Now we can set the tsrm_ls manually

    laruence committed Oct 1, 2012
    get(ZTS build):
    (gdb) zbacktrace
    You can't do that without a process to debug.
    (gdb) set_ts 0x4112500
    (gdb) zbacktrace
    [0x2b232e83a1d8] call_user_func(array(2)[0x2b232e879528],
    array(1)[0x2b232e878fa0]) /tmp/1.php:4
    [0x7fffcb2efd80] A->__call("xxx", array(1)[0x2b232e878fa0])
  5. Merge branch 'PHP-5.4'

    laruence committed Oct 1, 2012
  6. Fixed bug #63184 test (ext/spl/tests/RecursiveDirectoryIterator_getSu…

    laruence committed Oct 1, 2012
    …bPathname_basic.phpt failed)
  7. Merge branch 'PHP-5.4'

    smalyshev committed Oct 1, 2012
    * PHP-5.4:
      Eliminate process running requirement of dump_bt in .gdbinit
      Add missing ____executor_globals in dump_bt if needed
      Implemented FR #63188 (Display class name when debugging with gdb macro zbacktrace)
  8. Merge branch 'pull-request/209' into PHP-5.4

    smalyshev committed Oct 1, 2012
    * pull-request/209:
      Eliminate process running requirement of dump_bt in .gdbinit
      Add missing ____executor_globals in dump_bt if needed
      Implemented FR #63188 (Display class name when debugging with gdb macro zbacktrace)
  9. Merge branch 'PHP-5.4'

    smalyshev committed Oct 1, 2012
    * PHP-5.4:
      Fix bugs 62561,62896 (Modifying DateTime::__construct,date_create adds an hour) Prevent a unix timestamp, which is always GMT when being parsed, from taking on the local timezones DST flag.