On Thu, Dec 18, 2014 at 10:25 AM, Anatol Belski
wrote:
>
> Hi,
>
> the native-tls branch was just merged into master. As all the TSRMLS_*
> occurrences was removed, some more merge conflicts are to expect when it
> comes from PHP5 to PHP7. I would like to suggest a merge strategy to
> minimize the
Hi,
the native-tls branch was just merged into master. As all the TSRMLS_*
occurrences was removed, some more merge conflicts are to expect when it
comes from PHP5 to PHP7. I would like to suggest a merge strategy to
minimize the negative effects. Also this will be useful to port the
existing patc
