diff options
| author | Marcus Boerger <helly@php.net> | 2008-03-16 21:06:55 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2008-03-16 21:06:55 +0000 |
| commit | af316021e8f69896cd0d246114962e48b973972f (patch) | |
| tree | 7bf0e294155631040c03c6b76ab3b96dce967b94 /sapi/apache | |
| parent | eb8f83a98e7fbfa206601fa5016cc211eb78e024 (diff) | |
| download | php-git-af316021e8f69896cd0d246114962e48b973972f.tar.gz | |
- Rewrite scanner to be based on re2c instead of flex
The full patch is available as:
http://php.net/~helly/php-re2c-5.3-20080316.diff.txt
This is against php-re2c repository version 98
An older patch against version 97 is available under:
http://php.net/~helly/php-re2c-97-20080316.diff.txt
Diffstat (limited to 'sapi/apache')
| -rw-r--r-- | sapi/apache/mod_php5.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c index 2763d75c0e..d84b11e548 100644 --- a/sapi/apache/mod_php5.c +++ b/sapi/apache/mod_php5.c @@ -26,10 +26,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 @@ -589,10 +585,6 @@ static int send_php(request_rec *r, int display_source_mode, char *filename) fh.free_filename = 0; fh.type = ZEND_HANDLE_FILENAME; -#if defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) - php_mb_set_zend_encoding(TSRMLS_C); -#endif /* defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) */ - zend_execute_scripts(ZEND_INCLUDE TSRMLS_CC, NULL, 1, &fh); return OK; } |