Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:71767
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.213.179 as permitted sender)
MIME-Version: 1.0
Date: Wed, 29 Jan 2014 21:59:27 -0500
Message-ID: <CAH8Mpnk4-iio-+EvZDf_GLbC9C77OkBVGoBdON++2Tu+8wqs_g@mail.gmail.com>
To: "internals@lists.php.net" <internals@lists.php.net>
Content-Type: multipart/alternative; boundary=bcaec51a8946e2b07304f1273e79
Subject: Re: Verify peers by default, merge error
From: rdlowrey@gmail.com (Daniel Lowrey)

--bcaec51a8946e2b07304f1273e79
Content-Type: text/plain; charset=ISO-8859-1

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.

--bcaec51a8946e2b07304f1273e79--