diff options
| author | David Carlier | 2016-10-13 19:30:51 +0100 |
|---|---|---|
| committer | David Carlier | 2016-10-13 19:30:51 +0100 |
| commit | 293d017aad39263403cb981af0a81c3a7984c1e3 (patch) | |
| tree | 6b621ed02f124b5d71af42a29b786f9803d98c96 | |
| parent | 20d333da41f9451f5713e9723ad79e6566e290b7 (diff) | |
author 'amending' + more ifdef
| -rw-r--r-- | php_suhosin.h | 2 | ||||
| -rw-r--r-- | pledge.c | 2 | ||||
| -rw-r--r-- | pledge.h | 2 | ||||
| -rw-r--r-- | suhosin.c | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/php_suhosin.h b/php_suhosin.h index b228d48..1c0ea42 100644 --- a/php_suhosin.h +++ b/php_suhosin.h | |||
| @@ -383,7 +383,9 @@ void suhosin_unhook_header_handler(); | |||
| 383 | void suhosin_hook_session(TSRMLS_D); | 383 | void suhosin_hook_session(TSRMLS_D); |
| 384 | void suhosin_unhook_session(TSRMLS_D); | 384 | void suhosin_unhook_session(TSRMLS_D); |
| 385 | void suhosin_hook_sha256(TSRMLS_D); | 385 | void suhosin_hook_sha256(TSRMLS_D); |
| 386 | #ifdef __OpenBSD__ | ||
| 386 | void suhosin_hook_pledge(TSRMLS_D); | 387 | void suhosin_hook_pledge(TSRMLS_D); |
| 388 | #endif | ||
| 387 | void suhosin_hook_ex_imp(TSRMLS_D); | 389 | void suhosin_hook_ex_imp(TSRMLS_D); |
| 388 | void suhosin_hook_treat_data(); | 390 | void suhosin_hook_treat_data(); |
| 389 | void suhosin_hook_memory_limit(TSRMLS_D); | 391 | void suhosin_hook_memory_limit(TSRMLS_D); |
| @@ -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: David Carlier <devnexen@gmail.com> | |
| 17 | +----------------------------------------------------------------------+ | 17 | +----------------------------------------------------------------------+ |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| @@ -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: David Carlier <devnexen@gmail.com> | |
| 17 | +----------------------------------------------------------------------+ | 17 | +----------------------------------------------------------------------+ |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| @@ -1051,7 +1051,9 @@ PHP_MINIT_FUNCTION(suhosin) | |||
| 1051 | suhosin_hook_memory_limit(TSRMLS_C); | 1051 | suhosin_hook_memory_limit(TSRMLS_C); |
| 1052 | suhosin_hook_sha256(TSRMLS_C); | 1052 | suhosin_hook_sha256(TSRMLS_C); |
| 1053 | suhosin_hook_ex_imp(TSRMLS_C); | 1053 | suhosin_hook_ex_imp(TSRMLS_C); |
| 1054 | #ifdef __OpenBSD__ | ||
| 1054 | suhosin_hook_pledge(TSRMLS_C); | 1055 | suhosin_hook_pledge(TSRMLS_C); |
| 1056 | #endif | ||
| 1055 | 1057 | ||
| 1056 | #if PHP_VERSION_ID < 50500 | 1058 | #if PHP_VERSION_ID < 50500 |
| 1057 | /* register the logo for phpinfo */ | 1059 | /* register the logo for phpinfo */ |
