]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1'
authorBob Weinand <bobwei9@hotmail.com>
Thu, 22 Dec 2016 22:40:24 +0000 (23:40 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Thu, 22 Dec 2016 22:40:24 +0000 (23:40 +0100)
commit1f474fddbb99ab7a02b005557ce196105f28c16b
treedf3297332d2c0f4e5328c764859005e2ea5e602b
parent712c532ab9091573567471b3ffc720922b629d40
parent7b133e074c5912cf058dc545a3e14469d74b6644
Merge branch 'PHP-7.1'

Also inline alpn_ctx in openssl_netstream_data (no need for the extra allocation there)
ext/openssl/xp_ssl.c