Commit Graph

29282 Commits

Author SHA1 Message Date
Christopher Jones
faa731f147 Merge branch 'PHP-5.4'
* PHP-5.4:
  Minor text changes (to try new git repo)
  Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK
2012-03-19 15:19:00 -07:00
Christopher Jones
08f586984f Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Minor text changes (to try new git repo)
2012-03-19 15:18:06 -07:00
Christopher Jones
4a6d9b348f Minor text changes (to try new git repo) 2012-03-19 15:16:33 -07:00
David Soria Parra
74eb9d4730 Merge branch 'pull-request/5' into PHP-5.4
* pull-request/5:
  Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK
2012-03-19 22:11:02 +01:00
Michael Wallner
3930e1e992 Merge branch 'PHP-5.4'
* PHP-5.4:
  fix tests failing due to corrected hash tiger
2012-03-19 21:52:55 +01:00
Michael Wallner
260e77709d fix tests failing due to corrected hash tiger
mhash_00{1,3}.phpt were failing because of the corrected hash tiger byte
output order

fixes bug #60922:
 tests fail for mhash() and mhash_keygen_s2k() functions and MHASH_TIGER
2012-03-19 21:49:47 +01:00
Joshua Thijssen
91f2d3809e Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK 2012-03-19 21:48:55 +01:00
Gustavo André dos Santos Lopes
cfdd6c5788 MFH: 7dcada1 for 5.4
- Fixed possible unsigned int wrap around in html.c. Note that 5.3 has the same
  (potential) problem; even though the code is substantially different, the
  variable name and the fashion it was incremented was kept.
2012-03-19 16:36:21 +00:00
Gustavo André dos Santos Lopes
9a460497da MFH: 45a6f8d for 5.4.
- Further fix for bug #60455 (stream_get_line misbehaves if EOF is not detected
  together with the last read).
- Fixed bug #60817 (stream_get_line() reads from stream even when there is
  already sufficient data buffered). stream_get_line() now behaves more like
  fgets(), as is documented.
2012-03-19 16:34:31 +00:00
Gustavo André dos Santos Lopes
773bedb13d - Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads
when get_properties returns a hash table with (inaccessible) dynamic
  numeric properties).
2012-03-18 18:23:27 +00:00
Gustavo André dos Santos Lopes
920072df65 - Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads
when get_properties returns a hash table with (inaccessible) dynamic
  numeric properties).
2012-03-18 18:23:27 +00:00
Gustavo André dos Santos Lopes
227112cb0f - Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads
when get_properties returns a hash table with (inaccessible) dynamic
  numeric properties).
2012-03-18 18:23:27 +00:00
Gustavo André dos Santos Lopes
a3699726f9 - Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
FilesystemIterator's iterators are requested more than once without
  having had its dtor callback called in between).
2012-03-18 15:07:20 +00:00
Gustavo André dos Santos Lopes
d870a41118 - Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
FilesystemIterator's iterators are requested more than once without
  having had its dtor callback called in between).
2012-03-18 15:07:20 +00:00
Gustavo André dos Santos Lopes
714f1ff4b3 - Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
FilesystemIterator's iterators are requested more than once without
  having had its dtor callback called in between).
2012-03-18 15:07:20 +00:00
Gustavo André dos Santos Lopes
e132db7a57 - Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
  fixing bug #61115. This better fix for #61115 fixes the leak (the inhibition
  for deleting the context was too broad) and so prevents segfaults in new
  circumstances (where the inhibition was not broad enough).
2012-03-17 19:37:30 +00:00
Gustavo André dos Santos Lopes
d974e44248 - Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
  fixing bug #61115. This better fix for #61115 fixes the leak (the inhibition
  for deleting the context was too broad) and so prevents segfaults in new
  circumstances (where the inhibition was not broad enough).
2012-03-17 19:37:30 +00:00
Gustavo André dos Santos Lopes
ef19fba2d5 - Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
  fixing bug #61115. This better fix for #61115 fixes the leak (the inhibition
  for deleting the context was too broad) and so prevents segfaults in new
  circumstances (where the inhibition was not broad enough).
