mirror of
https://github.com/php/php-src.git
synced 2026-04-21 15:08:16 +02:00
Merge branch 'PHP-5.5' into PHP-5.5-opcache
* PHP-5.5: Initialize literals hash_value and cache_slot Added curl config test for windows updated lib versions updated lib versions fixed EOL updated lib versions allow lcov 1.10 allow lcov 1.10 Conflicts: ext/opcache/Optimizer/zend_optimizer.c
This commit is contained in:
@@ -0,0 +1,48 @@
|
||||
--TEST--
|
||||
Check libcurl config on windows
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (!extension_loaded("curl")) {
|
||||
die('skip - curl extension not available in this build');
|
||||
}
|
||||
if(substr(PHP_OS, 0, 3) != 'WIN' )
|
||||
die("skip for windows only");
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
ob_start();
|
||||
phpinfo();
|
||||
$s = ob_get_contents();
|
||||
ob_end_clean();
|
||||
preg_match('/curl\n\n(.+)\n\n/siU', $s, $m);
|
||||
|
||||
echo $m[1], "\n";
|
||||
|
||||
?>
|
||||
DONE
|
||||
--EXPECTF--
|
||||
cURL support => enabled
|
||||
cURL Information => %s
|
||||
Age => %d
|
||||
Features
|
||||
AsynchDNS => Yes
|
||||
CharConv => No
|
||||
Debug => No
|
||||
GSS-Negotiate => Yes
|
||||
IDN => Yes
|
||||
IPv6 => Yes
|
||||
krb4 => No
|
||||
Largefile => Yes
|
||||
libz => Yes
|
||||
NTLM => Yes
|
||||
NTLMWB => No
|
||||
SPNEGO => Yes
|
||||
SSL => Yes
|
||||
SSPI => Yes
|
||||
TLS-SRP => No
|
||||
Protocols => dict, file, ftp, ftps, gopher, http, https, imap, imaps, ldap, pop3, pop3s, rtsp, scp, sftp, smtp, smtps, telnet, tftp
|
||||
Host => %s-pc-win32
|
||||
SSL Version => OpenSSL/%s
|
||||
ZLib Version => %s
|
||||
libSSH Version => libssh2/%s
|
||||
DONE
|
||||
@@ -66,6 +66,8 @@ int zend_optimizer_add_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC
|
||||
op_array->last_literal++;
|
||||
op_array->literals = (zend_literal*)erealloc(op_array->literals, op_array->last_literal * sizeof(zend_literal));
|
||||
op_array->literals[i].constant = *zv;
|
||||
op_array->literals[i].hash_value = 0;
|
||||
op_array->literals[i].cache_slot = -1;
|
||||
Z_SET_REFCOUNT(op_array->literals[i].constant, 2);
|
||||
Z_SET_ISREF(op_array->literals[i].constant);
|
||||
return i;
|
||||
|
||||
@@ -6,8 +6,7 @@ icu-49.1.2
|
||||
icu-50.1.2
|
||||
jpeglib-8
|
||||
jpeglib-9
|
||||
libcurl-7.27.0
|
||||
libcurl-7.29.0
|
||||
libcurl-7.30.0
|
||||
libiconv-1.14
|
||||
libmcrypt-2.5.8
|
||||
libmpir-2.5.1
|
||||
|
||||
Reference in New Issue
Block a user