[PHP-CVS] com php-src: Fixed function name: ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
Commit:d8d5f9a9f50a98e3a44218f8672a6516a9e8dfe7
Author:Gustavo Lopes glo...@safelinq.com Mon, 23 Jul 2012
16:46:28 +0200
Parents: c052b9c99ac09069d3f7c8ca5904c499ec842336
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=d8d5f9a9f50a98e3a44218f8672a6516a9e8dfe7
Log:
Fixed function name
Changed paths:
M ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
Diff:
diff --git a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
index f2a39ba..61fb574 100644
--- a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
+++ b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
@@ -29,7 +29,7 @@ static inline RuleBasedBreakIterator
*fetch_rbbi(BreakIterator_object *bio) {
return (RuleBasedBreakIterator*)bio-biter;
}
-static void _php_intlgregcal_constructor_body(INTERNAL_FUNCTION_PARAMETERS)
+static void _php_intlrbbi_constructor_body(INTERNAL_FUNCTION_PARAMETERS)
{
zval*object = getThis();
char*rules;
@@ -96,7 +96,7 @@ U_CFUNC PHP_METHOD(IntlRuleBasedBreakIterator, __construct)
return_value = getThis();
//changes this to IS_NULL (without first destroying) if there's an error
- _php_intlgregcal_constructor_body(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+ _php_intlrbbi_constructor_body(INTERNAL_FUNCTION_PARAM_PASSTHRU);
if (Z_TYPE_P(return_value) == IS_NULL) {
zend_object_store_ctor_failed(orig_this TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Do not fetch default locale once on minit or rinit: ext/intl/collator/collator_create.c ext/intl/dateformat/dateformat_create.cpp ext/intl/formatter/formatter_main.c ext/intl/lo
Commit:c052b9c99ac09069d3f7c8ca5904c499ec842336
Author:Gustavo Lopes glo...@safelinq.com Mon, 23 Jul 2012
16:38:27 +0200
Parents: 0dfcc3e798cd54714f792bf7507c37b96146ee1b
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=c052b9c99ac09069d3f7c8ca5904c499ec842336
Log:
Do not fetch default locale once on minit or rinit
The default locale is now requested to ICU when it's needed by using
intl_get_default_locale().
Changed paths:
M ext/intl/collator/collator_create.c
M ext/intl/dateformat/dateformat_create.cpp
M ext/intl/formatter/formatter_main.c
M ext/intl/locale/locale_methods.c
M ext/intl/msgformat/msgformat.c
M ext/intl/msgformat/msgformat_format.c
M ext/intl/msgformat/msgformat_parse.c
M ext/intl/php_intl.c
Diff:
diff --git a/ext/intl/collator/collator_create.c
b/ext/intl/collator/collator_create.c
index 0f0cc19..a3b7015 100755
--- a/ext/intl/collator/collator_create.c
+++ b/ext/intl/collator/collator_create.c
@@ -48,7 +48,7 @@ static void collator_ctor(INTERNAL_FUNCTION_PARAMETERS)
co = (Collator_object *) zend_object_store_get_object( object TSRMLS_CC
);
if(locale_len == 0) {
- locale = INTL_G(default_locale);
+ locale = intl_locale_get_default(TSRMLS_C);
}
/* Open ICU collator. */
diff --git a/ext/intl/dateformat/dateformat_create.cpp
b/ext/intl/dateformat/dateformat_create.cpp
index fef93e9..7fefbe7 100644
--- a/ext/intl/dateformat/dateformat_create.cpp
+++ b/ext/intl/dateformat/dateformat_create.cpp
@@ -40,7 +40,7 @@ static void datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
{
zval*object;
-char *locale_str;
+ const char *locale_str;
int locale_len = 0;
Locale locale;
long date_type = 0;
@@ -72,7 +72,7 @@ static void datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
if (locale_len == 0) {
- locale_str = INTL_G(default_locale);
+ locale_str = intl_locale_get_default(TSRMLS_C);
}
locale = Locale::createFromName(locale_str);
diff --git a/ext/intl/formatter/formatter_main.c
b/ext/intl/formatter/formatter_main.c
index 8fa1756..96f1bcf 100755
--- a/ext/intl/formatter/formatter_main.c
+++ b/ext/intl/formatter/formatter_main.c
@@ -56,7 +56,7 @@ static void numfmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
}
if(locale_len == 0) {
- locale = INTL_G(default_locale);
+ locale = intl_locale_get_default(TSRMLS_C);
}
/* Create an ICU number formatter. */
diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c
index 936e314..d1a86d8 100755
--- a/ext/intl/locale/locale_methods.c
+++ b/ext/intl/locale/locale_methods.c
@@ -390,7 +390,7 @@ static void get_icu_value_src_php( char* tag_name,
INTERNAL_FUNCTION_PARAMETERS)
}
if(loc_name_len == 0) {
- loc_name = INTL_G(default_locale);
+ loc_name = intl_locale_get_default(TSRMLS_C);
}
/* Call ICU get */
@@ -496,7 +496,7 @@ static void get_icu_disp_value_src_php( char* tag_name,
INTERNAL_FUNCTION_PARAME
}
if(loc_name_len == 0) {
- loc_name = INTL_G(default_locale);
+ loc_name = intl_locale_get_default(TSRMLS_C);
}
if( strcmp(tag_name, DISP_NAME) != 0 ){
@@ -518,7 +518,7 @@ static void get_icu_disp_value_src_php( char* tag_name,
INTERNAL_FUNCTION_PARAME
/* Check if disp_loc_name passed , if not use default locale */
if( !disp_loc_name){
- disp_loc_name = estrdup(INTL_G(default_locale));
+ disp_loc_name = estrdup(intl_locale_get_default(TSRMLS_C));
free_loc_name = 1;
}
@@ -690,7 +690,7 @@ PHP_FUNCTION( locale_get_keywords )
}
if(loc_name_len == 0) {
-loc_name = INTL_G(default_locale);
+loc_name = intl_locale_get_default(TSRMLS_C);
}
/* Get the keywords */
@@ -1097,7 +1097,7 @@ PHP_FUNCTION(locale_parse)
}
if(loc_name_len == 0) {
-loc_name = INTL_G(default_locale);
+loc_name = intl_locale_get_default(TSRMLS_C);
}
array_init( return_value );
@@ -1145,7 +1145,7 @@ PHP_FUNCTION(locale_get_all_variants)
}
if(loc_name_len == 0) {
- loc_name = INTL_G(default_locale);
+ loc_name = intl_locale_get_default(TSRMLS_C);
}
@@ -1251,7 +1251,7 @@ PHP_FUNCTION(locale_filter_matches)
}
if(loc_range_len == 0) {
- loc_range = INTL_G(default_locale);
+ loc_range = intl_locale_get_default(TSRMLS_C);
}
if( strcmp(loc_range,*)==0){
@@ -1537,7 +1537,7 @@ PHP_FUNCTION(locale_lookup)
}
if(loc_range_len == 0) {
-
Re: [PHP-CVS] com php-src: Add ini setting intl.explicit_cleanup: ext/intl/php_intl.c
On Mon, Jul 23, 2012 at 3:36 PM, Gustavo André dos Santos Lopes cataphr...@php.net wrote: Commit:0dfcc3e798cd54714f792bf7507c37b96146ee1b Author:Gustavo Lopes glo...@safelinq.com Mon, 23 Jul 2012 16:36:24 +0200 Parents: f43e4f9883047b4be6bd01bf80f070682131ad5f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0dfcc3e798cd54714f792bf7507c37b96146ee1b Log: Add ini setting intl.explicit_cleanup This is to help with looking for leaks. If set to true, this ini setting forces a call to u_cleanup() on module shutdown. hhhh. What is the usecase for that? -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Add ini setting intl.explicit_cleanup: ext/intl/php_intl.c
On Mon, 23 Jul 2012 16:15:42 +0100, Hannes Magnusson wrote: Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0dfcc3e798cd54714f792bf7507c37b96146ee1b Log: Add ini setting intl.explicit_cleanup This is to help with looking for leaks. If set to true, this ini setting forces a call to u_cleanup() on module shutdown. hhhh. What is the usecase for that? Detecting leaks with valgrind. Otherwise, one gets lots of false positives. -- Gustavo Lopes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Add ini setting intl.explicit_cleanup: ext/intl/php_intl.c
On Mon, Jul 23, 2012 at 4:32 PM, Gustavo Lopes glo...@nebm.ist.utl.pt wrote: On Mon, 23 Jul 2012 16:15:42 +0100, Hannes Magnusson wrote: Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0dfcc3e798cd54714f792bf7507c37b96146ee1b Log: Add ini setting intl.explicit_cleanup This is to help with looking for leaks. If set to true, this ini setting forces a call to u_cleanup() on module shutdown. hhhh. What is the usecase for that? Detecting leaks with valgrind. Otherwise, one gets lots of false positives. So its a developers feature.. don't we usually use environment variables for this? I don't think a ini setting for it is a good idea. -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Add ini setting intl.explicit_cleanup: ext/intl/php_intl.c
Em Mon, 23 Jul 2012 17:34:44 +0200, Hannes Magnusson hannes.magnus...@gmail.com escreveu: On Mon, Jul 23, 2012 at 4:32 PM, Gustavo Lopes glo...@nebm.ist.utl.pt wrote: On Mon, 23 Jul 2012 16:15:42 +0100, Hannes Magnusson wrote: Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0dfcc3e798cd54714f792bf7507c37b96146ee1b Log: Add ini setting intl.explicit_cleanup This is to help with looking for leaks. If set to true, this ini setting forces a call to u_cleanup() on module shutdown. hhhh. What is the usecase for that? Detecting leaks with valgrind. Otherwise, one gets lots of false positives. So its a developers feature.. don't we usually use environment variables for this? I don't think a ini setting for it is a good idea. Honestly, that didn't occur to me. I'll change it to an environment variable. -- Gustavo Lopes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: folders: ext/zlib/zlib.c
Commit:c20b2ab0bd8eae770088fca9dff50da76c2117e4
Author:Xinchen Hui larue...@php.net Tue, 24 Jul 2012 13:37:44
+0800
Parents: a88eca53f708602384cae147a8376352d5909d90
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=c20b2ab0bd8eae770088fca9dff50da76c2117e4
Log:
folders
Changed paths:
M ext/zlib/zlib.c
Diff:
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 9cd1f37..eac757b 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -690,6 +690,7 @@ PHP_ZLIB_ENCODE_FUNC(zlib_encode, 0);
/* {{{ proto binary zlib_decode(binary data[, int max_decoded_len])
Uncompress any raw/gzip/zlib encoded data */
PHP_ZLIB_DECODE_FUNC(zlib_decode, PHP_ZLIB_ENCODING_ANY);
+/* }}} */
/* NOTE: The naming of these userland functions was quite unlucky */
/* {{{ proto binary gzdeflate(binary data[, int level = -1[, int encoding =
ZLIB_ENCODING_RAW])
@@ -701,18 +702,22 @@ PHP_ZLIB_ENCODE_FUNC(gzdeflate, PHP_ZLIB_ENCODING_RAW);
Encode data with the gzip encoding */
PHP_ZLIB_ENCODE_FUNC(gzencode, PHP_ZLIB_ENCODING_GZIP);
/* }}} */
+
/* {{{ proto binary gzcompress(binary data[, int level = -1[, int encoding =
ZLIB_ENCODING_DEFLATE])
Encode data with the zlib encoding */
PHP_ZLIB_ENCODE_FUNC(gzcompress, PHP_ZLIB_ENCODING_DEFLATE);
/* }}} */
+
/* {{{ proto binary gzinflate(binary data[, int max_decoded_len])
Decode raw deflate encoded data */
PHP_ZLIB_DECODE_FUNC(gzinflate, PHP_ZLIB_ENCODING_RAW);
/* }}} */
+
/* {{{ proto binary gzdecode(binary data[, int max_decoded_len])
Decode gzip encoded data */
PHP_ZLIB_DECODE_FUNC(gzdecode, PHP_ZLIB_ENCODING_GZIP);
/* }}} */
+
/* {{{ proto binary gzuncompress(binary data[, int max_decoded_len])
Decode zlib encoded data */
PHP_ZLIB_DECODE_FUNC(gzuncompress, PHP_ZLIB_ENCODING_DEFLATE);
@@ -967,12 +972,14 @@ static PHP_RINIT_FUNCTION(zlib)
}
/* }}} */
+/* {{{ PHP_RSHUTDOWN_FUNCTION */
static PHP_RSHUTDOWN_FUNCTION(zlib)
{
php_zlib_cleanup_ob_gzhandler_mess(TSRMLS_C);
return SUCCESS;
}
+/* }}} */
/* {{{ PHP_MINFO_FUNCTION */
static PHP_MINFO_FUNCTION(zlib)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: correct the author name introduced in bb685512: ext/zlib/zlib.c
Commit:6126ac44b5348dc7aac9d2c67f8e927211dfee2f Author:Xinchen Hui larue...@php.net Tue, 24 Jul 2012 13:39:46 +0800 Parents: 38fb89f91d7046d25cfe05ec7954a64f11ba755d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6126ac44b5348dc7aac9d2c67f8e927211dfee2f Log: correct the author name introduced in bb685512 Changed paths: M ext/zlib/zlib.c Diff: diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index a0bec9c..eac757b 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -13,7 +13,7 @@ | lice...@php.net so we can mail you a copy immediately. | +--+ | Authors: Rasmus Lerdorf ras...@lerdorf.on.ca | - | Stefan R�hrich s...@linux.de| + | Stefan Röhrich s...@linux.de| | Zeev Suraski z...@zend.com| | Jade Nicoletti nicole...@nns.ch | | Michael Wallner m...@php.net | -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4': ext/zlib/zlib.c
Commit:38fb89f91d7046d25cfe05ec7954a64f11ba755d Author:Xinchen Hui larue...@php.net Tue, 24 Jul 2012 13:39:02 +0800 Parents: ae3a827bf9b14c88bb7d52a19ad74bf0f074dc73 2abc4c2f6fabfc81d12380170dc5ec7be9314a61 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=38fb89f91d7046d25cfe05ec7954a64f11ba755d Log: Merge branch 'PHP-5.4' Changed paths: MM ext/zlib/zlib.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
