]> granicus.if.org Git - php/log
php
9 years ago[Math] ceil, floor added FAST_ZPP parameters pass
Dmitry Patsura [Tue, 19 May 2015 13:19:13 +0000 (21:19 +0800)]
[Math] ceil, floor added FAST_ZPP parameters pass

9 years agoImproved hash table copying
Dmitry Stogov [Tue, 19 May 2015 10:23:13 +0000 (13:23 +0300)]
Improved hash table copying

9 years agoImproved hash table copying
Dmitry Stogov [Tue, 19 May 2015 10:22:58 +0000 (13:22 +0300)]
Improved hash table copying

9 years agoThis shouldn't have been a part of the previous commit
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

9 years agoMerge branch 'master' of https://git.php.net/push/php-src
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

9 years ago* Make ext/dba compile with newer versions of Oracle's Berkeley (in my case 6.1)
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+

9 years agoAdd consistency check in FAST_ZPP call
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.

9 years agoEliminated useless check in FAST_ZPP (this also fixed few wrong -Wmaybe-uninitialized...
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)

9 years agofix test title
Anatol Belski [Mon, 18 May 2015 20:36:55 +0000 (22:36 +0200)]
fix test title

9 years agofork test for ICU >= 55.1 compat
Anatol Belski [Mon, 18 May 2015 20:33:59 +0000 (22:33 +0200)]
fork test for ICU >= 55.1 compat

9 years agosync test with exception currently thrown
Anatol Belski [Mon, 18 May 2015 20:29:01 +0000 (22:29 +0200)]
sync test with exception currently thrown

9 years agofork test for ICU >= 55.1 compat
Anatol Belski [Mon, 18 May 2015 20:23:35 +0000 (22:23 +0200)]
fork test for ICU >= 55.1 compat

9 years agofork 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

9 years agoskip test for ICU >= 55.1, a newer test is available and passes
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

9 years agofork test for ICU >= 55.1 compat
Anatol Belski [Mon, 18 May 2015 19:49:27 +0000 (21:49 +0200)]
fork test for ICU >= 55.1 compat

9 years agofork 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

9 years agofix mbrlen prototype availability
Anatol Belski [Mon, 18 May 2015 16:29:59 +0000 (18:29 +0200)]
fix mbrlen prototype availability

9 years agoReset heap usage statistics on request shutdown
Dmitry Stogov [Mon, 18 May 2015 20:06:23 +0000 (23:06 +0300)]
Reset heap usage statistics on request shutdown

9 years agoFixed bug #69649 (segfault with --enable-dtrace)
Dmitry Stogov [Mon, 18 May 2015 09:44:40 +0000 (12:44 +0300)]
Fixed bug #69649 (segfault with --enable-dtrace)

9 years agoAvoid possible uninitialized value assignment
Reeze Xia [Mon, 18 May 2015 04:49:42 +0000 (12:49 +0800)]
Avoid possible uninitialized value assignment

9 years agoAdded Test (the lineno should be fixed)
Xinchen Hui [Mon, 18 May 2015 03:14:03 +0000 (11:14 +0800)]
Added Test (the lineno should be fixed)

9 years ago1. Fixed bug #69640 Unhandled EngineExceptions thrown from userland do not produce...
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

9 years agoPrefer isfinite to finite
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

9 years agoDisplay TypeExceptions like normal exceptions
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.

9 years agoTweak uncaught exception message display
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.

9 years agoDon't write prop if read prop threw exception
Nikita Popov [Sun, 17 May 2015 11:46:54 +0000 (13:46 +0200)]
Don't write prop if read prop threw exception

9 years agoMerge branch 'pull-request/1277'
Stanislav Malyshev [Sat, 16 May 2015 21:20:41 +0000 (14:20 -0700)]
Merge branch 'pull-request/1277'

* pull-request/1277:
  fix typos

9 years agoDisplay EngineExceptions like ordinary exceptions
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.

9 years agoMerge branch 'master' of https://github.com/php/php-src
Bob Weinand [Fri, 15 May 2015 20:45:35 +0000 (22:45 +0200)]
Merge branch 'master' of https://github.com/php/php-src

9 years agoFix exception leak in interactive console
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.

9 years agoFixed segfault
Xinchen Hui [Fri, 15 May 2015 16:33:49 +0000 (00:33 +0800)]
Fixed segfault

9 years agocode standard
Xinchen Hui [Fri, 15 May 2015 16:19:43 +0000 (00:19 +0800)]
code standard

