]>
granicus.if.org Git - php/log
Anatol Belski [Fri, 8 Apr 2016 10:32:27 +0000 (12:32 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #68893 Stackoverflow in datefmt_create
Added missing newline.
Changed to check for error with the new function that returns null if error is set
Added function to check error and return null if error is set.
Added tests for bug 70451 and 70452
Anatol Belski [Fri, 8 Apr 2016 10:29:40 +0000 (12:29 +0200)]
Fixed bug #68893 Stackoverflow in datefmt_create
Daniel Persson [Mon, 7 Sep 2015 20:23:26 +0000 (22:23 +0200)]
Added missing newline.
Daniel Persson [Mon, 7 Sep 2015 20:15:52 +0000 (22:15 +0200)]
Changed to check for error with the new function that returns null if error is set
Daniel Persson [Mon, 7 Sep 2015 20:15:23 +0000 (22:15 +0200)]
Added function to check error and return null if error is set.
Daniel Persson [Mon, 7 Sep 2015 20:14:36 +0000 (22:14 +0200)]
Added tests for bug 70451 and 70452
Xinchen Hui [Fri, 8 Apr 2016 09:58:31 +0000 (17:58 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71986 (Nested foreach assign-by-reference creates broken variables)
Xinchen Hui [Fri, 8 Apr 2016 09:57:51 +0000 (17:57 +0800)]
Fixed bug #71986 (Nested foreach assign-by-reference creates broken variables)
Anatol Belski [Fri, 8 Apr 2016 09:03:09 +0000 (11:03 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Anatol Belski [Fri, 8 Apr 2016 09:01:42 +0000 (11:01 +0200)]
update NEWS
Anatol Belski [Fri, 8 Apr 2016 08:03:29 +0000 (10:03 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #70455 Missing constant: IntlChar::NO_NUMERIC_VALUE
Anatol Belski [Fri, 8 Apr 2016 07:55:57 +0000 (09:55 +0200)]
Fixed bug #70455 Missing constant: IntlChar::NO_NUMERIC_VALUE
Anatol Belski [Fri, 8 Apr 2016 07:29:22 +0000 (09:29 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Anatol Belski [Fri, 8 Apr 2016 07:28:41 +0000 (09:28 +0200)]
update NEWS
Anatol Belski [Fri, 8 Apr 2016 07:00:58 +0000 (09:00 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71516 IntlDateFormatter losts locale if pattern is set via constructor
Anatol Belski [Fri, 8 Apr 2016 06:59:06 +0000 (08:59 +0200)]
Fixed bug #71516 IntlDateFormatter losts locale if pattern is set via constructor
Nikita Popov [Thu, 7 Apr 2016 23:48:21 +0000 (01:48 +0200)]
Fix static method arg binding in traits
Nikita Popov [Tue, 29 Mar 2016 21:48:07 +0000 (23:48 +0200)]
Forbid binding methods to incompatible $this
This prohibits binding closures returned by
ReflectionMethod::getClosure() to a $this, which is not an
instance of the method scope. This restriction was already in
place for internal methods, now it is extended to user methods.
ML discussion: http://markmail.org/message/zepnhdyr3kij6di6
Dmitry Stogov [Thu, 7 Apr 2016 15:59:04 +0000 (18:59 +0300)]
Fixed handling of return statement without a value.
Dmitry Stogov [Thu, 7 Apr 2016 15:27:49 +0000 (18:27 +0300)]
Added missing "break"
Dmitry Stogov [Thu, 7 Apr 2016 14:34:53 +0000 (17:34 +0300)]
Use return type hints for type inference and eliminate useless VERIFY_RETRUN_TYPE opcodes.
Xinchen Hui [Thu, 7 Apr 2016 11:30:00 +0000 (19:30 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Improved fix for #71940
Xinchen Hui [Thu, 7 Apr 2016 11:29:49 +0000 (19:29 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
Fixed bug #71980
Xinchen Hui [Thu, 7 Apr 2016 11:28:54 +0000 (19:28 +0800)]
Improved fix for #71940
Nikita Popov [Thu, 7 Apr 2016 10:30:06 +0000 (12:30 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Thu, 7 Apr 2016 10:25:42 +0000 (12:25 +0200)]
Fixed bug #71980
Yasuo Ohgaki [Thu, 7 Apr 2016 08:13:05 +0000 (17:13 +0900)]
Remove debug code
Xinchen Hui [Thu, 7 Apr 2016 05:58:11 +0000 (13:58 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71940 (Unserialize crushes on restore object reference)
Xinchen Hui [Thu, 7 Apr 2016 05:58:00 +0000 (13:58 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
Remove __halt_compiler from semi-reserved tokens
Fixed Bug #71974 Trans sid will always be send, even if cookies are available
Optimized array_fill(). This is a perfect function for fast creation of packed arrays.
Fixed build
fix merge mistake
fix tests
PostgreSQL's PDOStatement::getColumnMeta() fills in table's name.
fix indent
Fixed bug #71978 (Existence of return type hint affects other compatibility rules)
fix test
fix bug #71667 (emulate how mssql extension names "computed" columns)
update NEWS
add 32-bit specific variont for #62498
skip test on 32-bit
make opcache lockfile path configurable
return zvals instead of strings, cast or not based on stringify attribute
fix test
add skip slow test
Xinchen Hui [Thu, 7 Apr 2016 05:56:55 +0000 (13:56 +0800)]
Fixed bug #71940 (Unserialize crushes on restore object reference)
Nikita Popov [Thu, 7 Apr 2016 03:52:51 +0000 (05:52 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Thu, 7 Apr 2016 03:51:49 +0000 (05:51 +0200)]
Remove __halt_compiler from semi-reserved tokens
token_get_all() is not capable of dealing with this one correctly.
Yasuo Ohgaki [Thu, 7 Apr 2016 01:26:32 +0000 (10:26 +0900)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed Bug #71974 Trans sid will always be send, even if cookies are available
Yasuo Ohgaki [Thu, 7 Apr 2016 01:25:35 +0000 (10:25 +0900)]
Fixed Bug #71974 Trans sid will always be send, even if cookies are available
Dmitry Stogov [Wed, 6 Apr 2016 22:02:01 +0000 (01:02 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Optimized array_fill(). This is a perfect function for fast creation of packed arrays.
Dmitry Stogov [Wed, 6 Apr 2016 22:01:11 +0000 (01:01 +0300)]
Optimized array_fill(). This is a perfect function for fast creation of packed arrays.
Dmitry Stogov [Wed, 6 Apr 2016 22:00:34 +0000 (01:00 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed build
Dmitry Stogov [Wed, 6 Apr 2016 21:59:21 +0000 (00:59 +0300)]
Fixed build
Kalle Sommer Nielsen [Wed, 6 Apr 2016 20:25:05 +0000 (22:25 +0200)]
Fix the build
Anatol Belski [Wed, 6 Apr 2016 16:06:40 +0000 (18:06 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix merge mistake
Anatol Belski [Wed, 6 Apr 2016 16:05:39 +0000 (18:05 +0200)]
fix merge mistake
Anatol Belski [Wed, 6 Apr 2016 15:45:31 +0000 (17:45 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix tests
PostgreSQL's PDOStatement::getColumnMeta() fills in table's name.
fix indent
Anatol Belski [Wed, 6 Apr 2016 15:42:23 +0000 (17:42 +0200)]
fix tests
Petr Sýkora [Tue, 2 Jul 2013 10:38:38 +0000 (12:38 +0200)]
PostgreSQL's PDOStatement::getColumnMeta() fills in table's name.
Anatol Belski [Wed, 6 Apr 2016 14:19:48 +0000 (16:19 +0200)]
fix indent
Dmitry Stogov [Wed, 6 Apr 2016 14:20:43 +0000 (17:20 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71978 (Existence of return type hint affects other compatibility rules)
Dmitry Stogov [Wed, 6 Apr 2016 14:17:10 +0000 (17:17 +0300)]
Fixed bug #71978 (Existence of return type hint affects other compatibility rules)
Anatol Belski [Wed, 6 Apr 2016 12:45:35 +0000 (14:45 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix test
fix bug #71667 (emulate how mssql extension names "computed" columns)
Anatol Belski [Wed, 6 Apr 2016 12:44:23 +0000 (14:44 +0200)]
fix test
Adam Baratz [Fri, 26 Feb 2016 17:01:59 +0000 (12:01 -0500)]
fix bug #71667 (emulate how mssql extension names "computed" columns)
Anatol Belski [Wed, 6 Apr 2016 12:14:30 +0000 (14:14 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Anatol Belski [Wed, 6 Apr 2016 12:13:43 +0000 (14:13 +0200)]
update NEWS
Anatol Belski [Wed, 6 Apr 2016 12:07:03 +0000 (14:07 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
add 32-bit specific variont for #62498
skip test on 32-bit
Anatol Belski [Wed, 6 Apr 2016 12:05:25 +0000 (14:05 +0200)]
add 32-bit specific variont for #62498
Anatol Belski [Wed, 6 Apr 2016 11:55:32 +0000 (13:55 +0200)]
skip test on 32-bit
The Postgres INT8 datatype is handled as string on 32-bit
Anatol Belski [Wed, 6 Apr 2016 11:50:24 +0000 (13:50 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
make opcache lockfile path configurable
Fatih ACAR [Fri, 4 Mar 2016 10:17:45 +0000 (11:17 +0100)]
make opcache lockfile path configurable
Signed-off-by: William Dauchy <william@gandi.net>
Signed-off-by: Baptiste Daroussin <baptiste.daroussin@gandi.net>
Signed-off-by: Fatih Acar <fatih.acar@gandi.net>
Anatol Belski [Wed, 6 Apr 2016 10:23:14 +0000 (12:23 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
return zvals instead of strings, cast or not based on stringify attribute
Adam Baratz [Wed, 6 Apr 2016 10:18:53 +0000 (12:18 +0200)]
return zvals instead of strings, cast or not based on stringify attribute
Anatol Belski [Wed, 6 Apr 2016 06:24:09 +0000 (08:24 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix test
add skip slow test
Anatol Belski [Wed, 6 Apr 2016 06:21:10 +0000 (08:21 +0200)]
fix test
Anatol Belski [Wed, 6 Apr 2016 06:18:32 +0000 (08:18 +0200)]
add skip slow test
Xinchen Hui [Wed, 6 Apr 2016 02:21:21 +0000 (10:21 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed order
Fixed bug #71969 (str_replace returns an incorrect resulting array after a foreach by reference)
update NEWS
Add driver-specific attributes for controlling calls to dbsetlogintime() and dbsettime()
Xinchen Hui [Wed, 6 Apr 2016 02:21:05 +0000 (10:21 +0800)]
Fixed order
Xinchen Hui [Wed, 6 Apr 2016 02:19:24 +0000 (10:19 +0800)]
Fixed bug #71969 (str_replace returns an incorrect resulting array after a foreach by reference)
Dmitry Stogov [Tue, 5 Apr 2016 17:09:14 +0000 (20:09 +0300)]
IS_CONST operands don't have to be separated. Use reference-counting instead of duplication.
- with opcache all IS_CONST operands are not refcounted (scalars, interned strings or immutable arrays)
- without opcache IS_CONST operands are not shared between processes or threads and may use common reference counters
Adam Baratz [Tue, 5 Apr 2016 16:14:03 +0000 (18:14 +0200)]
Add driver-specific attributes for controlling calls to dbsetlogintime() and dbsettime()
Anatol Belski [Tue, 5 Apr 2016 16:21:25 +0000 (18:21 +0200)]
update NEWS
Adam Baratz [Tue, 5 Apr 2016 16:14:03 +0000 (18:14 +0200)]
Add driver-specific attributes for controlling calls to dbsetlogintime() and dbsettime()
Dmitry Stogov [Tue, 5 Apr 2016 13:45:15 +0000 (16:45 +0300)]
RETURN micro optimization
Anatol Belski [Tue, 5 Apr 2016 13:13:17 +0000 (15:13 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
fix and extend test
Don't roundtrip to the database to get the column type if you already know it
Anatol Belski [Tue, 5 Apr 2016 13:12:12 +0000 (15:12 +0200)]
update NEWS
Anatol Belski [Tue, 5 Apr 2016 13:06:17 +0000 (15:06 +0200)]
fix and extend test
Joe Bylund [Tue, 22 Sep 2015 17:11:20 +0000 (13:11 -0400)]
Don't roundtrip to the database to get the column type if you already know it
add_assoc_string now takes just three args
nikic's fix to move pqclear outside the if, would be a possible memory leak inside the if
(joe) check behavior of getColumnMeta
Anatol Belski [Tue, 5 Apr 2016 10:16:02 +0000 (12:16 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
remove description for apache 1.3
DQNEO [Tue, 16 Feb 2016 09:58:03 +0000 (18:58 +0900)]
remove description for apache 1.3
Anatol Belski [Tue, 5 Apr 2016 09:56:20 +0000 (11:56 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
update NEWS
Anatol Belski [Tue, 5 Apr 2016 09:55:36 +0000 (11:55 +0200)]
update NEWS
Anatol Belski [Tue, 5 Apr 2016 09:55:03 +0000 (11:55 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Anatol Belski [Tue, 5 Apr 2016 09:52:53 +0000 (11:52 +0200)]
update NEWS
Anatol Belski [Tue, 5 Apr 2016 09:24:45 +0000 (11:24 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Use STR_EMPTY_ALLOC macro instead
Fix DateInterval::format segfault
Anatol Belski [Tue, 5 Apr 2016 09:24:23 +0000 (11:24 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Use STR_EMPTY_ALLOC macro instead
Fix DateInterval::format segfault
Thomas Punt [Thu, 24 Mar 2016 11:09:59 +0000 (11:09 +0000)]
Use STR_EMPTY_ALLOC macro instead
Thomas Punt [Wed, 23 Mar 2016 23:57:50 +0000 (23:57 +0000)]
Fix DateInterval::format segfault
Matteo Beccati [Mon, 4 Apr 2016 22:07:28 +0000 (00:07 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71447 (Quotes inside comments not properly handled)
Fixed a few PDO tests to conform to PDO Common standards
news entry #69537
Fix #69537: __debugInfo with empty string for key gives error
Matteo Beccati [Mon, 4 Apr 2016 22:07:02 +0000 (00:07 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #71447 (Quotes inside comments not properly handled)
Fixed a few PDO tests to conform to PDO Common standards
news entry #69537
Fix #69537: __debugInfo with empty string for key gives error
Conflicts:
Zend/zend_compile.c
Matteo Beccati [Mon, 4 Apr 2016 21:45:10 +0000 (23:45 +0200)]
Fixed bug #71447 (Quotes inside comments not properly handled)
Matteo Beccati [Mon, 4 Apr 2016 21:42:52 +0000 (23:42 +0200)]
Fixed a few PDO tests to conform to PDO Common standards
Dmitry Stogov [Mon, 4 Apr 2016 21:01:00 +0000 (00:01 +0300)]
Initialize op_array->run_time_cache on slow path of INIT_FCALL opcode and omit corresponding check on fast path of DO_FCALL.
Anatol Belski [Mon, 4 Apr 2016 15:42:52 +0000 (17:42 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Anatol Belski [Mon, 4 Apr 2016 15:42:06 +0000 (17:42 +0200)]
update NEWS
Anatol Belski [Mon, 4 Apr 2016 15:38:04 +0000 (17:38 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fix #71943: dblib_handle_quoter needs to allocate an extra byte
Adam Baratz [Fri, 1 Apr 2016 15:23:35 +0000 (11:23 -0400)]
Fix #71943: dblib_handle_quoter needs to allocate an extra byte
Joe Watkins [Mon, 4 Apr 2016 09:30:35 +0000 (10:30 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
news entry #71428
Joe Watkins [Mon, 4 Apr 2016 09:30:23 +0000 (10:30 +0100)]
news entry #71428
Joe Watkins [Mon, 4 Apr 2016 09:23:50 +0000 (10:23 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
news entry #69537
Joe Watkins [Mon, 4 Apr 2016 09:23:19 +0000 (10:23 +0100)]
news entry #69537
Joe Watkins [Mon, 4 Apr 2016 09:22:13 +0000 (10:22 +0100)]
news entry #69537
Joe Watkins [Mon, 4 Apr 2016 09:20:41 +0000 (10:20 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
news entry 71609
Joe Watkins [Mon, 4 Apr 2016 09:20:26 +0000 (10:20 +0100)]
news entry 71609