[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/ browscap.c
cataphract Fri, 03 Jun 2011 09:39:45 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=311764
Log:
Merge of fix for bug #54918 (r311745, scottmac) to 5.3.
Bug: http://bugs.php.net/54918 (Closed) browscap issues
Changed paths:
U php/php-src/branches/PHP_5_3/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.c2011-06-03
08:58:52 UTC (rev 311763)
+++ php/php-src/branches/PHP_5_3/ext/standard/browscap.c2011-06-03
09:39:45 UTC (rev 311764)
@@ -334,18 +334,18 @@
{
char *browscap = INI_STR(browscap);
- if (browscap browscap[0]) {
- if (browscap_read_file(browscap, global_bdata, 1 TSRMLS_CC) ==
FAILURE) {
- return FAILURE;
- }
- }
-
#ifdef ZTS
ts_allocate_id(browscap_globals_id, sizeof(browser_data),
(ts_allocate_ctor)browscap_globals_ctor, NULL);
#endif
/* ctor call not really needed for non-ZTS */
+ if (browscap browscap[0]) {
+ if (browscap_read_file(browscap, global_bdata, 1 TSRMLS_CC) ==
FAILURE) {
+ return FAILURE;
+ }
+ }
+
return SUCCESS;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/browscap.c branches/PHP_5_4/ext/standard/browscap.c trunk/ext/standard/browscap.c
cataphract Thu, 02 Jun 2011 08:46:40 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=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.c2011-06-02
07:40:26 UTC (rev 311729)
+++ php/php-src/branches/PHP_5_3/ext/standard/browscap.c2011-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.c2011-06-02
07:40:26 UTC (rev 311729)
+++ php/php-src/branches/PHP_5_4/ext/standard/browscap.c2011-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
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/ browscap.c
tony2001 Sun, 01 May 2011 19:46:27 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=310693
Log:
fix ZTS build for 5_3, too
Changed paths:
U php/php-src/branches/PHP_5_3/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.c2011-05-01
19:22:24 UTC (rev 310692)
+++ php/php-src/branches/PHP_5_3/ext/standard/browscap.c2011-05-01
19:46:27 UTC (rev 310693)
@@ -348,7 +348,7 @@
#ifdef ZTS
ts_allocate_id(browscap_globals_id, sizeof(browser_data),
- browscap_globals_ctor, NULL);
+ (ts_allocate_ctor)browscap_globals_ctor, NULL);
#endif
/* ctor call not really needed for non-ZTS */
@@ -360,7 +360,7 @@
{
browser_data *bdata = BROWSCAP_G(activation_bdata);
if (bdata-filename[0] != '\0') {
- browscap_bdata_dtor(bdata, 0);
+ browscap_bdata_dtor(bdata, 0 TSRMLS_CC);
}
return SUCCESS;
@@ -369,7 +369,7 @@
PHP_MSHUTDOWN_FUNCTION(browscap) /* {{{ */
{
- browscap_bdata_dtor(global_bdata, 1);
+ browscap_bdata_dtor(global_bdata, 1 TSRMLS_CC);
return SUCCESS;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
