Permalink
Commits on Aug 4, 2014
  1. Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64…

    …_56_backport
    
    * origin/PHP-5.6:
      backport the fix for bug #67739
      Fix bug #67705 (extensive backtracking in rule regular expression)
      add test
      Fix bug #67705 (extensive backtracking in rule regular expression)
    weltling committed Aug 4, 2014
  2. Merge branch 'PHP-5.5' into PHP-5.6

    * PHP-5.5:
      backport the fix for bug #67739
    weltling committed Aug 4, 2014
  3. Merge branch 'PHP-5.4' into PHP-5.5

    * PHP-5.4:
      backport the fix for bug #67739
    weltling committed Aug 4, 2014
  4. fix macro

    weltling committed Aug 4, 2014
  5. Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64…

    …_56_backport
    
    * origin/PHP-5.6: (46 commits)
      Fix wrong lenght size
      Bug #51096 - Remove unnecessary ? for first/last day of
      Moved streams related functions to xp_ssl.c
      Remove duplicate NEWS
      Update NEWS
      Update NEWS
      Update NEWS
      BFN
      BFN
      Fixed bug #67715 (php-milter does not build and crashes randomly).
      We need to turn off any strict mode here for this warning to show up
      Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
      Revert "Fix bug #67064 in a BC safe way"
      Updated NEWS for #67693
      Updated NEWS for #67693
      Fixed bug #67693 - incorrect push to the empty array
      add missing entry to NEWS
      add missing entries to NEWS
      add NEWS block for the next RC
      NEWS entry for #67713
      ...
    
    Conflicts:
    	Zend/zend_language_parser.y
    	ext/odbc/php_odbc.c
    	ext/openssl/openssl.c
    	ext/spl/spl_directory.c
    	ext/spl/spl_iterators.c
    	ext/sqlite3/sqlite3.c
    	ext/standard/array.c
    weltling committed Aug 4, 2014
  6. Merge branch 'PHP-5.5' into PHP-5.6

    * PHP-5.5:
      add test
      Fix bug #67705 (extensive backtracking in rule regular expression)
    
    Conflicts:
    	ext/fileinfo/data_file.c
    	ext/fileinfo/libmagic/softmagic.c
    	ext/fileinfo/magicdata.patch
    smalyshev committed Aug 4, 2014
  7. Merge branch 'PHP-5.4' into PHP-5.5

    * PHP-5.4:
      add test
    smalyshev committed Aug 4, 2014
  8. add test

    smalyshev committed Aug 4, 2014
  9. Merge branch 'PHP-5.4' into PHP-5.5

    * PHP-5.4:
      Fix bug #67705 (extensive backtracking in rule regular expression)
    smalyshev committed Aug 4, 2014
Commits on Jul 31, 2014
  1. Merge branch 'PHP-5.5' into PHP-5.6

    Andrey Hristov committed Jul 31, 2014
  2. Fix wrong lenght size

    Andrey Hristov committed Jul 31, 2014
  3. Merge branch 'PHP-5.5' into PHP-5.6

    * PHP-5.5:
      Bug #51096 - Remove unnecessary ? for first/last day of
    salathe committed Jul 31, 2014
  4. Merge branch 'PHP-5.4' into PHP-5.5

    * PHP-5.4:
      Bug #51096 - Remove unnecessary ? for first/last day of
    
    Conflicts:
    	ext/date/lib/parse_date.c
    salathe committed Jul 31, 2014
Commits on Jul 30, 2014
  1. Remove duplicate NEWS

    keyurdg committed Jul 30, 2014
  2. Merge branch 'PHP-5.5' into PHP-5.6

    * PHP-5.5:
      Update NEWS
      Update NEWS
    keyurdg committed Jul 30, 2014
  3. Merge branch 'PHP-5.4' into PHP-5.5

    * PHP-5.4:
      Update NEWS
    keyurdg committed Jul 30, 2014
  4. Update NEWS

    keyurdg committed Jul 30, 2014
  5. Update NEWS

    keyurdg committed Jul 30, 2014
  6. Update NEWS

    keyurdg committed Jul 30, 2014
  7. BFN

    m6w6 committed Jul 30, 2014
  8. Merge branch 'PHP-5.5' into PHP-5.6

    * PHP-5.5:
      BFN
      Fixed bug #67715 (php-milter does not build and crashes randomly).
    m6w6 committed Jul 30, 2014
  9. BFN

    m6w6 committed Jul 30, 2014
  10. Merge branch 'PHP-5.4' into PHP-5.5

    * PHP-5.4:
      Fixed bug #67715 (php-milter does not build and crashes randomly).
    m6w6 committed Jul 30, 2014
  11. Merge commit '8b9719d' into PHP-5.6

    * commit '8b9719d':
      We need to turn off any strict mode here for this warning to show up
    rlerdorf committed Jul 30, 2014
  12. Merge commit '8b9719d' into PHP-5.5

    * commit '8b9719d':
      We need to turn off any strict mode here for this warning to show up
    rlerdorf committed Jul 30, 2014
  13. Disable restrictions regarding arrays in constants at run-time.

    For the discussion around it, see the thread on the mailing list:
    http://www.mail-archive.com/internals@lists.php.net/msg68245.html
    bwoebi committed Jul 30, 2014
  14. Revert "Fix bug #67064 in a BC safe way"

    This reverts commit 1a4a9ee.
    
    Conflicts:
    	ext/standard/array.c
    	ext/standard/tests/array/bug67064.phpt
    bwoebi committed Jul 30, 2014