diff options
| -rw-r--r-- | php-upstream.patch | 58 | ||||
| -rw-r--r-- | php70.spec | 6 |
2 files changed, 61 insertions, 3 deletions
diff --git a/php-upstream.patch b/php-upstream.patch new file mode 100644 index 0000000..b90cd03 --- /dev/null +++ b/php-upstream.patch @@ -0,0 +1,58 @@ +--- a/ext/opcache/ZendAccelerator.c 2015-11-25 05:04:23.000000000 +0100 ++++ b/ext/opcache/tmp/ZendAccelerator.c 2015-11-27 12:38:07.806097341 +0100 +@@ -2515,6 +2515,8 @@ + MAP_PRIVATE | MAP_ANONYMOUS, + -1, 0); + if (mem == MAP_FAILED) { ++ zend_error(E_WARNING, ++ ACCELERATOR_PRODUCT_NAME " huge_code_pages: mmap failed: %s (%d)", strerror(errno), errno); + return -1; + } + memcpy(mem, start, size); +@@ -2525,17 +2527,42 @@ + MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED | MAP_HUGETLB, + -1, 0); + # endif +-# ifdef MADV_HUGEPAGE + if (ret == MAP_FAILED) { ++# ifdef MADV_HUGEPAGE + ret = mmap(start, size, + PROT_READ | PROT_WRITE | PROT_EXEC, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, + -1, 0); +- madvise(start, size, MADV_HUGEPAGE); +- } ++ if (ret == MAP_FAILED) { ++ zend_error(E_WARNING, ++ ACCELERATOR_PRODUCT_NAME " huge_code_pages: mmap(FIXED) failed: %s (%d)", ++ strerror(errno), errno); ++ munmap(mem, size); ++ return -1; ++ } ++ if (-1 == madvise(start, size, MADV_HUGEPAGE)) { ++ zend_error(E_WARNING, ++ ACCELERATOR_PRODUCT_NAME " huge_code_pages: madvise(HUGEPAGE) failed: %s (%d)", ++ strerror(errno), errno); ++ munmap(mem, size); ++ return -1; ++ } ++# else ++ ret = mmap(start, size, ++ PROT_READ | PROT_WRITE | PROT_EXEC, ++ MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0); ++ if (ret == MAP_FAILED) { ++ /* this should never happen */ ++ } ++ memcpy(start, mem, size); ++ zend_error(E_WARNING, ++ ACCELERATOR_PRODUCT_NAME "huge_code_pages: mmap(HUGETLB) failed: %s (%d)", strerror(errno), errno); ++ return -1; + # endif ++ } ++ + if (ret == start) { +- memcpy(start, mem, size); ++ memcpy(start, mem, size); + mprotect(start, size, PROT_READ | PROT_EXEC); + } + munmap(mem, size); @@ -36,7 +36,7 @@ %global with_lsws 1 # Regression tests take a long time, you can skip 'em with this -%global runselftest 0 +#global runselftest 0 %{!?runselftest: %global runselftest 1} # Use the arch-specific mysql_config binary to avoid mismatch with the @@ -133,7 +133,7 @@ %endif %global rcver RC8 -%global rpmrel 14 +%global rpmrel 15 Summary: PHP scripting language for creating dynamic web sites Name: php @@ -2006,7 +2006,7 @@ fi %changelog -* Wed Nov 25 2015 Remi Collet <remi@fedoraproject.org> 7.0.0-0.14.RC8 +* Fri Nov 27 2015 Remi Collet <remi@fedoraproject.org> 7.0.0-0.15.RC8 - test build * Wed Nov 25 2015 Remi Collet <remi@fedoraproject.org> 7.0.0-0.12.RC8 |