diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-31 23:35:11 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-31 23:35:11 -0800 |
| commit | 87d8e9208c4af72303c5f5353f98f9e04e038047 (patch) | |
| tree | f67f821464b916c3d6b596af1672aa153327d5b4 | |
| parent | b68e7bd7ba481dac7e84beab9c951cde1ffc28d9 (diff) | |
| parent | 55d5811f85d8ef5934a430ef6d3604c942a4b2d3 (diff) | |
| download | php-git-87d8e9208c4af72303c5f5353f98f9e04e038047.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix TSRM
Conflicts:
ext/standard/dns.c
| -rw-r--r-- | ext/standard/dns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/dns.c b/ext/standard/dns.c index 0f32fde49e..3bc8a239c2 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -247,7 +247,7 @@ PHP_FUNCTION(gethostbynamel) if(hostname_len > MAXFQDNLEN) { /* name too long, protect from CVE-2015-0235 */ - php_error_docref(NULL, E_WARNING, "Host name is too long, the limit is %d characters", MAXFQDNLEN); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Host name is too long, the limit is %d characters", MAXFQDNLEN); RETURN_FALSE; } |