71d894cd42
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Adding Braces in json.c to conform with coding standards
2012-03-20 17:29:20 +01:00
76ef76d2f8
Adding Braces in json.c to conform with coding standards
2012-03-20 17:29:04 +01:00
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
4a6d9b348f
Minor text changes (to try new git repo)
2012-03-19 15:16:33 -07:00
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
91f2d3809e
Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK
2012-03-19 21:48:55 +01:00
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
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
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
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
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
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
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
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
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
9aec9ccd7c
Fix bug #61409 (Bad formatting on phpinfo()). Patch by Jakub Vrana.
2012-03-16 02:07:46 +00:00
1ef5fa8710
Fixed bug #60947 (Segmentation fault while executing ibase_db_info)
2012-03-15 19:59:26 +00:00
2dee9ec9f0
Fixed bug #60947 (Segmentation fault while executing ibase_db_info)
2012-03-15 19:59:26 +00:00
601d17d1ae
Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO).
2012-03-14 20:20:33 +00:00
0af900f976
Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO).
2012-03-14 20:20:33 +00:00
8665e02ccd
Test for MySQL version.Variable is deprecated in MySQL 5.6.
2012-03-14 14:55:09 +00:00
0fde9acd12
Test for MySQL version.Variable is deprecated in MySQL 5.6.
2012-03-14 14:55:09 +00:00
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
19c0803b77
Test portability and coverage changes
2012-03-12 18:08:34 +00:00
b1575ce9af
Test portability and coverage changes
2012-03-12 18:08:34 +00:00
9c886ea553
Fixed bug #60222 (time_nanosleep() does validate input params).
2012-03-12 16:53:07 +00:00
4cccba09e0
Fixed bug #60222 (time_nanosleep() does validate input params).
2012-03-12 16:53:07 +00:00
af2fc625df
- Fixed memory leak when calling SplFileInfo's constructor twice
2012-03-11 15:42:57 +00:00
80cb6e56f6
- Fixed memory leak when calling SplFileInfo's constructor twice
2012-03-11 15:42:57 +00:00
843fa04404
Fixed bug #61088 (Memory leak in readline_callback_handler_install).
2012-03-11 09:19:38 +00:00
41fa157c44
Fixed bug #61088 (Memory leak in readline_callback_handler_install).
2012-03-11 09:19:38 +00:00
533d90066e
Fix test
2012-03-11 08:30:30 +00:00
430486f0bf
Fixed bug #61347 (inconsist isset behavior of Arrayobject)
2012-03-11 08:27:55 +00:00
a7639291b4
Fixed bug #61347 (inconsist isset behavior of Arrayobject)
2012-03-11 08:27:55 +00:00
88ba84fa7d
- Fixed bug #61326 (ArrayObject comparison).
2012-03-10 17:19:39 +00:00
7bbf5fe650
- Fixed bug #61326 (ArrayObject comparison).
2012-03-10 17:19:39 +00:00
aee5a9864d
Fixed bug #60842 , #51775 (Chunked response parsing error when chunksize length line is > 10 bytes).
2012-03-08 20:14:26 +00:00
b61f335b9d
Fixed bug #60842 , #51775 (Chunked response parsing error when chunksize length line is > 10 bytes).
2012-03-08 20:14:26 +00:00
ecf87a96b9
Use correct property ctor, should fix threading issue in bug #55334
...
# The code was refactored in 5_4/trunk, no need to merge
2012-03-08 12:52:12 +00:00
7166298d63
- Fixed bug #61253 : Wrappers opened with errors concurrency problem
...
#NOTE: There is a very small possibility that this will further break
#extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the
#only one and it may leak memory after this. I say "further break" because
#extensions that do that are already broken (will segfault) under ZTS, which is
#why this patch is necessary.
#There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
2012-03-08 12:30:59 +00:00
f413b3726c
- Fixed bug #61253 : Wrappers opened with errors concurrency problem
...
#NOTE: There is a very small possibility that this will further break
#extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the
#only one and it may leak memory after this. I say "further break" because
#extensions that do that are already broken (will segfault) under ZTS, which is
#why this patch is necessary.
#There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
2012-03-08 12:30:59 +00:00
fee191658d
- Fixed bug #61267 : pdo_pgsql's PDO::exec() returns the number of SELECTed
...
rows on postgresql >= 9
2012-03-08 08:52:28 +00:00
b7c9f8ae8a
- Fixed bug #61267 : pdo_pgsql's PDO::exec() returns the number of SELECTed
...
rows on postgresql >= 9
2012-03-08 08:52:28 +00:00
ef61504b35
Fixed bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
2012-03-08 03:31:46 +00:00
f005f36cd6
Fixed bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
2012-03-08 03:31:46 +00:00
d13f833875
- Tentative fix for bug #61306 .
...
#cjones: Will update NEWS when confirmed it fixes the problem.
2012-03-07 08:51:30 +00:00
4cc747677c
MFH: Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227 .
2012-03-07 07:49:56 +00:00
5e80c05deb
MFH: Fixed bug #61173 (Unable to detect error from finfo constructor).
2012-03-07 07:38:57 +00:00
4d87ca2c7a
Add test for bug #61292 , bug was fixed in -r323935
2012-03-06 06:24:50 +00:00
a32a199201
Fixed bug #61292 (Segfault while calling a method on an overloaded PDO object)
2012-03-06 03:45:27 +00:00
David Soria Parra