Index: automap/Automap.c =================================================================== RCS file: /repository/pecl/automap/Automap.c,v retrieving revision 1.3 diff -u -p -d -r1.3 Automap.c --- automap/Automap.c 19 Jan 2008 02:53:52 -0000 1.3 +++ automap/Automap.c 18 Sep 2008 18:16:19 -0000 @@ -1367,11 +1367,17 @@ static void Automap_html_show(Automap_Mn ,Automap_symbol_count(mp TSRMLS_CC)); php_printf("\n"); - +#ifdef PHP_OUTPUT_NEWAPI + php_output_start_default(); + zend_print_zval_r(mp->options, 0 TSRMLS_CC); + php_output_get_contents(&zv); + php_output_discard(); +#else php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC); zend_print_zval_r(mp->options, 0 TSRMLS_CC); php_ob_get_buffer (&zv TSRMLS_CC); php_end_ob_buffer (0, 0 TSRMLS_CC); +#endif p=ut_htmlspecialchars(Z_STRVAL(zv), Z_STRLEN(zv), NULL TSRMLS_CC); php_printf("

Options

\n
%s
\n",p); zval_dtor(&zv); Index: http/php_http.h =================================================================== RCS file: /repository/pecl/http/php_http.h,v retrieving revision 1.197 diff -u -p -d -r1.197 php_http.h --- http/php_http.h 31 Mar 2008 09:42:47 -0000 1.197 +++ http/php_http.h 18 Sep 2008 18:16:19 -0000 @@ -30,6 +30,10 @@ #include "php_http_std_defs.h" #include "phpstr/phpstr.h" +#ifdef PHP_OUTPUT_NEWAPI +# error "pecl_http is not yet compatible with PHP-5.3+ output handler API" +#endif + #ifdef HTTP_WANT_SAPI # if PHP_API_VERSION > 20041225 # define HTTP_HAVE_SAPI_RTIME Index: colorer/colorer.cpp =================================================================== RCS file: /repository/pecl/colorer/colorer.cpp,v retrieving revision 1.2 diff -u -p -d -r1.2 colorer.cpp --- colorer/colorer.cpp 31 Mar 2008 09:28:36 -0000 1.2 +++ colorer/colorer.cpp 18 Sep 2008 18:16:19 -0000 @@ -481,19 +481,35 @@ static void colorer_highligh_file_or_str } if (ret) { +#ifdef PHP_OUTPUT_NEWAPI + php_output_start_default(); +#else php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC); +#endif } cl_result = colorer_do_highlight(INTERNAL_FUNCTION_PARAM_PASSTHRU, colorer, source, fileName, null, real_type, callback); delete source; delete file_or_string; if (ret) { if (cl_result == SUCCESS) { +#ifdef PHP_OUTPUT_NEWAPI + php_outout_get_contents(return_value); +#else php_ob_get_buffer (return_value TSRMLS_CC); +#endif } else { +#ifdef PHP_OUTPUT_NEWAPI + php_output_discard(); +#else php_end_ob_buffer (0, 0 TSRMLS_CC); +#endif RETURN_FALSE; } +#ifdef PHP_OUTPUT_NEWAPI + php_output_discard(); +#else php_end_ob_buffer (0, 0 TSRMLS_CC); +#endif return; } else { if (cl_result == SUCCESS) {