Verify peers by default, merge error View as Markdown

Hi,

looks like there was a merge error in master after

http://git.php.net/?p=php-src.git;a=commitdiff;h=6edc84fcdfc8e76507bc73122310fff4b6170b88

I've just pushed a fix here

http://git.php.net/?p=php-src.git;a=commitdiff;h=c91ad8233b46e1605b225c782efc3131f158d9be

After that openssl in master seems to be doing fine, but could you please
verify it?

Thanks

Anatol