Merge branch 'PHP-5.5'

* PHP-5.5: Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)
php · Oct 21, 2013 · b3a2b44 · b3a2b44
2 parents d15cedf + b6ceea4
commit b3a2b44
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/php.ini-development b/php.ini-development
@@ -1906,7 +1906,7 @@ ldap.max_links = -1
 ;opcache.revalidate_path=0
 
 ; If disabled, all PHPDoc comments are dropped from the code to reduce the
- ;size of the optimized code.
+; size of the optimized code.
 ;opcache.save_comments=1
 
 ; If disabled, PHPDoc comments are not loaded from SHM, so "Doc Comments"

diff --git a/php.ini-production b/php.ini-production
@@ -1906,7 +1906,7 @@ ldap.max_links = -1
 ;opcache.revalidate_path=0
 
 ; If disabled, all PHPDoc comments are dropped from the code to reduce the
- ;size of the optimized code.
+; size of the optimized code.
 ;opcache.save_comments=1
 
 ; If disabled, PHPDoc comments are not loaded from SHM, so "Doc Comments"