SOURCES: php4-hardening-fix.patch (NEW) - a fix that makes it buil...

[prism]

Author: prism                        Date: Sat Jul  2 23:47:07 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- a fix that makes it build when applying hardening patch

---- Files affected:
SOURCES:
   php4-hardening-fix.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/php4-hardening-fix.patch
diff -u /dev/null SOURCES/php4-hardening-fix.patch:1.1
--- /dev/null	Sun Jul  3 01:47:07 2005
+++ SOURCES/php4-hardening-fix.patch	Sun Jul  3 01:47:02 2005
@@ -0,0 +1,28 @@
+diff -uNr php-4.3.11.orig/main/hardening_patch.c php-4.3.11/main/hardening_patch.c
+--- php-4.3.11.orig/main/hardening_patch.c	2005-07-03 01:17:53.000000000 +0200
++++ php-4.3.11/main/hardening_patch.c	2005-07-03 01:18:30.000000000 +0200
+@@ -126,9 +126,9 @@
+ 		i++;
+ 	}
+ 	
+-	if (zend_is_executing(TSRMLS_CC)) {
+-		lineno = zend_get_executed_lineno(TSRMLS_CC);
+-		fname = zend_get_executed_filename(TSRMLS_CC);
++	if (zend_is_executing(TSRMLS_C)) {
++		lineno = zend_get_executed_lineno(TSRMLS_C);
++		fname = zend_get_executed_filename(TSRMLS_C);
+ 		ap_php_snprintf(buf, sizeof(buf), "ALERT - %s (attacker '%s', file '%s', line %u)", error, ip_address, fname, lineno);
+ 	} else {
+ 		fname = sapi_getenv("SCRIPT_FILENAME", 15 TSRMLS_CC);
+diff -uNr php-4.3.11.orig/Zend/zend_execute_API.c php-4.3.11/Zend/zend_execute_API.c
+--- php-4.3.11.orig/Zend/zend_execute_API.c	2005-07-03 01:17:53.000000000 +0200
++++ php-4.3.11/Zend/zend_execute_API.c	2005-07-03 01:22:16.000000000 +0200
+@@ -673,7 +673,7 @@
+ 
+ ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC)
+ {
+-	return (zend_eval_string_ex(str, retval_ptr, string_name, ZEND_EVAL_CODE TSRMLS_C));
++	return (zend_eval_string_ex(str, retval_ptr, string_name, ZEND_EVAL_CODE TSRMLS_CC));
+ }
+ 
+ void execute_new_code(TSRMLS_D)
================================================================