cataphract Thu, 02 Jun 2011 08:46:40 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=311730
Log: - Fixed double registering of browscap ini directive. See bug #54896. Bug: http://bugs.php.net/54896 (Assigned) Connection to localhost doesn't work in Apache SAPI but works in CLI and CGI Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/browscap.c U php/php-src/branches/PHP_5_4/ext/standard/browscap.c U php/php-src/trunk/ext/standard/browscap.c Modified: php/php-src/branches/PHP_5_3/ext/standard/browscap.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/browscap.c 2011-06-02 07:40:26 UTC (rev 311729) +++ php/php-src/branches/PHP_5_3/ext/standard/browscap.c 2011-06-02 08:46:40 UTC (rev 311730) @@ -330,16 +330,10 @@ } /* }}} */ -PHP_INI_BEGIN() - PHP_INI_ENTRY("browscap", NULL, PHP_INI_SYSTEM, OnChangeBrowscap) -PHP_INI_END() - PHP_MINIT_FUNCTION(browscap) /* {{{ */ { char *browscap = INI_STR("browscap"); - REGISTER_INI_ENTRIES(); - if (browscap && browscap[0]) { if (browscap_read_file(browscap, &global_bdata, 1 TSRMLS_CC) == FAILURE) { return FAILURE; Modified: php/php-src/branches/PHP_5_4/ext/standard/browscap.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/standard/browscap.c 2011-06-02 07:40:26 UTC (rev 311729) +++ php/php-src/branches/PHP_5_4/ext/standard/browscap.c 2011-06-02 08:46:40 UTC (rev 311730) @@ -330,16 +330,10 @@ } /* }}} */ -PHP_INI_BEGIN() - PHP_INI_ENTRY("browscap", NULL, PHP_INI_SYSTEM, OnChangeBrowscap) -PHP_INI_END() - PHP_MINIT_FUNCTION(browscap) /* {{{ */ { char *browscap = INI_STR("browscap"); - REGISTER_INI_ENTRIES(); - if (browscap && browscap[0]) { if (browscap_read_file(browscap, &global_bdata, 1 TSRMLS_CC) == FAILURE) { return FAILURE; Modified: php/php-src/trunk/ext/standard/browscap.c =================================================================== --- php/php-src/trunk/ext/standard/browscap.c 2011-06-02 07:40:26 UTC (rev 311729) +++ php/php-src/trunk/ext/standard/browscap.c 2011-06-02 08:46:40 UTC (rev 311730) @@ -330,16 +330,10 @@ } /* }}} */ -PHP_INI_BEGIN() - PHP_INI_ENTRY("browscap", NULL, PHP_INI_SYSTEM, OnChangeBrowscap) -PHP_INI_END() - PHP_MINIT_FUNCTION(browscap) /* {{{ */ { char *browscap = INI_STR("browscap"); - REGISTER_INI_ENTRIES(); - if (browscap && browscap[0]) { if (browscap_read_file(browscap, &global_bdata, 1 TSRMLS_CC) == FAILURE) { return FAILURE;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