9 years agoMerge branch 'master' of git.php.net:php-src
Xinchen Hui [Fri, 15 May 2015 14:57:36 +0000 (22:57 +0800)]
Merge branch 'master' of git.php.net:php-src

9 years agoHint the compiler
Xinchen Hui [Fri, 15 May 2015 14:57:17 +0000 (22:57 +0800)]
Hint the compiler

9 years agoFix unrelated tests and zlib window size
Bob Weinand [Fri, 15 May 2015 11:59:47 +0000 (13:59 +0200)]
Fix unrelated tests and zlib window size

9 years agoremove version check
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

9 years agoUpdated test to include ReflectionGenerator
Matteo Beccati [Fri, 15 May 2015 04:52:04 +0000 (06:52 +0200)]
Updated test to include ReflectionGenerator

9 years agoImprove strtr()
Dmitry Stogov [Fri, 15 May 2015 01:03:30 +0000 (04:03 +0300)]
Improve strtr()

9 years agoMinor typo in warning message
Bob Weinand [Fri, 15 May 2015 00:42:11 +0000 (02:42 +0200)]
Minor typo in warning message

9 years agoAdd strategy option to deflate_init()
Bob Weinand [Fri, 15 May 2015 00:28:22 +0000 (02:28 +0200)]
Add strategy option to deflate_init()

9 years agoAdd dictionary option to {in,de}flate_init()
Bob Weinand [Fri, 15 May 2015 00:18:53 +0000 (02:18 +0200)]
Add dictionary option to {in,de}flate_init()

9 years agoAdd window option to {de,in}flate_init()
Bob Weinand [Thu, 14 May 2015 20:58:13 +0000 (22:58 +0200)]
Add window option to {de,in}flate_init()

