--- embedaddon/php/sapi/apache2handler/php_functions.c 2012/02/21 23:48:06 1.1.1.1 +++ embedaddon/php/sapi/apache2handler/php_functions.c 2012/05/29 12:34:35 1.1.1.2 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_functions.c,v 1.1.1.1 2012/02/21 23:48:06 misho Exp $ */ +/* $Id: php_functions.c,v 1.1.1.2 2012/05/29 12:34:35 misho Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -75,7 +75,7 @@ PHP_FUNCTION(virtual) int filename_len; request_rec *rr; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &filename, &filename_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p", &filename, &filename_len) == FAILURE) { return; } @@ -91,7 +91,7 @@ PHP_FUNCTION(virtual) } /* Flush everything. */ - php_end_ob_buffers(1 TSRMLS_CC); + php_output_end_all(TSRMLS_C); php_header(TSRMLS_C); /* Ensure that the ap_r* layer for the main request is flushed, to @@ -121,7 +121,7 @@ PHP_FUNCTION(apache_lookup_uri) char *filename; int filename_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &filename, &filename_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p", &filename, &filename_len) == FAILURE) { return; }