Patch display-the-requested-script-file-name for *General Issues Bug #64319

Patch version 2013-02-28 18:18 UTC

• 2013-02-28 18:18 UTC [diff to current]

Developer: reeze@php.net

From b328afe9fece8fa9953cb99bf2440c907ff44dfa Mon Sep 17 00:00:00 2001
From: Reeze Xia <reeze@php.net>
Date: Fri, 1 Mar 2013 02:16:14 +0800
Subject: [PATCH] Implemented Request #64319 display request file of
 max_input_vars warning

---
 main/php_variables.c | 4 ++--
 main/rfc1867.c       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/php_variables.c b/main/php_variables.c
index fd52f31..83f7599 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -140,7 +140,7 @@ PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars
 				/* do not output the error message to the screen,
 				 this helps us to to avoid "information disclosure" */
 				if (!PG(display_errors)) {
-					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variable nesting level exceeded %ld. To increase the limit change max_input_nesting_level in php.ini.", PG(max_input_nesting_level));
+					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variable nesting level exceeded %ld while serving script: %s. To increase the limit change max_input_nesting_level in php.ini.", PG(max_input_nesting_level), SG(request_info).path_translated);
 				}
 				free_alloca(var_orig, use_heap);
 				return;
@@ -247,7 +247,7 @@ last_value:
 			unsigned int val_len, new_val_len;
 
 			if (++count > PG(max_input_vars)) {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variables exceeded %ld. To increase the limit change max_input_vars in php.ini.", PG(max_input_vars));
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variables exceeded %ld while serving script:%s. To increase the limit change max_input_vars in php.ini.", PG(max_input_vars), SG(request_info).path_translated);
 				return;
 			}
 			var = s;
diff --git a/main/rfc1867.c b/main/rfc1867.c
index e3e6e1d..dab9794 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -882,7 +882,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
 					safe_php_register_variable(param, value, new_val_len, array_ptr, 0 TSRMLS_CC);
 				} else {
 					if (count == PG(max_input_vars) + 1) {
-						php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variables exceeded %ld. To increase the limit change max_input_vars in php.ini.", PG(max_input_vars));
+						php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variables exceeded %ld while serving script: %s. To increase the limit change max_input_vars in php.ini.", PG(max_input_vars), SG(request_info).path_translated);
 					}
 				
 					if (php_rfc1867_callback != NULL) {
-- 
1.8.1.3