Permalink
Switch branches/tags
Commits on Sep 20, 2012
  1. Do not disable RFC3678 multicast API on Windows

    cataphract committed Sep 20, 2012
    The API is supported since Windows Vista and requires targeting Vista
    when compiling PHP. Pierre had asked to disable this by default, even
    when targeting Vista/Windows Server 2008.
    
    Since XP will not be supported anymore on php-next, any rationale
    for this option will not apply anymore.
  2. Fix folding

    rlerdorf committed Sep 20, 2012
  3. Merge branch 'PHP-5.4'

    Rob Richards committed Sep 20, 2012
    * PHP-5.4:
      fix bug #63015 (Incorrect arginfo for DOMErrorHandler)
  4. fix bug #63015 (Incorrect arginfo for DOMErrorHandler)

    Rob Richards committed Sep 20, 2012
Commits on Sep 19, 2012
  1. Merge branch 'PHP-5.4'

    lstrojny committed Sep 19, 2012
    Conflicts:
    	ext/sockets/multicast.h
  2. Bug #63000: MCAST_JOIN_GROUP on OSX is broken

    lstrojny committed Sep 19, 2012
    The multicast support in PHP 5.4 makes use of MCAST_JOIN_GROUP if it is present.
    The problem is that OSX 10.7 added the constant, but did not correctly implement
    the feature. This causes the setsockopt call to fail.
    
    The solution to the problem is to not use MCAST_JOIN_GROUP on OSX.
    
    For reference, this was also done in VLC:
    
    * http://trac.videolan.org/vlc/ticket/6104#comment:19
  3. Merge branch 'PHP-5.4'

    laruence committed Sep 19, 2012
Commits on Sep 18, 2012
  1. Merge branch 'PHP-5.4'

    lstrojny committed Sep 18, 2012
  2. Merging PR #116

    lstrojny committed Sep 18, 2012
  3. Merge branch 'PHP-5.4'

    lstrojny committed Sep 18, 2012
  4. Merge branch 'PHP-5.4'

    weltling committed Sep 18, 2012
    * PHP-5.4:
      updated libary versions
  5. Merge branch 'PHP-5.3' into PHP-5.4

    weltling committed Sep 18, 2012
    * PHP-5.3:
      updated libary versions
    
    Conflicts:
    	win32/build/libs_version.txt
  6. updated libary versions

    weltling committed Sep 18, 2012
  7. Merge branch 'PHP-5.4'

    weltling committed Sep 18, 2012
    * PHP-5.4:
      split tests for the new zlib version on win
  8. Merge branch 'PHP-5.3' into PHP-5.4

    weltling committed Sep 18, 2012
    * PHP-5.3:
      split tests for the new zlib version on win
  9. Merge branch 'PHP-5.4'

    laruence committed Sep 18, 2012
Commits on Sep 17, 2012
  1. Merge branch 'PHP-5.4'

    smalyshev committed Sep 17, 2012
    * PHP-5.4:
      update news
      Support building PHP with the native client toolchain.
      test should fail
  2. update news

    smalyshev committed Sep 17, 2012
  3. Support building PHP with the native client toolchain.

    sjlangley committed with smalyshev Sep 13, 2012
    The native client compiler defines the C macro __x86_64__, but the size
    of an unsigned int is only 4 bytes. This causes the compile to fail
    because the inline asm code compiled is for an 8 byte unsigned int. Add
    the correct defines to fix this.
    
    As detailed in:
    http://code.google.com/p/nativeclient/issues/detail?id=2255
  4. test should fail

    laruence committed Sep 17, 2012
Commits on Sep 16, 2012
  1. Add NEWS for generators

    nikic committed Sep 16, 2012
  2. Replace code with zend_clean_and_cache_symbol_table() call

    nikic committed Sep 16, 2012
    I replaced other instances of this code with the function call, but missed
    this one.
  3. Fix invalid read / remove useless code

    nikic committed Sep 16, 2012
    Generators follow a different cleanup path, so the extra check for freeing
    the execute_data is unnecessary there. It actually caused problems because
    op_array->fn_flags could be in freed memory at that time (in case op_array
    came from a closure in an ArrayAccess container).
    
    This fixes the valgrind warning in Zend/tests/bug54367.phpt.
  4. Merge branch 'PHP-5.4'

    smalyshev committed Sep 16, 2012
    * PHP-5.4:
      Respond with 501 to unknown request methods
  5. Respond with 501 to unknown request methods

    nikcorg committed with smalyshev Sep 12, 2012
    Fixed typo
    
    Moved 501 response from dispatch to event_read_request
    
    Return return value of send_error_page
  6. Merge branch 'PHp-5.4'

    smalyshev committed Sep 16, 2012
    * PHp-5.4:
      news for bug #61421
      commit for php bug 61421 enabling SHA2 and RMD160 for openssl signature verification