diff options
| author | Ben Fuhrmannek | 2014-12-03 13:52:57 +0100 |
|---|---|---|
| committer | Ben Fuhrmannek | 2014-12-03 13:52:57 +0100 |
| commit | f08ccc6821dc6d56cf204f04eb988efe6c18c0d2 (patch) | |
| tree | 1f50dfe7cfabff09f7b0acd478dc47467c26240a /execute.c | |
| parent | 5a0d9ff59f2a222259e430076f83ae62421d684e (diff) | |
| parent | 7ea20b91eaa4d977991ef81bf1000758c9d3b6c6 (diff) | |
Merge branch 'master' into 0.9.37
Diffstat (limited to 'execute.c')
| -rw-r--r-- | execute.c | 8 |
1 files changed, 4 insertions, 4 deletions
| @@ -299,12 +299,12 @@ static zend_bool suhosin_zend_open(const char *filename, zend_file_handle *fh) | |||
| 299 | break; | 299 | break; |
| 300 | 300 | ||
| 301 | case SUHOSIN_CODE_TYPE_BLACKURL: | 301 | case SUHOSIN_CODE_TYPE_BLACKURL: |
| 302 | suhosin_log(S_INCLUDE, "Include filename ('%s') is an URL that is forbidden by the blacklist", filename); | 302 | suhosin_log(S_INCLUDE, "Include filename ('%s') is a URL that is forbidden by the blacklist", filename); |
| 303 | suhosin_bailout(TSRMLS_C); | 303 | suhosin_bailout(TSRMLS_C); |
| 304 | break; | 304 | break; |
| 305 | 305 | ||
| 306 | case SUHOSIN_CODE_TYPE_BADURL: | 306 | case SUHOSIN_CODE_TYPE_BADURL: |
| 307 | suhosin_log(S_INCLUDE, "Include filename ('%s') is an URL that is not allowed", filename); | 307 | suhosin_log(S_INCLUDE, "Include filename ('%s') is a URL that is not allowed", filename); |
| 308 | suhosin_bailout(TSRMLS_C); | 308 | suhosin_bailout(TSRMLS_C); |
| 309 | break; | 309 | break; |
| 310 | 310 | ||
| @@ -607,12 +607,12 @@ not_evaled_code: | |||
| 607 | break; | 607 | break; |
| 608 | 608 | ||
| 609 | case SUHOSIN_CODE_TYPE_BLACKURL: | 609 | case SUHOSIN_CODE_TYPE_BLACKURL: |
| 610 | suhosin_log(S_INCLUDE|S_GETCALLER, "Include filename ('%s') is an URL that is forbidden by the blacklist", op_array->filename); | 610 | suhosin_log(S_INCLUDE|S_GETCALLER, "Include filename ('%s') is a URL that is forbidden by the blacklist", op_array->filename); |
| 611 | suhosin_bailout(TSRMLS_C); | 611 | suhosin_bailout(TSRMLS_C); |
| 612 | break; | 612 | break; |
| 613 | 613 | ||
| 614 | case SUHOSIN_CODE_TYPE_BADURL: | 614 | case SUHOSIN_CODE_TYPE_BADURL: |
| 615 | suhosin_log(S_INCLUDE|S_GETCALLER, "Include filename ('%s') is an URL that is not allowed", op_array->filename); | 615 | suhosin_log(S_INCLUDE|S_GETCALLER, "Include filename ('%s') is a URL that is not allowed", op_array->filename); |
| 616 | suhosin_bailout(TSRMLS_C); | 616 | suhosin_bailout(TSRMLS_C); |
| 617 | break; | 617 | break; |
| 618 | 618 | ||
