Boris Lytochkin [Sat, 15 Jun 2013 20:04:00 +0000 (00:04 +0400)]
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/push/php-src: (147 commits)
Fixed bug #63186 (compile failure on netbsd)
fix test for bug #60322
ensure the error_reporting level to get expected notice
fixed tests
missing tests for bug #53437
fixed EOL
added closing ?>
fix double entry
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
split the test for 32 and 64 bit
typo fixes (argument)
typo fixes (accommodate, parameter)
missing colon
Backported the fix for bug #53437
Backported the fix for bug #53437
fixed the test
Fix a BC breach related to bug #53437
Fixed bug #64988 (Class loading order affects E_STRICT warning)
...
Boris Lytochkin [Sat, 15 Jun 2013 20:03:30 +0000 (00:03 +0400)]
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/push/php-src: (76 commits)
Fixed bug #63186 (compile failure on netbsd)
fix test for bug #60322
ensure the error_reporting level to get expected notice
fixed tests
missing tests for bug #53437
fix double entry
Merge branch 'pull-request/341'
typo fixes (argument)
typo fixes (accommodate, parameter)
missing colon
Backported the fix for bug #53437
Backported the fix for bug #53437
Fixed bug #64988 (Class loading order affects E_STRICT warning)
Fixed test script
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
Fix spelling and correct typo.
Callback has to be restored in MSHUTDOWN
Update NEWs
Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
Fixed merge wrongly
...
Dmitry Stogov [Mon, 10 Jun 2013 08:59:28 +0000 (12:59 +0400)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
Fix spelling and correct typo.
Dmitry Stogov [Mon, 10 Jun 2013 08:59:09 +0000 (12:59 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
Fix spelling and correct typo.
Fix spelling and correct typo.
* PHP-5.4:
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
PHPTests for the DOMDocument::loadHTMLfile method.
They cover
- The basic behaviour
- When the method receives as argument a file which doesn't exist
- When the argument is an empty string
- When an empty file is loaded
- When a not-well formed html file is loaded
It also includes 2 auxilary files
- An empty html file
- A not well formed html file
Return an error on passwords longer than 30 chars instead of segfault.
Set error and message handlers properly.
Do not segfault in out of bound colnums in getColumnMeta()
Fix DBSETOPT to use a blank string instead of NULL to stop FreeTDS complaints.
Use DBSETLDBNAME for compatibillity with SQL Azure.
projects / php / log