php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
74,746 Commits 549 Branches 1,485 Tags
b787fdebbab75541d21eee7c94151b56e170bd1e
Commit Graph

74746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakub Vrana b787fdebba Fix image method signatures 2013-06-10 02:13:13 -07:00
Dmitry Stogov 36dc1ed4b0 Merge branch 'master' of git.php.net:php-src 
* 'master' 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.
 2013-06-10 12:57:36 +04:00
Dmitry Stogov 56c9a2f4f6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed test script
 2013-06-10 12:56:33 +04:00
Dmitry Stogov ef20fdb338 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed test script
 2013-06-10 12:55:51 +04:00
Dmitry Stogov f68b8a5e74 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed test script
 2013-06-10 12:54:54 +04:00
Stanislav Malyshev 1355908149 Merge branch 'PHP-5.5' 
* PHP-5.5:
  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
 2013-06-10 01:53:36 -07:00
Stanislav Malyshev 7a2d9690fe Merge branch 'PHP-5.4' into PHP-5.5 
* 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
 2013-06-10 01:53:29 -07:00
Dmitry Stogov f5f6404260 Fixed test script 2013-06-10 12:53:19 +04:00
Antonio Diaz Ruiz 8a8bef1b73 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
 2013-06-10 01:50:00 -07:00
Stanislav Malyshev f9822bd099 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix spelling and correct typo.
 2013-06-10 01:42:41 -07:00
Stanislav Malyshev 20df5f8f24 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix spelling and correct typo.
 2013-06-10 01:42:32 -07:00
Carson McDonald f4e3c7ab7c Fix spelling and correct typo. 2013-06-10 01:42:27 -07:00
Stanislav Malyshev 8697c27000 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix spelling and correct typo.
 2013-06-10 01:41:26 -07:00
Stanislav Malyshev de1688d16e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix spelling and correct typo.
 2013-06-10 01:41:16 -07:00
Carson McDonald b8cf17635e Fix spelling and correct typo. 2013-06-10 01:40:41 -07:00
Dmitry Stogov 14a943ae86 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Callback has to be restored in MSHUTDOWN
 2013-06-10 12:34:34 +04:00
Dmitry Stogov 731b4a3fa4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Callback has to be restored in MSHUTDOWN
 2013-06-10 12:34:08 +04:00
Dmitry Stogov 336a8e1943 Callback has to be restored in MSHUTDOWN 2013-06-10 12:32:53 +04:00
Dmitry Stogov 738dfc69e7 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed comments
 2013-06-10 12:06:14 +04:00
Dmitry Stogov 53e6529203 Fixed comments 2013-06-10 12:05:20 +04:00
Dmitry Stogov 95d88cc66a Merge branch 'PHP-5.5' 
* PHP-5.5:
  Avoid multiple allocations of the same key in different processes
 2013-06-10 11:44:54 +04:00
Dmitry Stogov 23a9bb09ba Avoid multiple allocations of the same key in different processes 2013-06-10 11:43:03 +04:00
Dmitry Stogov 456ef2ebfa Merge branch 'PHP-5.5' 
* PHP-5.5:
  Compact HashTables before storing them in shared memory

Conflicts:
	ext/opcache/ZendAccelerator.c
 2013-06-10 11:25:41 +04:00
Dmitry Stogov 540488bf55 Compact HashTables before storing them in shared memory 2013-06-10 11:22:19 +04:00
Dmitry Stogov 841e1f0364 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Use size_t instead of int
 2013-06-10 10:37:53 +04:00
Dmitry Stogov 2e9d3e8b39 Use size_t instead of int 2013-06-10 10:36:35 +04:00
Xinchen Hui 00c7440b81 Merge branch 'PHP-5.5' 2013-06-09 22:26:18 +08:00
Xinchen Hui 8ae43caeee Update NEWS 2013-06-09 22:26:07 +08:00
Xinchen Hui 3f229f4364 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-09 22:25:49 +08:00
Xinchen Hui fdd7379686 Update NEWs 2013-06-09 22:25:28 +08:00
Xinchen Hui f338510c94 Merge branch 'PHP-5.3' into PHP-5.4 2013-06-09 22:25:07 +08:00
Xinchen Hui 75c57122e3 Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems) 2013-06-09 22:24:48 +08:00
Xinchen Hui afe547d335 Merge branch 'PHP-5.5' 2013-06-09 14:26:16 +08:00
Xinchen Hui b839e6921d Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	Zend/zend_vm_def.h
 2013-06-09 14:25:53 +08:00
Xinchen Hui e14800dd46 Fixed merge wrongly 2013-06-09 14:24:05 +08:00
Xinchen Hui 4600578830 Merge branch 'PHP-5.5' 2013-06-09 13:50:06 +08:00
Xinchen Hui 6139358804 Update NEWS 2013-06-09 13:49:43 +08:00
Xinchen Hui f372e00332 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	Zend/zend_vm_def.h
 2013-06-09 13:49:26 +08:00
Xinchen Hui 3cc891bf3a Update NEWS 2013-06-09 13:39:40 +08:00
Xinchen Hui ab22fda7e5 Merge branch 'PHP-5.3' into PHP-5.4 2013-06-09 13:35:45 +08:00
Xinchen Hui e8f004d542 Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC) 2013-06-09 13:20:40 +08:00
Matteo Beccati 2c0f09540e Fixed signedness warning 2013-06-07 09:38:58 +02:00
Matteo Beccati a649f42b20 NEWS 2013-06-07 09:36:54 +02:00
Matteo Beccati 19ead23e8e Fixed bug #63657 (pgsqlCopyFrom/To methods use Postgres < 7.3 syntax) 
Although still supported (for now), I've replaced with pre-9.0 syntax.
Still not cutting edge, but it works with any version PDO_pgsql is
compatible with (7.4+) and will possibly keep working for longer than
what we already had.
 2013-06-07 09:36:54 +02:00
Matteo Beccati 2f7f34374c NEWS 2013-06-07 09:36:53 +02:00
Stanislav Malyshev fbf1dff674 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix 5.4.16 date
 2013-06-06 13:27:39 -07:00
Stanislav Malyshev bccacb6308 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix 5.4.16 date
 2013-06-06 13:27:25 -07:00
Stanislav Malyshev a7e25bdd48 fix 5.4.16 date 2013-06-06 13:27:04 -07:00
Anatol Belski 73c627ccd5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix NEWS
 2013-06-06 18:58:23 +02:00
Anatol Belski 25980d4db5 fix NEWS 2013-06-06 18:57:20 +02:00