Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: str_size_and_i…
Commits on Aug 4, 2014
  1. @weltling

    Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64…

    weltling authored
    …_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)
  2. @weltling

    Merge branch 'PHP-5.5' into PHP-5.6

    weltling authored
    * PHP-5.5:
      backport the fix for bug #67739
  3. @weltling

    Merge branch 'PHP-5.4' into PHP-5.5

    weltling authored
    * PHP-5.4:
      backport the fix for bug #67739
  4. @weltling
  5. @weltling

    fix macro

    weltling authored
  6. @weltling

    Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64…

    weltling authored
    …_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
  7. @smalyshev

    Merge branch 'PHP-5.5' into PHP-5.6

    smalyshev authored
    * 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
  8. @smalyshev
  9. @smalyshev

    Merge branch 'PHP-5.4' into PHP-5.5

    smalyshev authored
    * PHP-5.4:
      add test
  10. @smalyshev

    add test

    smalyshev authored
  11. @smalyshev

    Merge branch 'PHP-5.4' into PHP-5.5

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

    Andrey Hristov authored
  2. Fix wrong lenght size

    Andrey Hristov authored
  3. @salathe

    Merge branch 'PHP-5.5' into PHP-5.6

    salathe authored
    * PHP-5.5:
      Bug #51096 - Remove unnecessary ? for first/last day of
  4. @salathe

    Merge branch 'PHP-5.4' into PHP-5.5

    salathe authored
    * PHP-5.4:
      Bug #51096 - Remove unnecessary ? for first/last day of
    
    Conflicts:
    	ext/date/lib/parse_date.c
  5. @salathe
  6. @salathe
  7. @datibbaw
Commits on Jul 30, 2014
  1. @keyurdg

    Remove duplicate NEWS

    keyurdg authored
  2. @keyurdg

    Merge branch 'PHP-5.5' into PHP-5.6

    keyurdg authored
    * PHP-5.5:
      Update NEWS
      Update NEWS
  3. @keyurdg

    Merge branch 'PHP-5.4' into PHP-5.5

    keyurdg authored
    * PHP-5.4:
      Update NEWS
  4. @keyurdg

    Update NEWS

    keyurdg authored
  5. @keyurdg

    Update NEWS

    keyurdg authored
  6. @keyurdg

    Update NEWS

    keyurdg authored
  7. @m6w6

    BFN

    m6w6 authored
  8. @m6w6

    Merge branch 'PHP-5.5' into PHP-5.6

    m6w6 authored
    * PHP-5.5:
      BFN
      Fixed bug #67715 (php-milter does not build and crashes randomly).
  9. @m6w6

    BFN

    m6w6 authored
  10. @m6w6

    Merge branch 'PHP-5.4' into PHP-5.5

    m6w6 authored
    * PHP-5.4:
      Fixed bug #67715 (php-milter does not build and crashes randomly).
  11. @m6w6
  12. @rlerdorf

    Merge commit '8b9719d' into PHP-5.6

    rlerdorf authored
    * commit '8b9719d':
      We need to turn off any strict mode here for this warning to show up
  13. @rlerdorf

    Merge commit '8b9719d' into PHP-5.5

    rlerdorf authored
    * commit '8b9719d':
      We need to turn off any strict mode here for this warning to show up
  14. @rlerdorf
  15. @bwoebi

    Disable restrictions regarding arrays in constants at run-time.

    bwoebi authored
    For the discussion around it, see the thread on the mailing list:
    http://www.mail-archive.com/internals@lists.php.net/msg68245.html
  16. @bwoebi

    Revert "Fix bug #67064 in a BC safe way"

    bwoebi authored
    This reverts commit 1a4a9ee.
    
    Conflicts:
    	ext/standard/array.c
    	ext/standard/tests/array/bug67064.phpt
Something went wrong with that request. Please try again.