]>
Commit | Line | Data |
---|---|---|
d7a9fd89 AM |
1 | diff -uNr php-5.0.4.orig/main/hardening_patch.c php-5.0.4/main/hardening_patch.c |
2 | --- php-5.0.4.orig/main/hardening_patch.c 2005-07-03 02:05:18.000000000 +0200 | |
3 | +++ php-5.0.4/main/hardening_patch.c 2005-07-03 02:06:58.000000000 +0200 | |
4 | @@ -126,9 +126,9 @@ | |
5 | i++; | |
6 | } | |
7 | ||
8 | - if (zend_is_executing(TSRMLS_CC)) { | |
9 | - lineno = zend_get_executed_lineno(TSRMLS_CC); | |
10 | - fname = zend_get_executed_filename(TSRMLS_CC); | |
11 | + if (zend_is_executing(TSRMLS_C)) { | |
12 | + lineno = zend_get_executed_lineno(TSRMLS_C); | |
13 | + fname = zend_get_executed_filename(TSRMLS_C); | |
14 | ap_php_snprintf(buf, sizeof(buf), "ALERT - %s (attacker '%s', file '%s', line %u)", error, ip_address, fname, lineno); | |
15 | } else { | |
16 | fname = sapi_getenv("SCRIPT_FILENAME", 15 TSRMLS_CC); | |
17 | diff -uNr php-5.0.4.orig/Zend/zend_execute_API.c php-5.0.4/Zend/zend_execute_API.c | |
18 | --- php-5.0.4.orig/Zend/zend_execute_API.c 2005-07-03 02:05:18.000000000 +0200 | |
19 | +++ php-5.0.4/Zend/zend_execute_API.c 2005-07-03 02:06:32.000000000 +0200 | |
20 | @@ -1037,7 +1037,7 @@ | |
21 | ||
22 | ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC) | |
23 | { | |
24 | - return (zend_eval_string_ex_ex(str, retval_ptr, string_name, ZEND_EVAL_CODE TSRMLS_C)); | |
25 | + return (zend_eval_string_ex_ex(str, retval_ptr, string_name, ZEND_EVAL_CODE TSRMLS_CC)); | |
26 | } | |
27 | ||
28 |