summaryrefslogtreecommitdiff
path: root/memory_limit.c
diff options
context:
space:
mode:
authorBen Fuhrmannek2016-01-29 13:55:22 +0100
committerBen Fuhrmannek2016-01-29 13:55:22 +0100
commitd209a0a5962e62de134b56495349028e1fa97f76 (patch)
treee720aa57d4677c9b2f64e36b268bdcebf4a8220d /memory_limit.c
parent39d0c84c8467ccd2272d10c858f8f746c26904c4 (diff)
code cleanup for a fresh start
Diffstat (limited to 'memory_limit.c')
-rw-r--r--memory_limit.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/memory_limit.c b/memory_limit.c
index fa1683e..5b8b438 100644
--- a/memory_limit.c
+++ b/memory_limit.c
@@ -3,7 +3,7 @@
3 | Suhosin Version 1 | 3 | Suhosin Version 1 |
4 +----------------------------------------------------------------------+ 4 +----------------------------------------------------------------------+
5 | Copyright (c) 2006-2007 The Hardened-PHP Project | 5 | Copyright (c) 2006-2007 The Hardened-PHP Project |
6 | Copyright (c) 2007-2015 SektionEins GmbH | 6 | Copyright (c) 2007-2016 SektionEins GmbH |
7 +----------------------------------------------------------------------+ 7 +----------------------------------------------------------------------+
8 | This source file is subject to version 3.01 of the PHP license, | 8 | This source file is subject to version 3.01 of the PHP license, |
9 | that is bundled with this package in the file LICENSE, and is | 9 | that is bundled with this package in the file LICENSE, and is |
@@ -13,7 +13,7 @@
13 | obtain it through the world-wide-web, please send a note to | 13 | obtain it through the world-wide-web, please send a note to |
14 | license@php.net so we can mail you a copy immediately. | 14 | license@php.net so we can mail you a copy immediately. |
15 +----------------------------------------------------------------------+ 15 +----------------------------------------------------------------------+
16 | Author: Stefan Esser <sesser@sektioneins.de> | 16 | Author: Stefan Esser <sesser@sektioneins.de> and others |
17 +----------------------------------------------------------------------+ 17 +----------------------------------------------------------------------+
18*/ 18*/
19/* 19/*
@@ -79,7 +79,7 @@ void suhosin_hook_memory_limit()
79 zend_ini_entry *ini_entry; 79 zend_ini_entry *ini_entry;
80 80
81 /* check if we are compiled against memory_limit */ 81 /* check if we are compiled against memory_limit */
82 if ((ini_entry=zend_hash_str_find_ptr(EG(ini_directives), "memory_limit", sizeof("memory_limit")-1))) { 82 if ((ini_entry=zend_hash_str_find_ptr(EG(ini_directives), ZEND_STRL("memory_limit")))) {
83 /* replace OnUpdateMemoryLimit handler */ 83 /* replace OnUpdateMemoryLimit handler */
84 ini_entry->on_modify = suhosin_OnChangeMemoryLimit; 84 ini_entry->on_modify = suhosin_OnChangeMemoryLimit;
85 } 85 }
@@ -95,4 +95,3 @@ void suhosin_hook_memory_limit()
95 * vim600: noet sw=4 ts=4 fdm=marker 95 * vim600: noet sw=4 ts=4 fdm=marker
96 * vim<600: noet sw=4 ts=4 96 * vim<600: noet sw=4 ts=4
97 */ 97 */
98