Permalink
Switch branches/tags
Commits on Aug 22, 2014
  1. some more replacements

    weltling committed Aug 22, 2014
Commits on Aug 18, 2014
  1. yet more replaces

    weltling committed Aug 18, 2014
Commits on Aug 17, 2014
  1. more replacements for ng

    weltling committed Aug 17, 2014
Commits on Aug 4, 2014
  1. Merge remote-tracking branch 'origin/master' into str_size_and_int64

    weltling committed Aug 4, 2014
    * origin/master:
      Patches #67739
      PHP_INT_MIN and _MAX tests
      NEWS and UPGRADING
      Added PHP_INT_MIN
    
    Conflicts:
    	main/main.c
  2. Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' …

    weltling committed Aug 4, 2014
    …into str_size_and_int64
    
    * origin/str_size_and_int64_56_backport: (51 commits)
      backport the fix for bug #67739
      fix macro
      Fix bug #67705 (extensive backtracking in rule regular expression)
      add test
      Fix bug #67705 (extensive backtracking in rule regular expression)
      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
      ...
  3. Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64…

    weltling committed Aug 4, 2014
    …_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)
  4. Merge branch 'PHP-5.6'

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

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

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

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

    weltling committed Aug 4, 2014
    …_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
  9. Merge branch 'PHP-5.6'

    smalyshev committed Aug 4, 2014
    * PHP-5.6:
      Fix bug #67705 (extensive backtracking in rule regular expression)
      add test
      Fix bug #67705 (extensive backtracking in rule regular expression)
  10. Merge branch 'PHP-5.5' into PHP-5.6

    smalyshev committed Aug 4, 2014
    * 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
  11. Merge branch 'PHP-5.4' into PHP-5.5

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

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

    smalyshev committed Aug 4, 2014
    * PHP-5.4:
      Fix bug #67705 (extensive backtracking in rule regular expression)
Commits on Aug 1, 2014
  1. Patches #67739

    wenz committed Aug 1, 2014
    Fixes #67739: Windows 8.1/Server 2012 R2 OS build number reported as 6.2 (instead of 6.3)
  2. NEWS and UPGRADING

    hikari-no-yume committed Aug 1, 2014
  3. Added PHP_INT_MIN

    hikari-no-yume committed Aug 1, 2014
Commits on Jul 31, 2014
  1. Merge branch 'PHP-5.6'

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

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

    Andrey Hristov committed Jul 31, 2014
  4. Merge branch 'PHP-5.6'

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

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

    salathe committed Jul 31, 2014
    * PHP-5.4:
      Bug #51096 - Remove unnecessary ? for first/last day of
    
    Conflicts:
    	ext/date/lib/parse_date.c
  7. Merge branch 'PHP-5.6'

    datibbaw committed Jul 31, 2014
    * PHP-5.6:
      Moved streams related functions to xp_ssl.c