From: Jani Taskinen <jani@php.net>
Date: Tue, 2 Oct 2007 16:52:53 +0000 (+0000)
Subject: - Use non-unicode input method (other one crashes for some reason in ZTS mode)
X-Git-Tag: RELEASE_2_0_0a1~1681
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ac0e1e130c07d3568e2d03901b0b4ff031e6c7a;p=php

- Use non-unicode input method (other one crashes for some reason in ZTS mode)
---

diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index a73d948a13..f3b2593ae3 100644
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -88,9 +88,9 @@
 #define YY_DECL int ini_lex(zval *ini_lval TSRMLS_DC)
 
 #define YY_INPUT(buf, result, max_size)                                    \
-if ( ((result = zend_unicode_yyinput(yyin, buf, max_size TSRMLS_CC)) == 0) \
-	&& zend_stream_ferror( yyin TSRMLS_CC) )                               \
-	YY_FATAL_ERROR( "input in flex scanner failed" );
+	if ( ((result = zend_stream_read(yyin, buf, max_size TSRMLS_CC)) == 0) \
+		&& zend_stream_ferror( yyin TSRMLS_CC) )                           \
+		YY_FATAL_ERROR( "input in flex scanner failed" );
 
 /* Globals Macros */
 #define SCNG	INI_SCNG