Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:71789
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.214.180 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <CAH8Mpnk4-iio-+EvZDf_GLbC9C77OkBVGoBdON++2Tu+8wqs_g@mail.gmail.com>
References: <CAH8Mpnk4-iio-+EvZDf_GLbC9C77OkBVGoBdON++2Tu+8wqs_g@mail.gmail.com>
Date: Thu, 30 Jan 2014 10:07:24 +0100
Message-ID: <CAF+90c9vCWLVtYZ9WgLj2CoSQxUEXt15vQuYFLmP5MZhR+CX+A@mail.gmail.com>
To: Daniel Lowrey <rdlowrey@gmail.com>
Cc: "internals@lists.php.net" <internals@lists.php.net>
Content-Type: multipart/alternative; boundary=089e015366b4c74eb104f12c621b
Subject: Re: [PHP-DEV] Re: Verify peers by default, merge error
From: nikita.ppv@gmail.com (Nikita Popov)

--089e015366b4c74eb104f12c621b
Content-Type: text/plain; charset=ISO-8859-1

On Thu, Jan 30, 2014 at 3:59 AM, Daniel Lowrey <rdlowrey@gmail.com> wrote:

> I need a bit of help here as I'm starting to doubt my sanity. Is there some
> difference between the master branch and PHP-5.6 regarding zts that I'm
> unaware of?
>
> I've pushed a fix for the peer verification build breakage the code is
> identical in both branches but the master branch won't build *without*
> TSRMLS_CC and the PHP-5.6 branch will not build *with* the TSRMLS_CC
> declaration and I'm completely flumoxed at this point.
>
> The relevant commit can be found here:
>
>
> https://github.com/php/php-src/commit/43432c12f176d42d35c82345caef23fb016cec82#diff-fba6f2ad888bf4d71a91b060dfee4522L482
>
> The offending bit of code is:
>
> ```
>  if (sslsock->is_client
>     && (php_stream_context_get_option(stream->context, "ssl",
> "SNI_enabled", &val) == FAILURE
>         || zend_is_true(*val TSRMLS_CC))
> ) {
> ```
>
> Any guidance is appreciated.
>

The signature of zend_is_true changed between PHP-5.6 and master. In
PHP-5.6 it does not need TSRMLS_CC, in master it does.

Nikita

--089e015366b4c74eb104f12c621b--