From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 14 May 2020 12:16:22 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e69673285055f963455f8d5ed8edead1c7c8c924;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Canonicalize bison error during ini parsing
---

e69673285055f963455f8d5ed8edead1c7c8c924
diff --cc Zend/zend_ini_parser.y
index a204496a35,db9b7d670b..5b82ec2f6a
--- a/Zend/zend_ini_parser.y
+++ b/Zend/zend_ini_parser.y
@@@ -287,11 -289,10 +287,12 @@@ static void zval_ini_dtor(zval *zv
  %}
  
  %expect 0
 +%define api.prefix {ini_}
  %define api.pure full
 +%define api.value.type {zval}
  %define parse.error verbose
  
+ %token END 0 "end of file"
  %token TC_SECTION
  %token TC_RAW
  %token TC_CONSTANT