]>
granicus.if.org Git - php/log
Xinchen Hui [Thu, 22 Mar 2012 09:10:03 +0000 (17:10 +0800)]
Fix test, which was broken by the fix for #61173
Gustavo André dos Santos Lopes [Wed, 21 Mar 2012 21:13:35 +0000 (21:13 +0000)]
Merge branch 'PHP-5.3' of git.php.net:/php-src into 5.3
Gustavo André dos Santos Lopes [Wed, 21 Mar 2012 21:06:00 +0000 (21:06 +0000)]
Fixed bug #61043: Regression in magic_quotes_gpc fix (CVE-2012-0831)
Merge commit 'refs/pull/12/head' of git://github.com/php/php-src into 5.3
Signed-off-by: Gustavo André dos Santos Lopes <cataphract@php.net>
David Soria Parra [Wed, 21 Mar 2012 17:07:30 +0000 (18:07 +0100)]
Use the NEWS merge driver if available
As described in https://wiki.php.net/vcs/gitworkflow#the_news_file it
is possible to setup a custom merge driver for NEWS so git doesnt try
to merge it. This commit sets the default merge driver for the NEWS
file to the merge driver called NEWS.
Dmitry Stogov [Wed, 21 Mar 2012 12:32:49 +0000 (16:32 +0400)]
Fixed bug #49853 (Soap Client stream context header option ignored)
David Soria Parra [Wed, 21 Mar 2012 11:38:43 +0000 (12:38 +0100)]
Always keep the NEWS file from the branch when merging
We usually don't want to touch the NEWS files when we merge and have the
news items not merged by git. Therefore we tell git to use the 'ours' strategy
for the NEWS file.
Ondřej Surý [Tue, 20 Mar 2012 09:21:07 +0000 (10:21 +0100)]
Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831)
Pierre Joye [Wed, 21 Mar 2012 06:06:07 +0000 (07:06 +0100)]
- update NEWS
Pierre Joye [Wed, 21 Mar 2012 06:00:22 +0000 (07:00 +0100)]
- add test for bug #55000 and #54374
Pierre Joye [Wed, 21 Mar 2012 05:58:55 +0000 (06:58 +0100)]
- merge fix bug #54374, bug #55500 - filter file names better, no dangling [s, svn revision 321664
Stanislav Malyshev [Tue, 20 Mar 2012 05:28:16 +0000 (22:28 -0700)]
adapt makedist to git
David Soria Parra [Tue, 20 Mar 2012 16:53:47 +0000 (17:53 +0100)]
Replace $Revision$ with $Id$ in keyword expansion enable files
David Soria Parra [Tue, 20 Mar 2012 16:49:42 +0000 (17:49 +0100)]
Enable $Id$ expansion for files with the $Revision$ keyword
Git supports a limited $Id$ keyword expansion. This $Id$ tag is similar to
$Revision$ in SVN. We enable the $Id$ expansion only for files that use
$Revision$.
Matt Nowack [Mon, 19 Mar 2012 22:29:55 +0000 (15:29 -0700)]
Adding Braces in json.c to conform with coding standards
Xinchen Hui [Tue, 20 Mar 2012 07:59:17 +0000 (15:59 +0800)]
Ignore the temporay files in sapi/*/tests/
Christopher Jones [Mon, 19 Mar 2012 22:16:33 +0000 (15:16 -0700)]
Minor text changes (to try new git repo)
Ilia Alshanetsky [Mon, 19 Mar 2012 17:10:23 +0000 (13:10 -0400)]
Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
Sebastian Bergmann [Mon, 19 Mar 2012 17:25:37 +0000 (18:25 +0100)]
Add missing files.
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: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 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).
Michael Wallner [Sat, 17 Mar 2012 09:35:25 +0000 (09:35 +0000)]
add --PUT-- section support based on POST_RAW
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).
Ulf Wendel [Wed, 14 Mar 2012 14:55:09 +0000 (14:55 +0000)]
Test for MySQL version.Variable is deprecated in MySQL 5.6.
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).
Xinchen Hui [Mon, 12 Mar 2012 14:52:02 +0000 (14:52 +0000)]
reduce memory usage
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
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: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: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 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)
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)
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: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
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())
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.
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 [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: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
Dmitry Stogov [Mon, 5 Mar 2012 12:59:01 +0000 (12:59 +0000)]
Fixed bug #60887 (SoapClient ignores user_agent option and sends no User-Agent header)
Dmitry Stogov [Mon, 5 Mar 2012 12:47:25 +0000 (12:47 +0000)]
Fixed module numbering
Pierre Joye [Sun, 4 Mar 2012 22:15:12 +0000 (22:15 +0000)]
- fix bug #54407, Incorrectly defined NTDDI_VERSION macro
Gustavo André dos Santos Lopes [Sun, 4 Mar 2012 19:30:01 +0000 (19:30 +0000)]
- size_t may be shorter than long and definitely is not signed. Note that the
z modifier was only added in C99, so we can't use it.
Pierre Joye [Sun, 4 Mar 2012 15:23:24 +0000 (15:23 +0000)]
- fix bug #54407, Incorrectly defined NTDDI_VERSION macro
Nikita Popov [Sun, 4 Mar 2012 13:52:48 +0000 (13:52 +0000)]
Fix bug #60596: Code Cleanup Removing Superfluous If Statement
Cleanup only, no function change. Patch by ircmaxell.
Ilia Alshanetsky [Sat, 3 Mar 2012 20:36:14 +0000 (20:36 +0000)]
Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths)
Nikita Popov [Sat, 3 Mar 2012 12:46:17 +0000 (12:46 +0000)]
Fix bug #61264: xmlrpc_parse_method_descriptions leaks temporary variable
Nikita Popov [Fri, 2 Mar 2012 18:05:38 +0000 (18:05 +0000)]
Fix bug #52719: array_walk_recursive crashes if third param of the function is by reference
Rasmus Lerdorf [Fri, 2 Mar 2012 17:08:00 +0000 (17:08 +0000)]
Missed 5.3 for the Armenia DST drop
Derick Rethans [Fri, 2 Mar 2012 17:00:33 +0000 (17:00 +0000)]
- Updated to version 2012.2 (2012b)
Adam Harvey [Fri, 2 Mar 2012 03:39:04 +0000 (03:39 +0000)]
MFH: Fix bug #60801 (strpbrk() mishandles NUL byte). (Trunk commit: r322934).
Christopher Jones [Fri, 2 Mar 2012 00:07:41 +0000 (00:07 +0000)]
Fixed bug #61172 (Add Apache 2.4 support)
Christopher Jones [Thu, 1 Mar 2012 20:05:18 +0000 (20:05 +0000)]
Change PHP 6 refs to PHP 5.4 and sync some spelling with PHP_5_4 branch files
Derick Rethans [Thu, 1 Mar 2012 15:09:49 +0000 (15:09 +0000)]
- Updated to version 2012.1 (2012a)
Christopher Jones [Wed, 29 Feb 2012 20:48:17 +0000 (20:48 +0000)]
Add the CVE numbers that were mentioned in the related php.net announcements
Christopher Jones [Wed, 29 Feb 2012 18:46:17 +0000 (18:46 +0000)]
Remove "backported" from 5.4 comments since 5.3 is the base version these bugs are fixed. Reorder.
Rasmus Lerdorf [Mon, 27 Feb 2012 12:16:39 +0000 (12:16 +0000)]
Fix bug 61193
Xinchen Hui [Sun, 26 Feb 2012 14:56:26 +0000 (14:56 +0000)]
Improve fix for #61165, the previous one cause #43450 test failed
Xinchen Hui [Sat, 25 Feb 2012 14:15:11 +0000 (14:15 +0000)]
Fixed bug #61087 (Memory leak in parse_ini_file when specifying invalid scanner mode)
Olivier DOUCET [Sat, 25 Feb 2012 13:27:57 +0000 (13:27 +0000)]
test for bug #61124
Nikita Popov [Sat, 25 Feb 2012 13:04:43 +0000 (13:04 +0000)]
NEWS for r323330
So cjones doesn't have nightmares :P
Olivier DOUCET [Sat, 25 Feb 2012 12:44:46 +0000 (12:44 +0000)]
fix phpt : fopen(data://) requires allow_url_fopen=1
Olivier DOUCET [Sat, 25 Feb 2012 12:10:41 +0000 (12:10 +0000)]
more verbose skip reason in test files with not so obvious extension requirements
Xinchen Hui [Sat, 25 Feb 2012 05:18:40 +0000 (05:18 +0000)]
merge test to 5.3, and remove xfail since the bug was fixed
Xinchen Hui [Sat, 25 Feb 2012 04:36:08 +0000 (04:36 +0000)]
Fixed bug #61165 (Segfault - strip_tags())
Gustavo André dos Santos Lopes [Fri, 24 Feb 2012 22:56:21 +0000 (22:56 +0000)]
- Better fix for #61115.
- Fixed resource leak in stream_socket_client().
Gustavo André dos Santos Lopes [Fri, 24 Feb 2012 10:01:39 +0000 (10:01 +0000)]
- Fixed bug #61173 (Unable to detect error from finfo constructor).
- Tidied up NEWS
Christopher Jones [Thu, 23 Feb 2012 19:43:38 +0000 (19:43 +0000)]
Relocate orphan line
Scott MacVicar [Thu, 23 Feb 2012 01:26:46 +0000 (01:26 +0000)]
Fixed bug #61124 (Crash when decoding an invalid base64 encoded string).
Nikita Popov [Wed, 22 Feb 2012 17:21:57 +0000 (17:21 +0000)]
NEWS for r323362
Gustavo André dos Santos Lopes [Wed, 22 Feb 2012 11:45:26 +0000 (11:45 +0000)]
- Fixed bug #61115 (stream related segfault on fatal error in
php_stream_context_link).
#run-tests.php is not currently detecting the segfault in the test
#Missing 5.4 merge
Rasmus Lerdorf [Tue, 21 Feb 2012 00:01:19 +0000 (00:01 +0000)]
Yup, these need to be escaped. Good catch.
Rasmus Lerdorf [Mon, 20 Feb 2012 20:29:26 +0000 (20:29 +0000)]
Fix bug 61149
Etienne Kneuss [Mon, 20 Feb 2012 18:28:57 +0000 (18:28 +0000)]
Fix #61095 (Lexing 0x0*+<NUM> incorrectly)
Nuno Lopes [Mon, 20 Feb 2012 16:01:34 +0000 (16:01 +0000)]
fix race condition in find (it was finding the copied files over and over again, and recursing forever)
Nikita Popov [Sun, 19 Feb 2012 14:39:29 +0000 (14:39 +0000)]
Fix bug #61139 gzopen leaks when specifying invalid mode
Needs to be merged to 5.4.
Nikita Popov [Sat, 18 Feb 2012 14:58:19 +0000 (14:58 +0000)]
Fix bug #61097 Memory leak in xmlrpc functions copying zvals
Needs to be merged to 5.4.
Nikita Popov [Sat, 18 Feb 2012 13:39:13 +0000 (13:39 +0000)]
Fix headers generated by phar
sapi_header_line.line_len is the length without null terminator, so one has to
take sizeof - 1. This fixes some test failures as the NUL bytes were causing
warnings.
Needs to be merged to 5.4.
Adam Harvey [Sat, 18 Feb 2012 04:32:45 +0000 (04:32 +0000)]
Merge 5.3.10 NEWS, per Ondřej's mailing list prod.
Rasmus Lerdorf [Thu, 16 Feb 2012 17:48:30 +0000 (17:48 +0000)]
Weird, what happened here?
Mateusz Kocielski [Tue, 14 Feb 2012 14:14:30 +0000 (14:14 +0000)]
* fixed bug #60704 unlink() bug with some files path
Reviewed by: rasmus@
Rasmus Lerdorf [Tue, 14 Feb 2012 09:50:46 +0000 (09:50 +0000)]
This one depends on max_input_vars as well
Rasmus Lerdorf [Tue, 14 Feb 2012 09:47:32 +0000 (09:47 +0000)]
These tests fail unless max_input_vars and/or max_file_uploads is set high enough