From: Zeev Suraski <zeev@php.net>
Date: Sat, 22 May 1999 10:56:36 +0000 (+0000)
Subject: * Minor fixes
X-Git-Tag: BEFORE_REMOVING_GC_STEP1~297
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b4d71205bb02bad8d661a260e800e137340f8f7;p=php

* Minor fixes
* Better handling for multiple repeated memory leaks (libzend updated)
---

diff --git a/cgi_main.c b/cgi_main.c
index 076c8fee5b..26e15898fe 100644
--- a/cgi_main.c
+++ b/cgi_main.c
@@ -395,6 +395,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
 	if (cgi || request_info.filename) {
 		file_handle.filename = request_info.filename;
 		file_handle.handle.fp = php3_fopen_for_parser();
+		SG(request_info).path_translated = file_handle.filename;
 	}
 
 	if (cgi && !file_handle.handle.fp) {
diff --git a/main/main.c b/main/main.c
index f52b4365a2..30310f24e1 100644
--- a/main/main.c
+++ b/main/main.c
@@ -569,16 +569,25 @@ static void php_message_handler_for_zend(long message, void *data)
 		case ZMSG_FAILED_HIGHLIGHT_FOPEN:
 			php3_error(E_WARNING, "Failed opening '%s' for highlighting", php3_strip_url_passwd((char *) data));
 			break;
-		case ZMSG_MEMORY_LEAK_DETECTED: {
+		case ZMSG_MEMORY_LEAK_DETECTED:
+		case ZMSG_MEMORY_LEAK_REPEATED: {
 				ELS_FETCH();
 				SLS_FETCH();
 
 				if (EG(error_reporting)&E_WARNING) {
 #if ZEND_DEBUG
-					mem_header *t = (mem_header *) data;
 					char memory_leak_buf[512];
+					SLS_FETCH();
 
-					snprintf(memory_leak_buf, 512, "Freeing 0x%0.8X (%d bytes), allocated in %s on line %d<br>\n",(void *)((char *)t+sizeof(mem_header)+PLATFORM_PADDING),t->size,t->filename,t->lineno);
+					if (message==ZMSG_MEMORY_LEAK_DETECTED) {
+						mem_header *t = (mem_header *) data;
+
+						snprintf(memory_leak_buf, 512, "%s:  Freeing 0x%0.8X (%d bytes), allocated in %s on line %d<br>\n", SG(request_info).path_translated, (void *)((char *)t+sizeof(mem_header)+PLATFORM_PADDING),t->size,t->filename,t->lineno);
+					} else {
+						uint leak_count = (uint) data;
+
+						snprintf(memory_leak_buf, 512, "%s:  Last leak repeated %d time%s\n", SG(request_info).path_translated, leak_count, (leak_count>1?"s":""));
+					}
 #	if WIN32||WINNT
 					OutputDebugString(memory_leak_buf);
 #	else
@@ -1213,7 +1222,6 @@ PHPAPI int apache_php3_module_main(request_rec *r, int fd, int display_source_mo
 #endif
 	SLS_FETCH();
 
-	fprintf(stderr, "%d request startup\n", getpid());
 	if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) {
 		return FAILURE;
 	}
@@ -1221,10 +1229,8 @@ PHPAPI int apache_php3_module_main(request_rec *r, int fd, int display_source_mo
 	file_handle.type = ZEND_HANDLE_FD;
 	file_handle.handle.fd = fd;
 	file_handle.filename = SG(request_info).path_translated;
-	fprintf(stderr, "%d executing script\n", getpid());
 	(void) php_execute_script(&file_handle CLS_CC ELS_CC);
 	
-	fprintf(stderr, "%d Terminated successfully, sending headers\n", getpid());
 	php3_header();			/* Make sure headers have been sent */
 	zend_end_ob_buffering(1);
 	fprintf(stderr, "%d all done\n", getpid());