clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 05:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0'

Browse Source 
* PHP-7.0:
  more informative error message for opcache fallback
  add SKIPIF condition
This commit is contained in:
Anatol Belski 2016-01-07 17:58:44 +01:00
commit e712764dfe
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ext/curl/tests/bug64267.phpt
View File

@ -2,6 +2,7 @@
Bug #64267 (CURLOPT_INFILE doesn't allow reset) Bug #64267 (CURLOPT_INFILE doesn't allow reset)
--SKIPIF-- --SKIPIF--
<?php <?php
if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
extension_loaded("curl") or die("skip need ext/curl"); extension_loaded("curl") or die("skip need ext/curl");
?> ?>
--FILE-- --FILE--

2
ext/opcache/shared_alloc_win32.c
View File

@ -176,7 +176,7 @@ static int zend_shared_alloc_reattach(size_t requested_size, char **error_in)
} }
#endif #endif
err = ERROR_INVALID_ADDRESS; err = ERROR_INVALID_ADDRESS;
zend_win_error_message(ACCEL_LOG_FATAL, "Base address marks unusable memory region", err); zend_win_error_message(ACCEL_LOG_FATAL, "Base address marks unusable memory region. Please setup opcache.file_cache and opcache.file_cache_callback directives for more convenient Opcache usage", err);
return ALLOC_FAILURE; return ALLOC_FAILURE;
} }