9 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Thu, 14 May 2015 23:09:45 +0000 (01:09 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix NEWS

9 years agofix NEWS
Ferenc Kovacs [Thu, 14 May 2015 23:00:53 +0000 (01:00 +0200)]
fix NEWS

9 years agoadded the inclusion guard
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

9 years agoOptimized === and !== with NULL, FALSE, TRUE.
Dmitry Stogov [Thu, 14 May 2015 22:11:29 +0000 (01:11 +0300)]
Optimized === and !== with NULL, FALSE, TRUE.

9 years agoAdd NEWS/UPGRADING for ReflectionGenerator class
Bob Weinand [Thu, 14 May 2015 20:30:01 +0000 (22:30 +0200)]
Add NEWS/UPGRADING for ReflectionGenerator class

9 years agoAdd ReflectionGenerator class
Bob Weinand [Thu, 14 May 2015 18:10:35 +0000 (20:10 +0200)]
Add ReflectionGenerator class

9 years agoFix memleak in generators using symtable
Bob Weinand [Thu, 14 May 2015 15:17:39 +0000 (17:17 +0200)]
Fix memleak in generators using symtable

9 years agoFixed memory leak
Dmitry Stogov [Thu, 14 May 2015 14:07:32 +0000 (17:07 +0300)]
Fixed memory leak

9 years agoFixed phpdbg build
Dmitry Stogov [Thu, 14 May 2015 13:47:22 +0000 (16:47 +0300)]
Fixed phpdbg build

9 years agoRefactored custom storage API.
Dmitry Stogov [Thu, 14 May 2015 11:56:13 +0000 (14:56 +0300)]
Refactored custom storage API.

9 years agofix typos
olshevskiy87 [Wed, 13 May 2015 18:05:59 +0000 (22:05 +0400)]
fix typos

Signed-off-by: olshevskiy87 <olshevskiy87@bk.ru>
9 years agoMerged fastcgi.* reated changes from sapi/cgi
Dmitry Stogov [Wed, 13 May 2015 15:54:41 +0000 (18:54 +0300)]
Merged fastcgi.* reated changes from sapi/cgi

9 years agoFixed build
Dmitry Stogov [Wed, 13 May 2015 15:53:58 +0000 (18:53 +0300)]
Fixed build

9 years agoUpdated NEWS
Julien Pauli [Wed, 13 May 2015 13:43:03 +0000 (15:43 +0200)]
Updated NEWS

9 years agofix tests
Antony Dovgal [Thu, 22 Jan 2015 14:56:41 +0000 (17:56 +0300)]
fix tests

9 years agomerge similar if conditions
Antony Dovgal [Fri, 19 Dec 2014 11:57:41 +0000 (14:57 +0300)]
merge similar if conditions

9 years agoadd rusage support to wait() and waitpid()
Antony Dovgal [Thu, 11 Dec 2014 14:01:55 +0000 (17:01 +0300)]
add rusage support to wait() and waitpid()

patch by Anton Stepanenko

9 years agoMerge branch 'PHP-5.6'
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

9 years agofix 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

9 years agoextend libxml exports
Anatol Belski [Wed, 13 May 2015 13:19:48 +0000 (15:19 +0200)]
extend libxml exports

9 years agofix libxml2 headers lookup
Anatol Belski [Wed, 13 May 2015 11:28:58 +0000 (13:28 +0200)]
fix libxml2 headers lookup

9 years agoMerge branch 'PHP-5.6'
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

9 years agoUpdated NEWS
Julien Pauli [Wed, 13 May 2015 12:29:53 +0000 (14:29 +0200)]
Updated NEWS

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

9 years agoUpdated NEWS
Julien Pauli [Wed, 13 May 2015 12:29:02 +0000 (14:29 +0200)]
Updated NEWS

9 years agoMerge branch 'PHP-5.6'
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

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
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()

9 years agoClose fd at the end, otherwise people complain
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!

9 years agoAdd file descriptor caching to mcrypt_create_iv()
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()

9 years agoMerge branch 'PHP-5.6'
Julien Pauli [Wed, 13 May 2015 11:06:19 +0000 (13:06 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated NEWS

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

9 years agoUpdated NEWS
Julien Pauli [Wed, 13 May 2015 11:05:46 +0000 (13:05 +0200)]
Updated NEWS

9 years agoMerged FE_FETCH_R[W] with the following ASSIGN[_REF] when assigne to CV.
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.

9 years agoups, it should have used Zend MM
Anatol Belski [Wed, 13 May 2015 09:08:15 +0000 (11:08 +0200)]
ups, it should have used Zend MM

9 years agoMerge branch 'master' of git.php.net:php-src
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

9 years agoRemoved deprecated conditions
Dmitry Stogov [Wed, 13 May 2015 07:09:06 +0000 (10:09 +0300)]
Removed deprecated conditions

9 years agofix build, catch up with linux part for #66048
Anatol Belski [Wed, 13 May 2015 07:05:58 +0000 (09:05 +0200)]
fix build, catch up with linux part for #66048

9 years agoPartial revert of 6a819bba40661a9a8d7080994cb2f24b73c5d46c.
Dmitry Stogov [Wed, 13 May 2015 06:43:05 +0000 (09:43 +0300)]
Partial revert of 6a819bba40661a9a8d7080994cb2f24b73c5d46c.

9 years agoMerge branch 'PHP-5.6'
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

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

9 years agofix format
Stanislav Malyshev [Tue, 12 May 2015 19:37:28 +0000 (12:37 -0700)]
fix format

9 years agoupdate NEWS
Stanislav Malyshev [Tue, 12 May 2015 19:17:54 +0000 (12:17 -0700)]
update NEWS

9 years agofix #66048 for PHP7
Julien Pauli [Tue, 12 May 2015 14:15:10 +0000 (16:15 +0200)]
fix #66048 for PHP7

* fix-66048:
  Fix for #66048

9 years agoFix for #66048
Julien Pauli [Wed, 29 Apr 2015 12:35:35 +0000 (14:35 +0200)]
Fix for #66048

9 years agoMerge branch 'PHP-5.6'
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

9 years agoUpdated NEWS
Julien Pauli [Tue, 12 May 2015 14:13:39 +0000 (16:13 +0200)]
Updated NEWS

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

9 years agoFix for #66048
Julien Pauli [Tue, 12 May 2015 14:12:29 +0000 (16:12 +0200)]
Fix for #66048

9 years agoMerge branch 'PHP-5.6'
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

9 years agoFix bug #69599
Nikita Popov [Tue, 12 May 2015 13:08:12 +0000 (15:08 +0200)]
Fix bug #69599

9 years agoMark first call frames of stack segment with ZEND_CALL_ALLOCATED flag to simplify...
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.

9 years agoUpdated NEWS
Julien Pauli [Tue, 12 May 2015 12:34:14 +0000 (14:34 +0200)]
Updated NEWS

9 years agoreturn FALSE instead of NULL from ZipArchive::getStream when php_stream_zip_open...
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)

9 years agoHTTP 506 status code added.
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

9 years agoUpdate www.conf.in
Matthias Breddin [Sat, 9 May 2015 11:42:15 +0000 (13:42 +0200)]
Update www.conf.in

9 years agoDetailed information about the strftime access.log format
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

9 years agoUpdated NEWS
Julien Pauli [Tue, 12 May 2015 11:36:13 +0000 (13:36 +0200)]
Updated NEWS