]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 16:25:38 +0000 (18:25 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  extend help message

8 years agoextend help message
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 16:25:00 +0000 (18:25 +0200)]
extend help message

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 16:08:31 +0000 (18:08 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix leak

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 16:08:17 +0000 (18:08 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix leak

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 16:05:47 +0000 (18:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix leak

8 years agofix leak
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 16:01:21 +0000 (18:01 +0200)]
fix leak

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 15:47:21 +0000 (17:47 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix search path
  support also cppcheck for static analyze

8 years agofix search path
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 15:43:36 +0000 (17:43 +0200)]
fix search path

8 years agosupport also cppcheck for static analyze
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 15:29:28 +0000 (17:29 +0200)]
support also cppcheck for static analyze

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 15:26:41 +0000 (17:26 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  add error check and fix leak
  fix leak

8 years agoadd error check and fix leak
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 15:25:46 +0000 (17:25 +0200)]
add error check and fix leak

8 years agofix leak
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 15:25:13 +0000 (17:25 +0200)]
fix leak

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Jakub Zelenka [Mon, 29 Aug 2016 14:19:10 +0000 (15:19 +0100)]
Merge branch 'PHP-7.1'

8 years agoBump PHP_JSON_VERSION to 1.5.0
commit | commitdiff | tree
Jakub Zelenka [Mon, 29 Aug 2016 14:18:00 +0000 (15:18 +0100)]
Bump PHP_JSON_VERSION to 1.5.0

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Jakub Zelenka [Mon, 29 Aug 2016 14:03:14 +0000 (15:03 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'json_encode_fail_return' into PHP-7.1
commit | commitdiff | tree
Jakub Zelenka [Mon, 29 Aug 2016 14:01:00 +0000 (15:01 +0100)]
Merge branch 'json_encode_fail_return' into PHP-7.1

8 years agoUpdate NEWS with info about a json_encode fail return
commit | commitdiff | tree
Jakub Zelenka [Mon, 29 Aug 2016 13:59:44 +0000 (14:59 +0100)]
Update NEWS with info about a json_encode fail return

8 years agoAdd test for fixed bug #68992
commit | commitdiff | tree
Jakub Zelenka [Sun, 28 Aug 2016 12:00:49 +0000 (13:00 +0100)]
Add test for fixed bug #68992

8 years agoFix recursion and protection in the failed JSON encoding
commit | commitdiff | tree
Jakub Zelenka [Sun, 28 Aug 2016 11:53:11 +0000 (12:53 +0100)]
Fix recursion and protection in the failed JSON encoding

8 years agoAdd initial failure checking for json_encode
commit | commitdiff | tree
Jakub Zelenka [Wed, 24 Aug 2016 19:46:33 +0000 (20:46 +0100)]
Add initial failure checking for json_encode

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 13:44:59 +0000 (15:44 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix leak

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 13:44:13 +0000 (15:44 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix leak

8 years agofix leak
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 13:43:10 +0000 (15:43 +0200)]
fix leak

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 13:30:49 +0000 (15:30 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix possible memory leak

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 13:29:52 +0000 (15:29 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix possible memory leak

8 years agofix possible memory leak
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 13:28:09 +0000 (15:28 +0200)]
fix possible memory leak

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 11:49:20 +0000 (13:49 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix dealloc mismatch

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 11:43:08 +0000 (13:43 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix dealloc mismatch

8 years agofix dealloc mismatch
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 00:45:37 +0000 (02:45 +0200)]
fix dealloc mismatch

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Dmitry Stogov [Mon, 29 Aug 2016 09:15:37 +0000 (12:15 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #72944 (Null pointer deref in zval_delref_p).

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Dmitry Stogov [Mon, 29 Aug 2016 09:07:54 +0000 (12:07 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #72944 (Null pointer deref in zval_delref_p).

8 years agoFixed bug #72944 (Null pointer deref in zval_delref_p).
commit | commitdiff | tree
Dmitry Stogov [Mon, 29 Aug 2016 09:02:50 +0000 (12:02 +0300)]
Fixed bug #72944 (Null pointer deref in zval_delref_p).

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
George Wang [Mon, 29 Aug 2016 02:32:42 +0000 (22:32 -0400)]
Merge branch 'PHP-7.1'

8 years agocode cleanup.
commit | commitdiff | tree
George Wang [Mon, 29 Aug 2016 02:31:08 +0000 (22:31 -0400)]
code cleanup.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
George Wang [Mon, 29 Aug 2016 02:29:38 +0000 (22:29 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
George Wang [Mon, 29 Aug 2016 02:23:28 +0000 (22:23 -0400)]
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
sapi/litespeed/lsapi_main.c

8 years agoAdded .user.ini support.
commit | commitdiff | tree
George Wang [Mon, 29 Aug 2016 01:49:30 +0000 (21:49 -0400)]
Added .user.ini support.
Added LSPHPRC support.
update LiteSpeed SAPI version to 6.10 .

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Yasuo Ohgaki [Sun, 28 Aug 2016 20:58:33 +0000 (05:58 +0900)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc

8 years agoImplement RFC Add session_gc() https://wiki.php.net/rfc/session-gc
commit | commitdiff | tree
Yasuo Ohgaki [Sun, 28 Aug 2016 20:57:37 +0000 (05:57 +0900)]
Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Sun, 28 Aug 2016 19:20:31 +0000 (21:20 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  extend help msg
  fix leak
  extend clang vs compat options
  fix leak
  integrate clang analyzer

8 years agoextend help msg
commit | commitdiff | tree
Anatol Belski [Sun, 28 Aug 2016 18:18:11 +0000 (20:18 +0200)]
extend help msg

8 years agofix leak
commit | commitdiff | tree
Anatol Belski [Sun, 28 Aug 2016 17:11:03 +0000 (19:11 +0200)]
fix leak

8 years agoextend clang vs compat options
commit | commitdiff | tree
Anatol Belski [Sun, 28 Aug 2016 16:26:48 +0000 (18:26 +0200)]
extend clang vs compat options

8 years agofix leak
commit | commitdiff | tree
Anatol Belski [Sun, 28 Aug 2016 16:08:06 +0000 (18:08 +0200)]
fix leak

8 years agointegrate clang analyzer
commit | commitdiff | tree
Anatol Belski [Sun, 28 Aug 2016 16:06:27 +0000 (18:06 +0200)]
integrate clang analyzer

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Xinchen Hui [Sun, 28 Aug 2016 16:11:09 +0000 (00:11 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #72936 (Zend API's zend_symtable_str_update() asserts key should end with '\0')

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Xinchen Hui [Sun, 28 Aug 2016 16:10:57 +0000 (00:10 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #72936 (Zend API's zend_symtable_str_update() asserts key should end with '\0')

8 years agoFixed bug #72936 (Zend API's zend_symtable_str_update() asserts key should end with...
commit | commitdiff | tree
Xinchen Hui [Sun, 28 Aug 2016 16:10:31 +0000 (00:10 +0800)]
Fixed bug #72936 (Zend API's zend_symtable_str_update() asserts key should end with '\0')

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Sat, 27 Aug 2016 20:30:06 +0000 (22:30 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix leak
  add parentheses
  fix clang compat
  fix leak

8 years agofix leak
commit | commitdiff | tree
Anatol Belski [Sat, 27 Aug 2016 20:28:13 +0000 (22:28 +0200)]
fix leak

8 years agoadd parentheses
commit | commitdiff | tree
Anatol Belski [Sat, 27 Aug 2016 20:26:18 +0000 (22:26 +0200)]
add parentheses

8 years agofix clang compat
commit | commitdiff | tree
Anatol Belski [Sat, 27 Aug 2016 20:25:02 +0000 (22:25 +0200)]
fix clang compat

8 years agofix leak
commit | commitdiff | tree
Anatol Belski [Sat, 27 Aug 2016 20:24:24 +0000 (22:24 +0200)]
fix leak

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Christoph M. Becker [Fri, 26 Aug 2016 23:32:23 +0000 (01:32 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Christoph M. Becker [Fri, 26 Aug 2016 23:19:23 +0000 (01:19 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Christoph M. Becker [Fri, 26 Aug 2016 23:13:32 +0000 (01:13 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #65550: get_browser() incorrectly parsers entries with "+" sign
commit | commitdiff | tree
Christoph M. Becker [Fri, 26 Aug 2016 23:02:58 +0000 (01:02 +0200)]
Fix #65550: get_browser() incorrectly parsers entries with "+" sign

+ signs in the browscap patterns are meant to be literal characters, so we
have to escape them for the regex matching.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Fri, 26 Aug 2016 20:05:50 +0000 (22:05 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix leak

8 years agofix leak
commit | commitdiff | tree
Anatol Belski [Fri, 26 Aug 2016 20:05:06 +0000 (22:05 +0200)]
fix leak

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Christoph M. Becker [Fri, 26 Aug 2016 16:52:37 +0000 (18:52 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Christoph M. Becker [Fri, 26 Aug 2016 16:51:33 +0000 (18:51 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix #72949: Typo in opcache error message
commit | commitdiff | tree
Christoph M. Becker [Fri, 26 Aug 2016 16:50:30 +0000 (18:50 +0200)]
Fix #72949: Typo in opcache error message

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Xinchen Hui [Fri, 26 Aug 2016 10:33:10 +0000 (18:33 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #72943 (assign_dim on string doesn't reset hval)

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Xinchen Hui [Fri, 26 Aug 2016 10:32:54 +0000 (18:32 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #72943 (assign_dim on string doesn't reset hval)

Conflicts:
Zend/zend_execute.c

8 years agoFixed bug #72943 (assign_dim on string doesn't reset hval)
commit | commitdiff | tree
Xinchen Hui [Fri, 26 Aug 2016 10:30:08 +0000 (18:30 +0800)]
Fixed bug #72943 (assign_dim on string doesn't reset hval)

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Thu, 25 Aug 2016 17:46:16 +0000 (19:46 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  update NEWS
  update NEWS
  pdo_dblib: stringify uniqidentifier field

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Thu, 25 Aug 2016 17:46:01 +0000 (19:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update NEWS
  pdo_dblib: stringify uniqidentifier field

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Thu, 25 Aug 2016 17:44:55 +0000 (19:44 +0200)]
update NEWS

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Thu, 25 Aug 2016 17:43:39 +0000 (19:43 +0200)]
update NEWS

8 years agopdo_dblib: stringify uniqidentifier field
commit | commitdiff | tree
Alexander Zhuravlev [Mon, 4 Jul 2016 09:47:18 +0000 (12:47 +0300)]
pdo_dblib: stringify uniqidentifier field

Keep old 5.6 behavior: return Uniqidentifier value as 36-byte hex string (not binary),
when PDO::ATTR_STRINGIFY_FETCHES is TRUE

pdo_dblib: Stringify uniqidentifier field

Keep old 5.6 behavior: return Uniqidentifier value as 36-byte hex string (not binary),
when PDO::ATTR_STRINGIFY_FETCHES is TRUE

Tests added.

pdo_dblib: Stringify uniqidentifier field

Keep old 5.6 behavior: return Uniqidentifier value as 36-byte hex string (not binary),
when PDO::ATTR_STRINGIFY_FETCHES is TRUE

Tests fix.

pdo_dblib: Stringify uniqueidentifier field Added separate PDO::DBLIB_ATTR_STRINGIFY_UNIQUEIDENTIFIER attribute instead of PDO::ATTR_STRINGIFY_FETCHES.

pdo_dblib: Stringify uniqueidentifier field Added `getAttribute` support for PDO::DBLIB_ATTR_STRINGIFY_UNIQUEIDENTIFIER.

Simplify storage of stringify_uniqueidentifier attribute

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Christoph M. Becker [Thu, 25 Aug 2016 16:48:05 +0000 (18:48 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Christoph M. Becker [Thu, 25 Aug 2016 16:30:58 +0000 (18:30 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Christoph M. Becker [Thu, 25 Aug 2016 16:19:43 +0000 (18:19 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #70825: Cannot fetch multiple values with group in ini file
commit | commitdiff | tree
Christoph M. Becker [Thu, 25 Aug 2016 16:10:38 +0000 (18:10 +0200)]
Fix #70825: Cannot fetch multiple values with group in ini file

If we have the position already from the last fetch, we also have to preset
the current group, because it won't be read again.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Thu, 25 Aug 2016 16:10:18 +0000 (18:10 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix check for args by ref

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Thu, 25 Aug 2016 16:09:37 +0000 (18:09 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix check for args by ref

8 years agofix check for args by ref
commit | commitdiff | tree
Anatol Belski [Thu, 25 Aug 2016 16:06:47 +0000 (18:06 +0200)]
fix check for args by ref

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Christoph M. Becker [Thu, 25 Aug 2016 14:55:46 +0000 (16:55 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Christoph M. Becker [Thu, 25 Aug 2016 14:31:03 +0000 (16:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Christoph M. Becker [Thu, 25 Aug 2016 14:22:57 +0000 (16:22 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #71514: Bad dba_replace condition because of wrong API usage
commit | commitdiff | tree
Christoph M. Becker [Thu, 25 Aug 2016 14:20:30 +0000 (16:20 +0200)]
Fix #71514: Bad dba_replace condition because of wrong API usage

We're backporting commit 9e309a2d to PHP-5.6, because it is a bugfix.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Thu, 25 Aug 2016 10:54:05 +0000 (12:54 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  backport relevant part from bug #72858 patch in 7.0

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Thu, 25 Aug 2016 10:53:37 +0000 (12:53 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  backport relevant part from bug #72858 patch in 7.0

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Anatol Belski [Thu, 25 Aug 2016 10:52:29 +0000 (12:52 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  backport relevant part from bug #72858 patch in 7.0

8 years agobackport relevant part from bug #72858 patch in 7.0
commit | commitdiff | tree
Anatol Belski [Thu, 25 Aug 2016 10:46:28 +0000 (12:46 +0200)]
backport relevant part from bug #72858 patch in 7.0

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Thu, 25 Aug 2016 10:14:54 +0000 (12:14 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  update NEWS
  Fixed bug #72922 COM called from PHP does not return out parameters

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Thu, 25 Aug 2016 10:14:33 +0000 (12:14 +0200)]
update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Thu, 25 Aug 2016 10:13:55 +0000 (12:13 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #72922 COM called from PHP does not return out parameters

8 years agoFixed bug #72922 COM called from PHP does not return out parameters
commit | commitdiff | tree
Anatol Belski [Thu, 25 Aug 2016 10:12:45 +0000 (12:12 +0200)]
Fixed bug #72922 COM called from PHP does not return out parameters

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Xinchen Hui [Thu, 25 Aug 2016 05:29:55 +0000 (13:29 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Remove redundant \t

8 years agoRemove redundant \t
commit | commitdiff | tree
Xinchen Hui [Thu, 25 Aug 2016 05:29:22 +0000 (13:29 +0800)]
Remove redundant \t

8 years agoMerge branch 'pull-request/2094'
commit | commitdiff | tree
Christoph M. Becker [Wed, 24 Aug 2016 23:44:38 +0000 (01:44 +0200)]
Merge branch 'pull-request/2094'

8 years agoFix message typos in PDO tests
commit | commitdiff | tree
Adam Baratz [Wed, 24 Aug 2016 22:39:37 +0000 (18:39 -0400)]
Fix message typos in PDO tests

8 years agoRemove accidental NEWS and UPGRADING entries
commit | commitdiff | tree
Aaron Piotrowski [Tue, 23 Aug 2016 16:49:57 +0000 (11:49 -0500)]
Remove accidental NEWS and UPGRADING entries

Merge mistake from PHP-7.1.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Bob Weinand [Tue, 23 Aug 2016 16:44:08 +0000 (18:44 +0200)]
Merge branch 'PHP-7.1'

8 years agoRevert "Do not prepend ? on nullables in ReflectionType::__toString()"
commit | commitdiff | tree
Levi Morrison [Tue, 23 Aug 2016 15:42:04 +0000 (09:42 -0600)]
Revert "Do not prepend ? on nullables in ReflectionType::__toString()"

This reverts commit 8855a2ce76e8bfba1d2eea1345c765fde7a9a441.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Dmitry Stogov [Tue, 23 Aug 2016 10:18:51 +0000 (13:18 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  op_arrays may be optimized independetly and "script" might be NULL

8 years agoop_arrays may be optimized independetly and "script" might be NULL
commit | commitdiff | tree
Dmitry Stogov [Tue, 23 Aug 2016 10:17:53 +0000 (13:17 +0300)]
op_arrays may be optimized independetly and "script" might be NULL

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Dmitry Stogov [Tue, 23 Aug 2016 09:59:23 +0000 (12:59 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Don't keep dangling pointers.

8 years agoDon't keep dangling pointers.
commit | commitdiff | tree
Dmitry Stogov [Tue, 23 Aug 2016 09:58:46 +0000 (12:58 +0300)]
Don't keep dangling pointers.

next
Unnamed repository; edit this file 'description' to name the repository.