]>
granicus.if.org Git - php/log
Michael Wallner [Mon, 19 Mar 2012 20:49:47 +0000 (21:49 +0100)]
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
Michael Wallner [Mon, 19 Mar 2012 19:15:54 +0000 (20:15 +0100)]
add note about corrected tiger hash output
Gustavo André dos Santos Lopes [Mon, 19 Mar 2012 17:50:13 +0000 (17:50 +0000)]
Merge branch 'PHP-5.4' of git.php.net:/php-src into 5.4
Sebastian Bergmann [Mon, 19 Mar 2012 17:25:49 +0000 (18:25 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
Sebastian Bergmann [Mon, 19 Mar 2012 17:25:37 +0000 (18:25 +0100)]
Add missing files.
Gustavo André dos Santos Lopes [Sun, 5 Feb 2012 14:57:57 +0000 (14:57 +0000)]
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.
Gustavo André dos Santos Lopes [Mon, 19 Mar 2012 16:28:10 +0000 (16:28 +0000)]
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.
David Soria Parra [Mon, 19 Mar 2012 14:59:45 +0000 (15:59 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Add .gitignore
David Soria Parra [Mon, 19 Mar 2012 14:58:34 +0000 (15:58 +0100)]
Add .gitignore
The gitignore file was created using git svn show-ignore and the overlapping
patterns were removed.
David Soria Parra [Mon, 19 Mar 2012 13:12:26 +0000 (06:12 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4
This merge is a "fake". It was done with the merge strategy
"ours" to ensure Git thinks both branches are in sync after
the migration from SVN.
David Soria Parra [Mon, 19 Mar 2012 13:11:40 +0000 (06:11 -0700)]
Merge branch 'PHP-5.2' into PHP-5.3
This merge is a "fake". It was done with the merge strategy
"ours" to ensure Git thinks both branches are in sync after
the migration from SVN.
Gustavo André dos Santos Lopes [Sun, 18 Mar 2012 18:23:27 +0000 (18:23 +0000)]
- Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads
when get_properties returns a hash table with (inaccessible) dynamic
numeric properties).
Gustavo André dos Santos Lopes [Sun, 18 Mar 2012 18:23:27 +0000 (18:23 +0000)]
- Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads
when get_properties returns a hash table with (inaccessible) dynamic
numeric properties).
Gustavo André dos Santos Lopes [Sun, 18 Mar 2012 15:07:20 +0000 (15:07 +0000)]
- 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).
Gustavo André dos Santos Lopes [Sun, 18 Mar 2012 15:07:20 +0000 (15:07 +0000)]
- 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).
Gustavo André dos Santos Lopes [Sat, 17 Mar 2012 19:37:30 +0000 (19:37 +0000)]
- 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).
Gustavo André dos Santos Lopes [Sat, 17 Mar 2012 19:37:30 +0000 (19:37 +0000)]
- 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).
Ilia Alshanetsky [Sat, 17 Mar 2012 17:51:51 +0000 (17:51 +0000)]
Fixed typo
Michael Wallner [Sat, 17 Mar 2012 09:35:25 +0000 (09:35 +0000)]
add --PUT-- section support based on POST_RAW
Michael Wallner [Sat, 17 Mar 2012 09:35:25 +0000 (09:35 +0000)]
add --PUT-- section support based on POST_RAW
Pierre Joye [Sat, 17 Mar 2012 08:52:27 +0000 (08:52 +0000)]
- Fix bug #61424, ext/sqlite is not bundled anymore, remove it from php.ini
Adam Harvey [Fri, 16 Mar 2012 02:07:46 +0000 (02:07 +0000)]
Fix bug #61409 (Bad formatting on phpinfo()). Patch by Jakub Vrana.
Ilia Alshanetsky [Thu, 15 Mar 2012 19:59:26 +0000 (19:59 +0000)]
Fixed bug #60947 (Segmentation fault while executing ibase_db_info)
Ilia Alshanetsky [Thu, 15 Mar 2012 19:59:26 +0000 (19:59 +0000)]
Fixed bug #60947 (Segmentation fault while executing ibase_db_info)
Ilia Alshanetsky [Wed, 14 Mar 2012 20:20:33 +0000 (20:20 +0000)]
Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO).
Ilia Alshanetsky [Wed, 14 Mar 2012 20:20:33 +0000 (20:20 +0000)]
Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO).
Ulf Wendel [Wed, 14 Mar 2012 14:55:09 +0000 (14:55 +0000)]
Test for MySQL version.Variable is deprecated in MySQL 5.6.
Ulf Wendel [Wed, 14 Mar 2012 14:55:09 +0000 (14:55 +0000)]
Test for MySQL version.Variable is deprecated in MySQL 5.6.
Gustavo André dos Santos Lopes [Tue, 13 Mar 2012 18:08:30 +0000 (18:08 +0000)]
- Fixed bug #61374: html_entity_decode tries to decode code points that don't
exist in ISO-8859-1.
Pierre Joye [Tue, 13 Mar 2012 12:55:33 +0000 (12:55 +0000)]
- add CVE
Christopher Jones [Mon, 12 Mar 2012 18:08:34 +0000 (18:08 +0000)]
Test portability and coverage changes
Christopher Jones [Mon, 12 Mar 2012 18:08:34 +0000 (18:08 +0000)]
Test portability and coverage changes
Ilia Alshanetsky [Mon, 12 Mar 2012 16:53:07 +0000 (16:53 +0000)]
Fixed bug #60222 (time_nanosleep() does validate input params).
Ilia Alshanetsky [Mon, 12 Mar 2012 16:53:07 +0000 (16:53 +0000)]
Fixed bug #60222 (time_nanosleep() does validate input params).
Rasmus Lerdorf [Mon, 12 Mar 2012 15:21:15 +0000 (15:21 +0000)]
Remove reference to "default_charset" here since the it isn't
really about the ini option at all. That only comes into play
when you force it by passing and empty encoding string to those
functions.
Xinchen Hui [Mon, 12 Mar 2012 14:52:02 +0000 (14:52 +0000)]
reduce memory usage
Xinchen Hui [Mon, 12 Mar 2012 14:52:02 +0000 (14:52 +0000)]
reduce memory usage
Rasmus Lerdorf [Mon, 12 Mar 2012 06:11:58 +0000 (06:11 +0000)]
This change was badly worded and filed in the wrong section.
This isn't an ini change at all.
Ilia Alshanetsky [Sun, 11 Mar 2012 18:15:13 +0000 (18:15 +0000)]
Fixed bug #60569 (Nullbyte truncates Exception $message).
Ilia Alshanetsky [Sun, 11 Mar 2012 18:15:13 +0000 (18:15 +0000)]
Fixed bug #60569 (Nullbyte truncates Exception $message).
Felipe Pena [Sun, 11 Mar 2012 15:42:57 +0000 (15:42 +0000)]
- Fixed memory leak when calling SplFileInfo's constructor twice
Felipe Pena [Sun, 11 Mar 2012 15:42:57 +0000 (15:42 +0000)]
- Fixed memory leak when calling SplFileInfo's constructor twice
Xinchen Hui [Sun, 11 Mar 2012 15:31:19 +0000 (15:31 +0000)]
Typo when merging from trunk
Xinchen Hui [Sun, 11 Mar 2012 15:28:31 +0000 (15:28 +0000)]
Fixed bug #61273 (call_user_func_array with more than 16333 arguments leaks / crashes)
Xinchen Hui [Sun, 11 Mar 2012 15:28:31 +0000 (15:28 +0000)]
Fixed bug #61273 (call_user_func_array with more than 16333 arguments leaks / crashes)
Xinchen Hui [Sun, 11 Mar 2012 15:12:28 +0000 (15:12 +0000)]
Fix wrong type in the marco of fetching thread globals
Xinchen Hui [Sun, 11 Mar 2012 15:12:28 +0000 (15:12 +0000)]
Fix wrong type in the marco of fetching thread globals
Xinchen Hui [Sun, 11 Mar 2012 09:19:38 +0000 (09:19 +0000)]
Fixed bug #61088 (Memory leak in readline_callback_handler_install).
Xinchen Hui [Sun, 11 Mar 2012 09:19:38 +0000 (09:19 +0000)]
Fixed bug #61088 (Memory leak in readline_callback_handler_install).
Xinchen Hui [Sun, 11 Mar 2012 09:07:02 +0000 (09:07 +0000)]
Same wrong order here
Xinchen Hui [Sun, 11 Mar 2012 09:06:12 +0000 (09:06 +0000)]
Sorry for wrong order again.
Xinchen Hui [Sun, 11 Mar 2012 09:02:00 +0000 (09:02 +0000)]
Re-order them according to README.SVN-RULES
Xinchen Hui [Sun, 11 Mar 2012 09:02:00 +0000 (09:02 +0000)]
Re-order them according to README.SVN-RULES
Xinchen Hui [Sun, 11 Mar 2012 08:56:14 +0000 (08:56 +0000)]
Implemented FR #60850 (Built in web server does not set $_SERVER['SCRIPT_FILENAME'] when using router)
Xinchen Hui [Sun, 11 Mar 2012 08:41:40 +0000 (08:41 +0000)]
Add Moriyoshi Koizumi and I to the cli SAPI credits
Xinchen Hui [Sun, 11 Mar 2012 08:34:06 +0000 (08:34 +0000)]
Oops, sorry for my poor english
Xinchen Hui [Sun, 11 Mar 2012 08:34:06 +0000 (08:34 +0000)]
Oops, sorry for my poor english
Xinchen Hui [Sun, 11 Mar 2012 08:30:30 +0000 (08:30 +0000)]
Fix test
Xinchen Hui [Sun, 11 Mar 2012 08:27:55 +0000 (08:27 +0000)]
Fixed bug #61347 (inconsist isset behavior of Arrayobject)
Xinchen Hui [Sun, 11 Mar 2012 08:27:55 +0000 (08:27 +0000)]
Fixed bug #61347 (inconsist isset behavior of Arrayobject)
Gustavo André dos Santos Lopes [Sat, 10 Mar 2012 17:19:39 +0000 (17:19 +0000)]
- Fixed bug #61326 (ArrayObject comparison).
Gustavo André dos Santos Lopes [Sat, 10 Mar 2012 17:19:39 +0000 (17:19 +0000)]
- Fixed bug #61326 (ArrayObject comparison).
Michael Wallner [Fri, 9 Mar 2012 19:51:09 +0000 (19:51 +0000)]
merge 322758 (detect a php-cgi which is a sibling of php cli)
Michael Wallner [Fri, 9 Mar 2012 19:51:09 +0000 (19:51 +0000)]
merge 322758 (detect a php-cgi which is a sibling of php cli)
Ilia Alshanetsky [Thu, 8 Mar 2012 20:14:26 +0000 (20:14 +0000)]
Fixed bug #60842, #51775 (Chunked response parsing error when chunksize length line is > 10 bytes).
Ilia Alshanetsky [Thu, 8 Mar 2012 20:14:26 +0000 (20:14 +0000)]
Fixed bug #60842, #51775 (Chunked response parsing error when chunksize length line is > 10 bytes).
Johannes Schlüter [Thu, 8 Mar 2012 12:52:12 +0000 (12:52 +0000)]
Use correct property ctor, should fix threading issue in bug #55334
# The code was refactored in 5_4/trunk, no need to merge
Gustavo André dos Santos Lopes [Thu, 8 Mar 2012 12:39:48 +0000 (12:39 +0000)]
- Oops committed old version of the patch in r324020. Fixed. See bug #61253.
Gustavo André dos Santos Lopes [Thu, 8 Mar 2012 12:39:48 +0000 (12:39 +0000)]
- Oops committed old version of the patch in r324020. Fixed. See bug #61253.
Gustavo André dos Santos Lopes [Thu, 8 Mar 2012 12:30:59 +0000 (12:30 +0000)]
- 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.
Gustavo André dos Santos Lopes [Thu, 8 Mar 2012 12:30:59 +0000 (12:30 +0000)]
- 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.
Gustavo André dos Santos Lopes [Thu, 8 Mar 2012 08:52:28 +0000 (08:52 +0000)]
- Fixed bug #61267: pdo_pgsql's PDO::exec() returns the number of SELECTed
rows on postgresql >= 9
Gustavo André dos Santos Lopes [Thu, 8 Mar 2012 08:52:28 +0000 (08:52 +0000)]
- Fixed bug #61267: pdo_pgsql's PDO::exec() returns the number of SELECTed
rows on postgresql >= 9
Ilia Alshanetsky [Thu, 8 Mar 2012 03:31:46 +0000 (03:31 +0000)]
Fixed bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
Ilia Alshanetsky [Thu, 8 Mar 2012 03:31:46 +0000 (03:31 +0000)]
Fixed bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
Gustavo André dos Santos Lopes [Wed, 7 Mar 2012 19:47:18 +0000 (19:47 +0000)]
- Updated NEWS with news of bug #61306 having been resolved (see r323988).
- Tidied up NEWS
Gustavo André dos Santos Lopes [Wed, 7 Mar 2012 08:51:30 +0000 (08:51 +0000)]
- Tentative fix for bug #61306.
#cjones: Will update NEWS when confirmed it fixes the problem.
Stanislav Malyshev [Wed, 7 Mar 2012 07:49:56 +0000 (07:49 +0000)]
MFH: Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227.
Stanislav Malyshev [Wed, 7 Mar 2012 07:38:57 +0000 (07:38 +0000)]
MFH: Fixed bug #61173 (Unable to detect error from finfo constructor).
Christopher Jones [Tue, 6 Mar 2012 23:34:57 +0000 (23:34 +0000)]
Sync char set wording with migration doc
Christopher Jones [Tue, 6 Mar 2012 21:30:59 +0000 (21:30 +0000)]
Make "buildconf --force" more robust, per IRC chat. Not backported to 5.3 to avoid destabilization.
Christopher Jones [Tue, 6 Mar 2012 20:20:50 +0000 (20:20 +0000)]
Typo and missing zend ini param
Christopher Jones [Tue, 6 Mar 2012 19:12:39 +0000 (19:12 +0000)]
Typo: "outout"
Derick Rethans [Tue, 6 Mar 2012 18:34:10 +0000 (18:34 +0000)]
Fixed version numbers.
Derick Rethans [Tue, 6 Mar 2012 18:34:10 +0000 (18:34 +0000)]
Fixed version numbers.
Derick Rethans [Tue, 6 Mar 2012 18:25:55 +0000 (18:25 +0000)]
Add the ZEND_DONT_UNLOAD_MODULES environment variable for debugging to 5.3 as
well.
Xinchen Hui [Tue, 6 Mar 2012 06:24:50 +0000 (06:24 +0000)]
Add test for bug #61292, bug was fixed in -r323935
Xinchen Hui [Tue, 6 Mar 2012 03:45:27 +0000 (03:45 +0000)]
Fixed bug #61292 (Segfault while calling a method on an overloaded PDO object)
Johannes Schlüter [Tue, 6 Mar 2012 01:43:49 +0000 (01:43 +0000)]
Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test fails
Johannes Schlüter [Tue, 6 Mar 2012 01:43:49 +0000 (01:43 +0000)]
Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test fails
Johannes Schlüter [Tue, 6 Mar 2012 00:15:40 +0000 (00:15 +0000)]
Fix bug #61003 mysql_stat() require a valid connection
Johannes Schlüter [Tue, 6 Mar 2012 00:15:40 +0000 (00:15 +0000)]
Fix bug #61003 mysql_stat() require a valid connection
Johannes Schlüter [Mon, 5 Mar 2012 23:57:24 +0000 (23:57 +0000)]
Fix bug #61194 PDO should export compression flag with myslqnd
Johannes Schlüter [Mon, 5 Mar 2012 23:57:24 +0000 (23:57 +0000)]
Fix bug #61194 PDO should export compression flag with myslqnd
Johannes Schlüter [Mon, 5 Mar 2012 23:55:12 +0000 (23:55 +0000)]
Fix bug #60948 mysqlnd FTBFS when -Wformat-security is enabled
# 5.3 not affected
Johannes Schlüter [Mon, 5 Mar 2012 23:38:15 +0000 (23:38 +0000)]
Fix Bug #61207 PDO::nextRowset() after a multi-statement query doesn't always work
Johannes Schlüter [Mon, 5 Mar 2012 23:38:15 +0000 (23:38 +0000)]
Fix Bug #61207 PDO::nextRowset() after a multi-statement query doesn't always work
Pierre Joye [Mon, 5 Mar 2012 20:53:40 +0000 (20:53 +0000)]
- fix bug #61290, fix build
Pierre Joye [Mon, 5 Mar 2012 20:53:40 +0000 (20:53 +0000)]
- fix bug #61290, fix build
Michael Wallner [Mon, 5 Mar 2012 15:38:24 +0000 (15:38 +0000)]
MFH: Fixed bug #61287 (A particular string fails to decompress)