]>
granicus.if.org Git - php/log
Dmitry Patsura [Tue, 19 May 2015 13:19:13 +0000 (21:19 +0800)]
[Math] ceil, floor added FAST_ZPP parameters pass
Dmitry Stogov [Tue, 19 May 2015 10:23:13 +0000 (13:23 +0300)]
Improved hash table copying
Dmitry Stogov [Tue, 19 May 2015 10:22:58 +0000 (13:22 +0300)]
Improved hash table copying
Kalle Sommer Nielsen [Tue, 19 May 2015 10:20:25 +0000 (12:20 +0200)]
This shouldn't have been a part of the previous commit
Kalle Sommer Nielsen [Tue, 19 May 2015 10:13:19 +0000 (12:13 +0200)]
Merge branch 'master' of https://git.php.net/push/php-src
Kalle Sommer Nielsen [Tue, 19 May 2015 10:12:24 +0000 (12:12 +0200)]
* Make ext/dba compile with newer versions of Oracle's Berkeley (in my case 6.1)
* Make the db3 driver work with 4.3+
Remi Collet [Tue, 19 May 2015 08:54:10 +0000 (10:54 +0200)]
Add consistency check in FAST_ZPP call
So ensure Z_PARAM_OPTIONAL is correctly call at the right place
Only in DEBUG build
Will raise 'Assertion `_i > _min_num_args || _optional==0' failed.'
or 'Assertion `_i <= _min_num_args || _optional==1' failed.'
Thus will allow to detect bad code early.
Dmitry Stogov [Tue, 19 May 2015 08:06:01 +0000 (11:06 +0300)]
Eliminated useless check in FAST_ZPP (this also fixed few wrong -Wmaybe-uninitialized compilation warnings) (Remi)
Anatol Belski [Mon, 18 May 2015 20:36:55 +0000 (22:36 +0200)]
fix test title
Anatol Belski [Mon, 18 May 2015 20:33:59 +0000 (22:33 +0200)]
fork test for ICU >= 55.1 compat
Anatol Belski [Mon, 18 May 2015 20:29:01 +0000 (22:29 +0200)]
sync test with exception currently thrown
Anatol Belski [Mon, 18 May 2015 20:23:35 +0000 (22:23 +0200)]
fork test for ICU >= 55.1 compat
Anatol Belski [Mon, 18 May 2015 20:10:38 +0000 (22:10 +0200)]
fork test for ICU >= 55.1 compat
Anatol Belski [Mon, 18 May 2015 20:06:15 +0000 (22:06 +0200)]
skip test for ICU >= 55.1, a newer test is available and passes
Anatol Belski [Mon, 18 May 2015 19:49:27 +0000 (21:49 +0200)]
fork test for ICU >= 55.1 compat
Anatol Belski [Mon, 18 May 2015 19:45:15 +0000 (21:45 +0200)]
fork test for ICU >= 55.1 compat
Anatol Belski [Mon, 18 May 2015 16:29:59 +0000 (18:29 +0200)]
fix mbrlen prototype availability
Dmitry Stogov [Mon, 18 May 2015 20:06:23 +0000 (23:06 +0300)]
Reset heap usage statistics on request shutdown
Dmitry Stogov [Mon, 18 May 2015 09:44:40 +0000 (12:44 +0300)]
Fixed bug #69649 (segfault with --enable-dtrace)
Reeze Xia [Mon, 18 May 2015 04:49:42 +0000 (12:49 +0800)]
Avoid possible uninitialized value assignment
Xinchen Hui [Mon, 18 May 2015 03:14:03 +0000 (11:14 +0800)]
Added Test (the lineno should be fixed)
Xinchen Hui [Mon, 18 May 2015 03:09:09 +0000 (11:09 +0800)]
1. Fixed bug #69640 Unhandled EngineExceptions thrown from userland do not produce any output
2. Fixed Segfault introduced by latest changes
Reeze Xia [Tue, 10 Feb 2015 14:22:35 +0000 (22:22 +0800)]
Prefer isfinite to finite
Since finite() is not part of ANSI C
@see http://bytes.com/topic/c/answers/217761-finite-ansi-c
Nikita Popov [Sun, 17 May 2015 16:59:34 +0000 (18:59 +0200)]
Display TypeExceptions like normal exceptions
We currently don't show the argument at which the error actually
occured in the trace - should probably either add it or don't
display args on incomplete frames altogether, otherwise this'll
probably be confusing.
Nikita Popov [Sun, 17 May 2015 16:35:18 +0000 (18:35 +0200)]
Tweak uncaught exception message display
This implements a reduced variant of #1226 with just the following
change:
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d
+Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d
The '' wrapper around messages is very weird if the exception
message itself contains ''. Futhermore having the message wrapped
in '' doesn't work for the "and defined" suffix of
TypeExceptions.
Nikita Popov [Sun, 17 May 2015 11:46:54 +0000 (13:46 +0200)]
Don't write prop if read prop threw exception
Stanislav Malyshev [Sat, 16 May 2015 21:20:41 +0000 (14:20 -0700)]
Merge branch 'pull-request/1277'
* pull-request/1277:
fix typos
Nikita Popov [Fri, 15 May 2015 19:04:07 +0000 (21:04 +0200)]
Display EngineExceptions like ordinary exceptions
TypeException stays as-is for now because it uses messages that are
incompatible with the way exception messages are displayed.
closure_038.phpt and a few others now show that we're generating
too many exceptions for compound operations on undefined properties
-- this needs to be fixed in a followup.
Bob Weinand [Fri, 15 May 2015 20:45:35 +0000 (22:45 +0200)]
Merge branch 'master' of https://github.com/php/php-src
Nikita Popov [Fri, 15 May 2015 20:42:19 +0000 (22:42 +0200)]
Fix exception leak in interactive console
Shows up there because it throws at E_WARNING severity level and
as such leak detection is not suppressed.
Xinchen Hui [Fri, 15 May 2015 16:33:49 +0000 (00:33 +0800)]
Fixed segfault
Xinchen Hui [Fri, 15 May 2015 16:19:43 +0000 (00:19 +0800)]
code standard
Xinchen Hui [Fri, 15 May 2015 14:57:36 +0000 (22:57 +0800)]
Merge branch 'master' of git.php.net:php-src
Xinchen Hui [Fri, 15 May 2015 14:57:17 +0000 (22:57 +0800)]
Hint the compiler
Bob Weinand [Fri, 15 May 2015 11:59:47 +0000 (13:59 +0200)]
Fix unrelated tests and zlib window size
Anatol Belski [Fri, 15 May 2015 06:20:33 +0000 (08:20 +0200)]
remove version check
the cause of the recursive inclusion is fixed, it's not compiler
version dependent
Matteo Beccati [Fri, 15 May 2015 04:52:04 +0000 (06:52 +0200)]
Updated test to include ReflectionGenerator
Dmitry Stogov [Fri, 15 May 2015 01:03:30 +0000 (04:03 +0300)]
Improve strtr()
Bob Weinand [Fri, 15 May 2015 00:42:11 +0000 (02:42 +0200)]
Minor typo in warning message
Bob Weinand [Fri, 15 May 2015 00:28:22 +0000 (02:28 +0200)]
Add strategy option to deflate_init()
Bob Weinand [Fri, 15 May 2015 00:18:53 +0000 (02:18 +0200)]
Add dictionary option to {in,de}flate_init()
Bob Weinand [Thu, 14 May 2015 20:58:13 +0000 (22:58 +0200)]
Add window option to {de,in}flate_init()
Ferenc Kovacs [Thu, 14 May 2015 23:09:45 +0000 (01:09 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix NEWS
Ferenc Kovacs [Thu, 14 May 2015 23:00:53 +0000 (01:00 +0200)]
fix NEWS
Anatol Belski [Thu, 14 May 2015 22:00:06 +0000 (00:00 +0200)]
added the inclusion guard
the vc check can be likely removed, to be checked
Dmitry Stogov [Thu, 14 May 2015 22:11:29 +0000 (01:11 +0300)]
Optimized === and !== with NULL, FALSE, TRUE.
Bob Weinand [Thu, 14 May 2015 20:30:01 +0000 (22:30 +0200)]
Add NEWS/UPGRADING for ReflectionGenerator class
Bob Weinand [Thu, 14 May 2015 18:10:35 +0000 (20:10 +0200)]
Add ReflectionGenerator class
Bob Weinand [Thu, 14 May 2015 15:17:39 +0000 (17:17 +0200)]
Fix memleak in generators using symtable
Dmitry Stogov [Thu, 14 May 2015 14:07:32 +0000 (17:07 +0300)]
Fixed memory leak
Dmitry Stogov [Thu, 14 May 2015 13:47:22 +0000 (16:47 +0300)]
Fixed phpdbg build
Dmitry Stogov [Thu, 14 May 2015 11:56:13 +0000 (14:56 +0300)]
Refactored custom storage API.
olshevskiy87 [Wed, 13 May 2015 18:05:59 +0000 (22:05 +0400)]
fix typos
Signed-off-by: olshevskiy87 <olshevskiy87@bk.ru>
Dmitry Stogov [Wed, 13 May 2015 15:54:41 +0000 (18:54 +0300)]
Merged fastcgi.* reated changes from sapi/cgi
Dmitry Stogov [Wed, 13 May 2015 15:53:58 +0000 (18:53 +0300)]
Fixed build
Julien Pauli [Wed, 13 May 2015 13:43:03 +0000 (15:43 +0200)]
Updated NEWS
Antony Dovgal [Thu, 22 Jan 2015 14:56:41 +0000 (17:56 +0300)]
fix tests
Antony Dovgal [Fri, 19 Dec 2014 11:57:41 +0000 (14:57 +0300)]
merge similar if conditions
Antony Dovgal [Thu, 11 Dec 2014 14:01:55 +0000 (17:01 +0300)]
add rusage support to wait() and waitpid()
patch by Anton Stepanenko
Ferenc Kovacs [Wed, 13 May 2015 13:30:01 +0000 (15:30 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix release dates for 5.6.9/5.6.10. spotted by @Jan-E on github
Ferenc Kovacs [Wed, 13 May 2015 13:29:08 +0000 (15:29 +0200)]
fix release dates for 5.6.9/5.6.10. spotted by @Jan-E on github
Anatol Belski [Wed, 13 May 2015 13:19:48 +0000 (15:19 +0200)]
extend libxml exports
Anatol Belski [Wed, 13 May 2015 11:28:58 +0000 (13:28 +0200)]
fix libxml2 headers lookup
Julien Pauli [Wed, 13 May 2015 12:30:11 +0000 (14:30 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS
Updated NEWS
Julien Pauli [Wed, 13 May 2015 12:29:53 +0000 (14:29 +0200)]
Updated NEWS
Julien Pauli [Wed, 13 May 2015 12:29:29 +0000 (14:29 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Julien Pauli [Wed, 13 May 2015 12:29:02 +0000 (14:29 +0200)]
Updated NEWS
Julien Pauli [Wed, 13 May 2015 12:21:19 +0000 (14:21 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Close fd at the end, otherwise people complain
Add file descriptor caching to mcrypt_create_iv()
Conflicts:
ext/mcrypt/mcrypt.c
Julien Pauli [Wed, 13 May 2015 12:19:04 +0000 (14:19 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Close fd at the end, otherwise people complain
Add file descriptor caching to mcrypt_create_iv()
Leigh [Fri, 27 Mar 2015 19:14:33 +0000 (20:14 +0100)]
Close fd at the end, otherwise people complain
Even though it's closed when the process terminates!
Leigh [Fri, 27 Mar 2015 13:33:30 +0000 (14:33 +0100)]
Add file descriptor caching to mcrypt_create_iv()
This improves performance for applications that make repeated calls to
mcrypt_create_iv()
Julien Pauli [Wed, 13 May 2015 11:06:19 +0000 (13:06 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS
Julien Pauli [Wed, 13 May 2015 11:06:08 +0000 (13:06 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Julien Pauli [Wed, 13 May 2015 11:05:46 +0000 (13:05 +0200)]
Updated NEWS
Dmitry Stogov [Wed, 13 May 2015 09:55:42 +0000 (12:55 +0300)]
Merged FE_FETCH_R[W] with the following ASSIGN[_REF] when assigne to CV.
Anatol Belski [Wed, 13 May 2015 09:08:15 +0000 (11:08 +0200)]
ups, it should have used Zend MM
Dmitry Stogov [Wed, 13 May 2015 07:10:14 +0000 (10:10 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
fix build, catch up with linux part for #66048
Dmitry Stogov [Wed, 13 May 2015 07:09:06 +0000 (10:09 +0300)]
Removed deprecated conditions
Anatol Belski [Wed, 13 May 2015 07:05:58 +0000 (09:05 +0200)]
fix build, catch up with linux part for #66048
Dmitry Stogov [Wed, 13 May 2015 06:43:05 +0000 (09:43 +0300)]
Stanislav Malyshev [Tue, 12 May 2015 21:31:52 +0000 (14:31 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list
Conflicts:
Zend/zend_alloc.c
Zend/zend_operators.c
ext/ftp/ftp.c
ext/pcntl/pcntl.c
ext/standard/basic_functions.c
ext/standard/dir.c
ext/standard/file.c
ext/standard/pack.c
ext/standard/string.c
main/rfc1867.c
Stanislav Malyshev [Tue, 12 May 2015 21:26:06 +0000 (14:26 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list
Conflicts:
ext/standard/pack.c
Stanislav Malyshev [Tue, 12 May 2015 21:24:15 +0000 (14:24 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list
Conflicts:
ext/pcntl/pcntl.c
ext/standard/basic_functions.c
ext/standard/pack.c
ext/standard/tests/dir/opendir_variation1-win32.phpt
Stanislav Malyshev [Tue, 12 May 2015 19:37:28 +0000 (12:37 -0700)]
fix format
Stanislav Malyshev [Tue, 12 May 2015 19:17:54 +0000 (12:17 -0700)]
update NEWS
Julien Pauli [Tue, 12 May 2015 14:15:10 +0000 (16:15 +0200)]
fix #66048 for PHP7
* fix-66048:
Fix for #66048
Julien Pauli [Wed, 29 Apr 2015 12:35:35 +0000 (14:35 +0200)]
Fix for #66048
Julien Pauli [Tue, 12 May 2015 14:14:07 +0000 (16:14 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS
Fix for #66048
Julien Pauli [Tue, 12 May 2015 14:13:39 +0000 (16:13 +0200)]
Updated NEWS
Julien Pauli [Tue, 12 May 2015 14:12:51 +0000 (16:12 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix for #66048
Julien Pauli [Tue, 12 May 2015 14:12:29 +0000 (16:12 +0200)]
Fix for #66048
Nikita Popov [Tue, 12 May 2015 13:09:25 +0000 (15:09 +0200)]
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Nikita Popov [Tue, 12 May 2015 13:08:12 +0000 (15:08 +0200)]
Fix bug #69599
Dmitry Stogov [Tue, 12 May 2015 12:56:42 +0000 (15:56 +0300)]
Mark first call frames of stack segment with ZEND_CALL_ALLOCATED flag to simplify checks on stack deallocation.
Julien Pauli [Tue, 12 May 2015 12:34:14 +0000 (14:34 +0200)]
Updated NEWS
Christoph M. Becker [Fri, 1 May 2015 17:25:31 +0000 (19:25 +0200)]
return FALSE instead of NULL from ZipArchive::getStream when php_stream_zip_open() fails (fixes #67161)
Adil Ilhan [Wed, 1 Apr 2015 07:39:53 +0000 (10:39 +0300)]
HTTP 506 status code added.
HTTP 506 status code added in main http status codes file. Reference: RFC 2295
Matthias Breddin [Sat, 9 May 2015 11:42:15 +0000 (13:42 +0200)]
Update www.conf.in
Matthias Breddin [Fri, 1 May 2015 23:05:39 +0000 (01:05 +0200)]
Detailed information about the strftime access.log format
More descriptive usage of a custom timeformat
Julien Pauli [Tue, 12 May 2015 11:36:13 +0000 (13:36 +0200)]
Updated NEWS