Fixed win32 build (bug #21506).

Ilia Alshanetsky · Ilia Alshanetsky · commit d92a1f4dc102 · 2003-01-28T01:25:34.000Z
Fixed a bug that would cause garbage data to appear at the end of the
loaded apache modules list in phpinfo().
diff --git a/sapi/apache2filter/php_functions.c b/sapi/apache2filter/php_functions.c
@@ -40,8 +40,6 @@
 
 #include "php_apache.h"
 
-extern module **ap_loaded_modules;
-
 static request_rec *php_apache_lookup_uri(char *filename TSRMLS_DC)
 {
 	php_struct *ctx;
@@ -342,6 +340,9 @@ PHP_MINFO_FUNCTION(apache)
 		}
 		smart_str_appendc(&tmp1, ' ');
 	}
+	if ((tmp1.len - 1) >= 0) {
+		tmp1.c[tmp1.len - 1] = '\0';
+	}
             
 	php_info_print_table_start();
 	if (apv && *apv) {

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@`
`40`	`40`
`41`	`41`	`#include "php_apache.h"`
`42`	`42`
`43`		`-extern module **ap_loaded_modules;`
`44`		`-`
`45`	`43`	`static request_rec php_apache_lookup_uri(char filename TSRMLS_DC)`
`46`	`44`	`{`
`47`	`45`	`php_struct *ctx;`
`@@ -342,6 +340,9 @@ PHP_MINFO_FUNCTION(apache)`
`342`	`340`	`}`
`343`	`341`	`smart_str_appendc(&tmp1, ' ');`
`344`	`342`	`}`
	`343`	`+ if ((tmp1.len - 1) >= 0) {`
	`344`	`+ tmp1.c[tmp1.len - 1] = '\0';`
	`345`	`+ }`
`345`	`346`
`346`	`347`	`php_info_print_table_start();`
`347`	`348`	`if (apv && *apv) {`