2012-03-17 19:37:30 +00:00
Adam Harvey
6655f79401 Fix bug #61409 (Bad formatting on phpinfo()). Patch by Jakub Vrana. 2012-03-16 02:07:46 +00:00
Adam Harvey
9aec9ccd7c Fix bug #61409 (Bad formatting on phpinfo()). Patch by Jakub Vrana. 2012-03-16 02:07:46 +00:00
Ilia Alshanetsky
1ef5fa8710 Fixed bug #60947 (Segmentation fault while executing ibase_db_info) 2012-03-15 19:59:26 +00:00
Ilia Alshanetsky
632825a4ff Fixed bug #60947 (Segmentation fault while executing ibase_db_info) 2012-03-15 19:59:26 +00:00
Ilia Alshanetsky
2dee9ec9f0 Fixed bug #60947 (Segmentation fault while executing ibase_db_info) 2012-03-15 19:59:26 +00:00
Ilia Alshanetsky
601d17d1ae Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO). 2012-03-14 20:20:33 +00:00
Ilia Alshanetsky
283accdf15 Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO). 2012-03-14 20:20:33 +00:00
Ilia Alshanetsky
0af900f976 Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO). 2012-03-14 20:20:33 +00:00
Ulf Wendel
8665e02ccd Test for MySQL version.Variable is deprecated in MySQL 5.6. 2012-03-14 14:55:09 +00:00
Ulf Wendel
18a4e93877 Test for MySQL version.Variable is deprecated in MySQL 5.6. 2012-03-14 14:55:09 +00:00
Ulf Wendel
0fde9acd12 Test for MySQL version.Variable is deprecated in MySQL 5.6. 2012-03-14 14:55:09 +00:00
Gustavo André dos Santos Lopes
efc94f3115 - Fixed bug #61374: html_entity_decode tries to decode code points that don't
exist in ISO-8859-1.
2012-03-13 18:08:30 +00:00
Gustavo André dos Santos Lopes
ed98579924 - Fixed bug #61374: html_entity_decode tries to decode code points that don't
exist in ISO-8859-1.
2012-03-13 18:08:30 +00:00
Christopher Jones
19c0803b77 Test portability and coverage changes 2012-03-12 18:08:34 +00:00
Christopher Jones
7aefbf70a8 Test portability and coverage changes 2012-03-12 18:08:34 +00:00
Christopher Jones
b1575ce9af Test portability and coverage changes 2012-03-12 18:08:34 +00:00
Ilia Alshanetsky
9c886ea553 Fixed bug #60222 (time_nanosleep() does validate input params). 2012-03-12 16:53:07 +00:00
Ilia Alshanetsky
7337a901b7 Fixed bug #60222 (time_nanosleep() does validate input params). 2012-03-12 16:53:07 +00:00
Ilia Alshanetsky
4cccba09e0 Fixed bug #60222 (time_nanosleep() does validate input params). 2012-03-12 16:53:07 +00:00
Felipe Pena
af2fc625df - Fixed memory leak when calling SplFileInfo's constructor twice 2012-03-11 15:42:57 +00:00
Felipe Pena
3954743813 - Fixed memory leak when calling SplFileInfo's constructor twice 2012-03-11 15:42:57 +00:00
Felipe Pena
80cb6e56f6 - Fixed memory leak when calling SplFileInfo's constructor twice 2012-03-11 15:42:57 +00:00
Xinchen Hui
843fa04404 Fixed bug #61088 (Memory leak in readline_callback_handler_install). 2012-03-11 09:19:38 +00:00
Xinchen Hui
41fa157c44 Fixed bug #61088 (Memory leak in readline_callback_handler_install). 2012-03-11 09:19:38 +00:00
Xinchen Hui
7059735b1d Fixed bug #61088 (Memory leak in readline_callback_handler_install). 2012-03-11 09:19:38 +00:00
Xinchen Hui
533d90066e Fix test 2012-03-11 08:30:30 +00:00
Xinchen Hui
e6ec1fb166 Fixed bug #61347 (inconsist isset behavior of Arrayobject) 2012-03-11 08:27:55 +00:00
Xinchen Hui
430486f0bf Fixed bug #61347 (inconsist isset behavior of Arrayobject) 2012-03-11 08:27:55 +00:00
Xinchen Hui
a7639291b4 Fixed bug #61347 (inconsist isset behavior of Arrayobject) 2012-03-11 08:27:55 +00:00
Gustavo André dos Santos Lopes
23e65a9dcc - Fixed bug #61326 (ArrayObject comparison). 2012-03-10 17:19:39 +00:00
Gustavo André dos Santos Lopes
88ba84fa7d - Fixed bug #61326 (ArrayObject comparison). 2012-03-10 17:19:39 +00:00
Gustavo André dos Santos Lopes
7bbf5fe650 - Fixed bug #61326 (ArrayObject comparison). 2012-03-10 17:19:39 +00:00