Merge branch 'PHP-5.3' into PHP-5.4

laruence · laruence · commit b0f09b69d38a · 2012-04-06T21:57:56.000+08:00
* PHP-5.3:
  Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
diff --git a/main/SAPI.c b/main/SAPI.c
@@ -1016,7 +1016,9 @@ SAPI_API char *sapi_getenv(char *name, size_t name_len TSRMLS_DC)
 		} else {
 			return NULL;
 		}
-		sapi_module.input_filter(PARSE_ENV, name, &value, strlen(value), NULL TSRMLS_CC);
+		if (sapi_module.input_filter) {
+			sapi_module.input_filter(PARSE_ENV, name, &value, strlen(value), NULL TSRMLS_CC);
+		}
 		return value;
 	}
 	return NULL;

Original file line number	Diff line number	Diff line change
`@@ -1016,7 +1016,9 @@ SAPI_API char sapi_getenv(char name, size_t name_len TSRMLS_DC)`
`1016`	`1016`	`} else {`
`1017`	`1017`	`return NULL;`
`1018`	`1018`	`}`
`1019`		`- sapi_module.input_filter(PARSE_ENV, name, &value, strlen(value), NULL TSRMLS_CC);`
	`1019`	`+ if (sapi_module.input_filter) {`
	`1020`	`+ sapi_module.input_filter(PARSE_ENV, name, &value, strlen(value), NULL TSRMLS_CC);`
	`1021`	`+ }`
`1020`	`1022`	`return value;`
`1021`	`1023`	`}`
`1022`	`1024`	`return NULL;`