Commit graph

73991 commits

Author SHA1 Message Date
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
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
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
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
53e6529203 Fixed comments 2013-06-10 12:05:20 +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
540488bf55 Compact HashTables before storing them in shared memory 2013-06-10 11:22:19 +04:00
Dmitry Stogov
2e9d3e8b39 Use size_t instead of int 2013-06-10 10:36:35 +04: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
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
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
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
25980d4db5 fix NEWS 2013-06-06 18:57:20 +02:00
Anatol Belski
f47e879235 updated NEWS 2013-06-06 18:53:22 +02:00
Anatol Belski
bbdbef40db Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated NEWS
  Fixed bug #64934 Apache2 TS crash with get_browser()
2013-06-06 18:52:39 +02:00
Anatol Belski
4b96b8f909 updated NEWS 2013-06-06 18:52:05 +02:00
Anatol Belski
25cae37b13 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #64934 Apache2 TS crash with get_browser()
2013-06-06 18:51:32 +02:00
Anatol Belski
1aee7ad636 Fixed bug #64934 Apache2 TS crash with get_browser()
In favour of reading the browscap.ini into a true global var
only once in MINIT, the price for that is to deep copy the
any data from it.
2013-06-06 18:49:04 +02:00
David Soria Parra
c649186c31 News update 2013-06-05 23:08:48 +02:00
David Soria Parra
aef5295756 PHP 5.5.0RC3 NEWS 2013-06-05 23:06:51 +02:00
Johannes Schlüter
fdeefc466e Merge branch 'PHP-5.4' into PHP-5.5 2013-06-05 16:35:14 +02:00
Johannes Schlüter
5ee047b486 Merge branch 'PHP-5.3' into PHP-5.4 2013-06-05 16:34:54 +02:00
Johannes Schlüter
ec3bcbcb5a Add NEWS for PHP 5.3.26 2013-06-05 16:34:18 +02:00
Xinchen Hui
7da648ff2f Update NEWS 2013-06-05 17:30:57 +08:00
Xinchen Hui
e89537f2a3 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-05 17:30:09 +08:00
Xinchen Hui
3c93402f86 Update NEWS 2013-06-05 17:29:04 +08:00
Xinchen Hui
f597f5561e Merge branch 'PHP-5.3' into PHP-5.4 2013-06-05 17:26:10 +08:00
Xinchen Hui
3c87945c95 Fixed bug #64960 (Segfault in gc_zval_possible_root) 2013-06-05 17:25:00 +08:00
Stanislav Malyshev
785f4c5fc6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 22:00:45 -07:00
Stanislav Malyshev
efdeec3c0e Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 21:58:44 -07:00
Stanislav Malyshev
93e0d78ec6 fix CVE-2013-2110 - use correct formula to calculate string size 2013-06-04 21:56:33 -07:00
Stanislav Malyshev
74e52eaea9 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  news for dblib fixes
  Fix PDO_DBLIB bugs: #64338, #64808, #63638

Conflicts:
	ext/pdo_dblib/dblib_driver.c
	ext/pdo_dblib/dblib_stmt.c
2013-06-03 22:00:51 -07:00
Stanislav Malyshev
90bb28726b news for dblib fixes 2013-06-03 21:54:50 -07:00
Stanley Sufficool
d8f938c784 FIX BUG #55647, #60512, #60512, #61900, #64338, #64808, #63638
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.
2013-06-03 20:34:47 -07:00
Stanley Sufficool
5a04ab9a54 Fix PDO_DBLIB bugs: #64338, #64808, #63638
Synchronize with master
2013-06-03 20:02:08 -07:00
Remi Collet
3579e81200 Fixed Bug #64962 imagerotate produce corrupted image
See https://bitbucket.org/libgd/gd-libgd/issue/67/problem-with-gdrotate

This computation need to be done in signed range.
2013-06-03 15:01:48 +02:00
Remi Collet
245e103ed3 NEWS 2013-06-03 14:17:00 +02:00