]> 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, 7 Nov 2016 19:49:07 +0000 (20:49 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  update NEWS
  update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Mon, 7 Nov 2016 19:48:41 +0000 (20:48 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update NEWS

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Mon, 7 Nov 2016 19:48:13 +0000 (20:48 +0100)]
update NEWS

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Mon, 7 Nov 2016 19:47:06 +0000 (20:47 +0100)]
update NEWS

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 7 Nov 2016 19:41:31 +0000 (20:41 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Add test for bug #73448

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Mon, 7 Nov 2016 19:40:46 +0000 (20:40 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Add test for bug #73448

8 years agoAdd test for bug #73448
commit | commitdiff | tree
Anatol Belski [Mon, 7 Nov 2016 19:39:51 +0000 (20:39 +0100)]
Add test for bug #73448

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 7 Nov 2016 19:22:12 +0000 (20:22 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #73448 odbc_errormsg returns trash, always 513 bytes

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Mon, 7 Nov 2016 19:21:56 +0000 (20:21 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73448 odbc_errormsg returns trash, always 513 bytes

8 years agoFixed bug #73448 odbc_errormsg returns trash, always 513 bytes
commit | commitdiff | tree
Anatol Belski [Mon, 7 Nov 2016 19:18:29 +0000 (20:18 +0100)]
Fixed bug #73448 odbc_errormsg returns trash, always 513 bytes

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Derick Rethans [Mon, 7 Nov 2016 16:40:48 +0000 (16:40 +0000)]
Merge branch 'PHP-7.1'

8 years agoAdd hint that naive DateTime comparisions now are more likely to fail
commit | commitdiff | tree
Derick Rethans [Mon, 7 Nov 2016 16:40:42 +0000 (16:40 +0000)]
Add hint that naive DateTime comparisions now are more likely to fail

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Jakub Zelenka [Sun, 6 Nov 2016 20:45:13 +0000 (20:45 +0000)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Jakub Zelenka [Sun, 6 Nov 2016 20:44:40 +0000 (20:44 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Jakub Zelenka [Sun, 6 Nov 2016 20:43:50 +0000 (20:43 +0000)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix bug #72776 (Invalid parameter in memcpy function trough openssl_pbkdf2)
commit | commitdiff | tree
Jakub Zelenka [Sun, 6 Nov 2016 20:40:51 +0000 (20:40 +0000)]
Fix bug #72776 (Invalid parameter in memcpy function trough openssl_pbkdf2)

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Jakub Zelenka [Sun, 6 Nov 2016 17:40:59 +0000 (17:40 +0000)]
Merge branch 'PHP-7.1'

8 years agoNever return private part of the key from openssl_csr_get_public_key
commit | commitdiff | tree
Jakub Zelenka [Sun, 6 Nov 2016 17:37:06 +0000 (17:37 +0000)]
Never return private part of the key from openssl_csr_get_public_key

This fixes ecc.phpt test when OpenSSL 1.1 linked.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Sun, 6 Nov 2016 16:57:29 +0000 (17:57 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  add missing RETURN_STRINGL_CHECK

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Sun, 6 Nov 2016 16:57:19 +0000 (17:57 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  add missing RETURN_STRINGL_CHECK

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Anatol Belski [Sun, 6 Nov 2016 16:56:14 +0000 (17:56 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  add missing RETURN_STRINGL_CHECK

8 years agoadd missing RETURN_STRINGL_CHECK
commit | commitdiff | tree
Anatol Belski [Sun, 6 Nov 2016 16:51:25 +0000 (17:51 +0100)]
add missing RETURN_STRINGL_CHECK

As RETVAL_STRINGL_CHECK is already there, this one is needed for
completion. One place in ext/bz2 is missing that, so it will likely
be useful for other possible fixes.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Sun, 6 Nov 2016 16:13:09 +0000 (17:13 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  update NEWS
  update NEWS

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Sun, 6 Nov 2016 16:12:46 +0000 (17:12 +0100)]
update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Sun, 6 Nov 2016 16:12:18 +0000 (17:12 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update NEWS

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Sun, 6 Nov 2016 16:11:19 +0000 (17:11 +0100)]
update NEWS

8 years agoIntroduce SKIP_IO_CAPTURE_TESTS group
commit | commitdiff | tree
Anatol Belski [Sat, 5 Nov 2016 23:04:53 +0000 (00:04 +0100)]
Introduce SKIP_IO_CAPTURE_TESTS group

to workaround false positives with some CI systems

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Nikita Popov [Sat, 5 Nov 2016 22:11:42 +0000 (23:11 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Nikita Popov [Sat, 5 Nov 2016 22:10:19 +0000 (23:10 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoRemove this check as discussed with Anatol
commit | commitdiff | tree
Kalle Sommer Nielsen [Sat, 5 Nov 2016 22:08:08 +0000 (23:08 +0100)]
Remove this check as discussed with Anatol

8 years agoComplete the fix of bug #70172 for PHP 7
commit | commitdiff | tree
Nikita Popov [Sun, 23 Oct 2016 19:37:36 +0000 (21:37 +0200)]
Complete the fix of bug #70172 for PHP 7

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Sat, 5 Nov 2016 21:55:04 +0000 (22:55 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix blob parameters binding. Fixes: #73087, #61183, #71494

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Sat, 5 Nov 2016 21:54:44 +0000 (22:54 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix blob parameters binding. Fixes: #73087, #61183, #71494

8 years agoFix blob parameters binding. Fixes: #73087, #61183, #71494
commit | commitdiff | tree
Dorin Marcoci [Fri, 4 Nov 2016 11:15:01 +0000 (13:15 +0200)]
Fix blob parameters binding. Fixes: #73087, #61183, #71494

Adjusted formatting according to requirements

Test case for bug #73087

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Stanislav Malyshev [Sat, 5 Nov 2016 21:00:58 +0000 (14:00 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  More int->size_t and string overflow fixes

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Stanislav Malyshev [Sat, 5 Nov 2016 21:00:53 +0000 (14:00 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  More int->size_t and string overflow fixes

8 years agoMore int->size_t and string overflow fixes
commit | commitdiff | tree
Stanislav Malyshev [Sat, 5 Nov 2016 20:20:24 +0000 (13:20 -0700)]
More int->size_t and string overflow fixes

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Stanislav Malyshev [Sat, 5 Nov 2016 20:59:56 +0000 (13:59 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  More int->size_t and string overflow fixes

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Stanislav Malyshev [Sat, 5 Nov 2016 20:59:35 +0000 (13:59 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  More int->size_t and string overflow fixes

8 years agoMore int->size_t and string overflow fixes
commit | commitdiff | tree
Stanislav Malyshev [Sat, 5 Nov 2016 20:20:24 +0000 (13:20 -0700)]
More int->size_t and string overflow fixes

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Fri, 4 Nov 2016 17:44:14 +0000 (18:44 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  rename the tmp ini file, to keep it consistent with m4 variant

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Fri, 4 Nov 2016 17:43:56 +0000 (18:43 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  rename the tmp ini file, to keep it consistent with m4 variant

8 years agorename the tmp ini file, to keep it consistent with m4 variant
commit | commitdiff | tree
Anatol Belski [Fri, 4 Nov 2016 17:42:36 +0000 (18:42 +0100)]
rename the tmp ini file, to keep it consistent with m4 variant

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Fri, 4 Nov 2016 17:39:23 +0000 (18:39 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix dir separator in test

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Fri, 4 Nov 2016 17:39:09 +0000 (18:39 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix dir separator in test

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Anatol Belski [Fri, 4 Nov 2016 17:38:22 +0000 (18:38 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix dir separator in test

8 years agofix dir separator in test
commit | commitdiff | tree
Anatol Belski [Fri, 4 Nov 2016 17:29:54 +0000 (18:29 +0100)]
fix dir separator in test

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Fri, 4 Nov 2016 12:11:56 +0000 (13:11 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix dir separator

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Fri, 4 Nov 2016 12:11:29 +0000 (13:11 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix dir separator

8 years agofix dir separator
commit | commitdiff | tree
Anatol Belski [Fri, 4 Nov 2016 12:10:52 +0000 (13:10 +0100)]
fix dir separator

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Stanislav Malyshev [Fri, 4 Nov 2016 05:54:12 +0000 (22:54 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Add length check for bzcompress too - fix for bug #73356
  More string length checks & fixes
  More string length checks & fixes

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Stanislav Malyshev [Fri, 4 Nov 2016 05:53:05 +0000 (22:53 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Add length check for bzcompress too - fix for bug #73356
  More string length checks & fixes
  More string length checks & fixes

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Stanislav Malyshev [Fri, 4 Nov 2016 05:12:23 +0000 (22:12 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Add length check for bzcompress too - fix for bug #73356

8 years agoAdd length check for bzcompress too - fix for bug #73356
commit | commitdiff | tree
Stanislav Malyshev [Fri, 4 Nov 2016 05:10:22 +0000 (22:10 -0700)]
Add length check for bzcompress too - fix for bug #73356

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Stanislav Malyshev [Fri, 4 Nov 2016 05:05:25 +0000 (22:05 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  More string length checks & fixes

8 years agoMore string length checks & fixes
commit | commitdiff | tree
Stanislav Malyshev [Fri, 4 Nov 2016 03:36:52 +0000 (20:36 -0700)]
More string length checks & fixes

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Stanislav Malyshev [Fri, 4 Nov 2016 03:45:13 +0000 (20:45 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  More string length checks & fixes

8 years agoMore string length checks & fixes
commit | commitdiff | tree
Stanislav Malyshev [Fri, 4 Nov 2016 03:36:52 +0000 (20:36 -0700)]
More string length checks & fixes

8 years agoUpdated to version 2016.9 (2016i)
commit | commitdiff | tree
Derick Rethans [Thu, 3 Nov 2016 17:57:33 +0000 (13:57 -0400)]
Updated to version 2016.9 (2016i)

8 years agoEmpty merge
commit | commitdiff | tree
Derick Rethans [Thu, 3 Nov 2016 17:57:33 +0000 (13:57 -0400)]
Empty merge

8 years agoUpdated to version 2016.9 (2016i)
commit | commitdiff | tree
Derick Rethans [Thu, 3 Nov 2016 17:57:32 +0000 (13:57 -0400)]
Updated to version 2016.9 (2016i)

8 years agoEmpty merge
commit | commitdiff | tree
Derick Rethans [Thu, 3 Nov 2016 17:57:32 +0000 (13:57 -0400)]
Empty merge

8 years agoUpdated to version 2016.9 (2016i)
commit | commitdiff | tree
Derick Rethans [Thu, 3 Nov 2016 17:57:31 +0000 (13:57 -0400)]
Updated to version 2016.9 (2016i)

8 years agoEmpty merge
commit | commitdiff | tree
Derick Rethans [Thu, 3 Nov 2016 17:57:30 +0000 (13:57 -0400)]
Empty merge

8 years agoUpdated to version 2016.9 (2016i)
commit | commitdiff | tree
Derick Rethans [Thu, 3 Nov 2016 17:57:28 +0000 (13:57 -0400)]
Updated to version 2016.9 (2016i)

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Xinchen Hui [Wed, 2 Nov 2016 04:12:25 +0000 (12:12 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Update NEWS
  Fixed bug #73423 (Reproducible crash with GDB backtrace)

8 years agoUpdate NEWS
commit | commitdiff | tree
Xinchen Hui [Wed, 2 Nov 2016 04:12:12 +0000 (12:12 +0800)]
Update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Xinchen Hui [Wed, 2 Nov 2016 04:11:48 +0000 (12:11 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73423 (Reproducible crash with GDB backtrace)

8 years agoFixed bug #73423 (Reproducible crash with GDB backtrace)
commit | commitdiff | tree
Xinchen Hui [Wed, 2 Nov 2016 04:11:30 +0000 (12:11 +0800)]
Fixed bug #73423 (Reproducible crash with GDB backtrace)

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Dmitry Stogov [Tue, 1 Nov 2016 19:58:59 +0000 (22:58 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Intriduced ZEND_ACC_INHERITED class flag. It's going to be helpful for static optimisations, when "parent" is not known yet.

8 years agoIntriduced ZEND_ACC_INHERITED class flag.
commit | commitdiff | tree
Dmitry Stogov [Tue, 1 Nov 2016 19:56:25 +0000 (22:56 +0300)]
Intriduced ZEND_ACC_INHERITED class flag.
It's going to be helpful for static optimisations, when "parent" is not known yet.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Christoph M. Becker [Tue, 1 Nov 2016 19:30:18 +0000 (20:30 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Christoph M. Becker [Tue, 1 Nov 2016 19:29:11 +0000 (20:29 +0100)]
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 [Tue, 1 Nov 2016 19:24:10 +0000 (20:24 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #73436: Setting allow_url_fopen to Off makes several tests fail
commit | commitdiff | tree
Christoph M. Becker [Tue, 1 Nov 2016 19:13:53 +0000 (20:13 +0100)]
Fix #73436: Setting allow_url_fopen to Off makes several tests fail

We make sure that these tests run with allow_url_fopen=1.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Sara Golemon [Tue, 1 Nov 2016 16:37:02 +0000 (09:37 -0700)]
Merge branch 'PHP-7.1'

This commit already landed on master as b041bebb
but I didn't realize we needed it on 7.1 as well.
Cherry-picking, then merging the pick to keep the repo happy.

* PHP-7.1:
  Change Big Endian backup implementations to use signed indexes

8 years agoChange Big Endian backup implementations to use signed indexes
commit | commitdiff | tree
Sara Golemon [Wed, 12 Oct 2016 03:43:02 +0000 (20:43 -0700)]
Change Big Endian backup implementations to use signed indexes

load64() counted down from 7..0, but the decrement turned 0 into 255.
This means the loop would never terminate on Big Endian systems.

Just use signed char integers since we're only dealing with values from 0..7 anyway.

Closes https://bugs.php.net/bug.php?id=73282

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Dmitry Stogov [Tue, 1 Nov 2016 16:04:23 +0000 (19:04 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed reference-counter inference

8 years agoFixed reference-counter inference
commit | commitdiff | tree
Dmitry Stogov [Tue, 1 Nov 2016 16:04:10 +0000 (19:04 +0300)]
Fixed reference-counter inference

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Tue, 1 Nov 2016 13:02:49 +0000 (14:02 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  add run target

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Tue, 1 Nov 2016 13:02:04 +0000 (14:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  add run target

8 years agoadd run target
commit | commitdiff | tree
Anatol Belski [Tue, 1 Nov 2016 12:50:46 +0000 (13:50 +0100)]
add run target

With this it is possible to run some code with the currently compiled
PHP and all the required environment included.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Dmitry Stogov [Mon, 31 Oct 2016 21:18:34 +0000 (00:18 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed reference-counter inference

8 years agoFixed reference-counter inference
commit | commitdiff | tree
Dmitry Stogov [Mon, 31 Oct 2016 21:18:12 +0000 (00:18 +0300)]
Fixed reference-counter inference

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Dmitry Stogov [Mon, 31 Oct 2016 18:39:50 +0000 (21:39 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  typo

8 years agotypo
commit | commitdiff | tree
Dmitry Stogov [Mon, 31 Oct 2016 18:39:34 +0000 (21:39 +0300)]
typo

8 years agoUse more accurate types to avoid compiler warnings
commit | commitdiff | tree
Adam Baratz [Mon, 31 Oct 2016 17:15:03 +0000 (13:15 -0400)]
Use more accurate types to avoid compiler warnings

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Dmitry Stogov [Mon, 31 Oct 2016 16:51:50 +0000 (19:51 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed reference-counter inference

8 years agoFixed reference-counter inference
commit | commitdiff | tree
Dmitry Stogov [Mon, 31 Oct 2016 16:51:19 +0000 (19:51 +0300)]
Fixed reference-counter inference

8 years agoFix comment style
commit | commitdiff | tree
Adam Baratz [Mon, 31 Oct 2016 16:39:22 +0000 (12:39 -0400)]
Fix comment style

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Derick Rethans [Mon, 31 Oct 2016 10:43:54 +0000 (10:43 +0000)]
Merge branch 'PHP-7.1'

8 years ago- Fixed bug #73426: createFromFormat with 'z' format char results in incorrect time.
commit | commitdiff | tree
Derick Rethans [Mon, 31 Oct 2016 10:43:33 +0000 (10:43 +0000)]
- Fixed bug #73426: createFromFormat with 'z' format char results in incorrect time.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 31 Oct 2016 00:12:21 +0000 (17:12 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Typo

8 years agoMerge branch 'pull-request/2179' into PHP-7.1
commit | commitdiff | tree
Stanislav Malyshev [Mon, 31 Oct 2016 00:11:18 +0000 (17:11 -0700)]
Merge branch 'pull-request/2179' into PHP-7.1

* pull-request/2179:
  Typo

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Sun, 30 Oct 2016 20:27:54 +0000 (21:27 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  prefer symbols read from the bin to those matching the naming scheme

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Sun, 30 Oct 2016 20:27:35 +0000 (21:27 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  prefer symbols read from the bin to those matching the naming scheme

8 years agoprefer symbols read from the bin to those matching the naming scheme
commit | commitdiff | tree
Anatol Belski [Sun, 30 Oct 2016 20:22:24 +0000 (21:22 +0100)]
prefer symbols read from the bin to those matching the naming scheme

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Sun, 30 Oct 2016 20:14:21 +0000 (21:14 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  remove debug out

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Sun, 30 Oct 2016 20:13:55 +0000 (21:13 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  remove debug out

8 years agoremove debug out
commit | commitdiff | tree
Anatol Belski [Sun, 30 Oct 2016 20:12:50 +0000 (21:12 +0100)]
remove debug out

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