cvs: php-src /sapi/apache_hooks mod_php5.c

sniper Thu Aug 11 20:06:44 2005 EDT Modified files: /php-src/sapi/apache_hooks mod_php5.c Log: Nuke unused code http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/mod_php5.c?r1=1.12&r2=1.13&ty=u Index: php-src/sapi/apache_hooks/mod_php5.c diff -u php-src/sapi/apache_hooks/mod_php5.c:1.12 php-src/sapi/apache_hooks/mod_php5.c:1.13 --- php-src/sapi/apache_hooks/mod_php5.c:1.12 Thu Aug 11 19:36:07 2005 +++ php-src/sapi/apache_hooks/mod_php5.c Thu Aug 11 20:06:43 2005 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php5.c,v 1.12 2005/08/11 23:36:07 andrei Exp $ */ +/* $Id: mod_php5.c,v 1.13 2005/08/12 00:06:43 sniper Exp $ */ #include "php_apache_http.h" @@ -25,10 +25,6 @@ #define SIGPIPE SIGINT #endif -#if defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) -#include "ext/mbstring/mbstring.h" -#endif /* defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) */ - #undef shutdown /* {{{ Prototypes @@ -641,10 +637,6 @@ fh.free_filename = 0; fh.type = ZEND_HANDLE_FILENAME; -#if defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) - php_mbstring_set_zend_encoding(TSRMLS_C); -#endif /* defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) */ - zend_execute_scripts(ZEND_INCLUDE TSRMLS_CC, NULL, 1, &fh); return OK; }