Permalink
Switch branches/tags
Commits on Mar 29, 2012
  1. move date

    smalyshev committed Mar 29, 2012
  2. 5.4.1RC1

    smalyshev committed Mar 22, 2012
  3. Merge branch 'sec54' into PHP-5.4

    smalyshev committed Mar 29, 2012
    * sec54:
      update NEWS
      fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
      open_basedir check for linkinfo
      NEWS entry for readline fix
      NEWS entry for readline fix
      Add open_basedir checks to readline_write_history and readline_read_history
  4. ext/pcntl/pcntl.c: Fix typo in comment

    Jille authored and yohgaki committed Mar 28, 2012
    Signed-off-by: Jille Timmermans <jille@quis.cx>
Commits on Mar 28, 2012
  1. Merge branch 'PHP-5.3' into PHP-5.4

    weltling committed Mar 28, 2012
    * PHP-5.3:
      Fix bug #61459 popen_close_basic-win32 can't run sort.exe
  2. Fix bug #61459 popen_close_basic-win32 can't run sort.exe

    Anatoliy Belsky
    Anatoliy Belsky committed Mar 28, 2012
  3. Merge branch 'PHP-5.3' into PHP-5.4

    weltling committed Mar 28, 2012
    * PHP-5.3:
      Fix bug #61401 ext\openssl\tests\004.phpt fails
      Fix bug #61404 ext\openssl\tests\021.phpt fails
      Fix bug #61448 intl tests fail with icu >= 4.8
  4. Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

    weltling committed Mar 28, 2012
    * 'PHP-5.4' of git.php.net:php-src:
      Fixed problem introduced in a763929 (fixing bug #61347).
  5. Fixed problem introduced in a763929 (fixing bug #61347).

    cataphract committed Mar 28, 2012
    The test added in 8c44c85 should now pass.
  6. Merge branch 'PHP-5.3' into PHP-5.4

    weltling committed Mar 28, 2012
    * PHP-5.3:
      Fix bug #61448 intl tests fail with icu >= 4.8
  7. Merge branch 'PHP-5.3' into PHP-5.4

    weltling committed Mar 28, 2012
    * PHP-5.3:
      Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
  8. Merge branch 'PHP-5.3' into PHP-5.4

    weltling committed Mar 28, 2012
    * PHP-5.3:
      Bug 61504 updated libmagic.patch
      Bug #61504 TSRML_FETCH() must be last
  9. Merge branch '5.3' into 5.4

    cataphract committed Mar 28, 2012
    Zend/zend_language_scanner.c and Zend/zend_language_scanner_defs.h had to be changed manually.
  10. Merge branch 'PHP-5.3' into PHP-5.4

    pierrejoye committed Mar 28, 2012
    * PHP-5.3:
      - fix bug #61504, fix build errors on windows and possibly other
    
    Conflicts:
    	Zend/zend_language_scanner.c
    	Zend/zend_language_scanner_defs.h
Commits on Mar 27, 2012
  1. Merge branch 'PHP-5.3' into PHP-5.4

    cjbj committed Mar 27, 2012
    * PHP-5.3:
      Update README
  2. Merge branch 'readme1' into PHP-5.3

    cjbj committed Mar 27, 2012
    * readme1:
      Update README
  3. Update README

    cjbj committed Mar 27, 2012
    More updates to OCI8 README as an excuse to try the PHP multi-dir git
    workflow instructions.
  4. Merge branch 'PHP-5.3' into PHP-5.4

    weltling committed Mar 27, 2012
    * PHP-5.3:
      Fix bug #61518 skip on windows, fix on linux - ext/standard/tests/streams/bug60106.phpt