[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sat Jun 13 01:33:03 2009 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1501r2=1.1502diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1501 ZendEngine2/ChangeLog:1.1502 --- ZendEngine2/ChangeLog:1.1501Wed Jun 10 01:32:52 2009 +++ ZendEngine2/ChangeLog Sat Jun 13 01:33:03 2009 @@ -1,3 +1,27 @@ +2009-06-12 Felipe Pena felipe...@gmail.com + +* zend_object_handlers.c + zend_object_handlers.c: + - Constified method_name arg. in zend_get_user_call_function() and + zend_get_user_callstatic_function() + +* (PHP_5_2) + zend_object_handlers.c: + - MFH some changes (from last fix on 5.3+) + - Constified method_name arg in zend_get_user_call_function() + +* (PHP_5_3) + zend_object_handlers.c + tests/bug48533.phpt: + MFH: Fixed bug #48533 (__callStatic is not invoked for private/protected + methods) + +* zend_object_handlers.c + tests/bug48533.phpt + tests/bug48533.phpt: + - Fixed bug #48533 (__callStatic is not invoked for private/protected + methods) + 2009-06-09 Pierre-Alain Joye pierre@gmail.com * (PHP_5_3) @@ -29098,7 +29122,7 @@ 2003-06-10 Jani Taskinen sni...@iki.fi * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1501 2009/06/10 01:32:52 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1502 2009/06/13 01:33:03 changelog Exp $ tag 2003-06-10 James Cox ja...@imajes.info @@ -30822,7 +30846,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1501 2009/06/10 01:32:52 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1502 2009/06/13 01:33:03 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky i...@prohost.org
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard php_string.h string.c /ext/standard/tests/strings bug47546.phpt
Matt Wilmas wrote: Hi Dmitry, Antony, Fixed, thanks. Matt Wilmas wrote: mattwil Wed Apr 1 17:05:37 2009 UTC Removed files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings bug47546.phpt Modified files: /php-src NEWS /php-src/ext/standard php_string.h string.c Log: MFH: explode() stuff: - Fixed bug #47560 (explode()'s limit parameter odd behaviour) by reverting change for bug #47546 In what state is this now? php_explode() does not work as expected with limit=-1 and php_explode_negative_limit() is not exported in php_string.h Mike -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard php_string.h string.c /ext/standard/tests/strings bug47546.phpt
2009/6/12 Michael Wallner m...@php.net:
Matt Wilmas wrote:
Hi Dmitry, Antony,
Fixed, thanks.
Matt Wilmas wrote:
mattwil Wed Apr 1 17:05:37 2009 UTC
Removed files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/strings bug47546.phpt
Modified files: /php-src NEWS /php-src/ext/standard
php_string.h string.c Log:
MFH: explode() stuff:
- Fixed bug #47560 (explode()'s limit parameter odd behaviour) by
reverting change for bug #47546
In what state is this now?
php_explode() does not work as expected with limit=-1 and
php_explode_negative_limit() is not exported in php_string.h
Mike
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
From a user's perspective, I would say that explode() now works as I
would expect.
When a valid delimiter is supplied with no limit, then the result is
the same as if the limit was the count of items after the split.
For negative limits (with a valid delimiter), the result is chopped by
the abs($limit).
?php
$string = 'one.two.three.four';
$results = array();
foreach(array('Valid' = '.', 'Invalid' = '_') as $valid = $delimiter) {
$results[$valid]['No Limit'] = explode($delimiter, $string);
foreach(range(-4, 4) as $limit) {
$results[$valid][$limit] = explode($delimiter, $string, $limit);
}
}
print_r($results);
?
outputs what I think is correct.
Array
(
[Valid] = Array
(
[No Limit] = Array
(
[0] = one
[1] = two
[2] = three
[3] = four
)
[-4] = Array
(
)
[-3] = Array
(
[0] = one
)
[-2] = Array
(
[0] = one
[1] = two
)
[-1] = Array
(
[0] = one
[1] = two
[2] = three
)
[0] = Array
(
[0] = one.two.three.four
)
[1] = Array
(
[0] = one.two.three.four
)
[2] = Array
(
[0] = one
[1] = two.three.four
)
[3] = Array
(
[0] = one
[1] = two
[2] = three.four
)
[4] = Array
(
[0] = one
[1] = two
[2] = three
[3] = four
)
)
[Invalid] = Array
(
[No Limit] = Array
(
[0] = one.two.three.four
)
[-4] = Array
(
)
[-3] = Array
(
)
[-2] = Array
(
)
[-1] = Array
(
)
[0] = Array
(
[0] = one.two.three.four
)
[1] = Array
(
[0] = one.two.three.four
)
[2] = Array
(
[0] = one.two.three.four
)
[3] = Array
(
[0] = one.two.three.four
)
[4] = Array
(
[0] = one.two.three.four
)
)
)
--
-
Richard Quadling
Zend Certified Engineer : http://zend.com/zce.php?c=ZEND002498r=213474731
Standing on the shoulders of some very clever giants!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_enum_n_def.h mysqlnd_statistics.c mysqlnd_statistics.h mysqlnd_wireprotocol.c
andrey Fri Jun 12 13:24:37 2009 UTC
Modified files:
/php-src/ext/mysqlndmysqlnd_enum_n_def.h mysqlnd_statistics.c
mysqlnd_statistics.h mysqlnd_wireprotocol.c
Log:
Fix crash when tracing is enabled. Position after buffer was used also
direct usage of MYSQLND_STRING pointer instead of the s property of the
structure.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_enum_n_def.h?r1=1.13r2=1.14diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_enum_n_def.h
diff -u php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.13
php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.14
--- php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.13 Thu Jan 22 20:57:31 2009
+++ php-src/ext/mysqlnd/mysqlnd_enum_n_def.hFri Jun 12 13:24:37 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_enum_n_def.h,v 1.13 2009/01/22 20:57:31 johannes Exp $ */
+/* $Id: mysqlnd_enum_n_def.h,v 1.14 2009/06/12 13:24:37 andrey Exp $ */
#ifndef MYSQLND_ENUM_N_DEF_H
#define MYSQLND_ENUM_N_DEF_H
@@ -142,7 +142,6 @@
MYSQLND_OPT_NET_READ_BUFFER_SIZE = 203,
} enum_mysqlnd_option;
-
typedef enum mysqlnd_field_types
{
MYSQL_TYPE_DECIMAL,
@@ -177,7 +176,6 @@
/* Please update this if there is a new type after MYSQL_TYPE_GEOMETRY */
#define MYSQL_TYPE_LASTMYSQL_TYPE_GEOMETRY
-
typedef enum mysqlnd_server_option
{
MYSQL_OPTION_MULTI_STATEMENTS_ON,
@@ -241,7 +239,6 @@
/* see mysqlnd_charset.c for more information */
#define MYSQLND_BINARY_CHARSET_NR 63
-
/*
/- CONN_CLOSE ---\
| ^ \
@@ -261,7 +258,6 @@
CONN_QUIT_SENT, /* object is destroyed at this stage */
} enum_mysqlnd_connection_state;
-
typedef enum mysqlnd_stmt_state
{
MYSQLND_STMT_INITTED = 0,
@@ -272,13 +268,11 @@
MYSQLND_STMT_USER_FETCHING, /* fetch_row_buff or fetch_row_unbuf */
} enum_mysqlnd_stmt_state;
-
typedef enum param_bind_flags
{
MYSQLND_PARAM_BIND_BLOB_USED = 1
} enum_param_bind_flags;
-
/* PS */
enum mysqlnd_stmt_attr
{
@@ -286,7 +280,6 @@
STMT_ATTR_CURSOR_TYPE,
STMT_ATTR_PREFETCH_ROWS
};
-
enum myslqnd_cursor_type
{
CURSOR_TYPE_NO_CURSOR= 0,
@@ -294,7 +287,6 @@
CURSOR_TYPE_FOR_UPDATE= 2,
CURSOR_TYPE_SCROLLABLE= 4
};
-
typedef enum mysqlnd_connection_close_type
{
MYSQLND_CLOSE_EXPLICIT = 0,
@@ -303,7 +295,6 @@
MYSQLND_CLOSE_LAST /* for checking, should always be last */
} enum_connection_close_type;
-
typedef enum mysqlnd_collected_stats
{
STAT_BYTES_SENT,
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_statistics.c?r1=1.12r2=1.13diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_statistics.c
diff -u php-src/ext/mysqlnd/mysqlnd_statistics.c:1.12
php-src/ext/mysqlnd/mysqlnd_statistics.c:1.13
--- php-src/ext/mysqlnd/mysqlnd_statistics.c:1.12 Mon Mar 30 19:43:47 2009
+++ php-src/ext/mysqlnd/mysqlnd_statistics.cFri Jun 12 13:24:37 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_statistics.c,v 1.12 2009/03/30 19:43:47 felipe Exp $ */
+/* $Id: mysqlnd_statistics.c,v 1.13 2009/06/12 13:24:37 andrey Exp $ */
#include php.h
#include mysqlnd.h
#include mysqlnd_priv.h
@@ -168,7 +168,7 @@
UChar *ustr, *tstr;
int ulen, tlen;
#endif
- char tmp[22];
+ char tmp[25];
sprintf((char *)tmp, MYSQLND_LLU_SPEC, stats-values[i]);
#if PHP_MAJOR_VERSION = 6
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_statistics.h?r1=1.13r2=1.14diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_statistics.h
diff -u php-src/ext/mysqlnd/mysqlnd_statistics.h:1.13
php-src/ext/mysqlnd/mysqlnd_statistics.h:1.14
--- php-src/ext/mysqlnd/mysqlnd_statistics.h:1.13 Fri May 29 08:05:21 2009
+++ php-src/ext/mysqlnd/mysqlnd_statistics.hFri Jun 12 13:24:37 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_statistics.h,v 1.13 2009/05/29 08:05:21 andrey Exp $ */
+/* $Id: mysqlnd_statistics.h,v 1.14 2009/06/12 13:24:37 andrey Exp $ */
#ifndef MYSQLND_STATISTICS_H
#define MYSQLND_STATISTICS_H
@@ -39,7 +39,8 @@
#define MYSQLND_INC_GLOBAL_STATISTIC(statistic) \
{ \
if (MYSQLND_G(collect_statistics) (statistic) != STAT_LAST) { \
- DBG_INF_FMT(Global stat increase [%s],
mysqlnd_stats_values_names[(statistic)]); \
+ DBG_INF_FMT(Global stat increase [%s],
mysqlnd_stats_values_names[(statistic)].s); \
+ \
tsrm_mutex_lock(mysqlnd_global_stats-LOCK_access); \
mysqlnd_global_stats-values[(statistic)]++; \
tsrm_mutex_unlock(mysqlnd_global_stats-LOCK_access); \
@@
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_enum_n_def.h mysqlnd_statistics.c mysqlnd_statistics.h mysqlnd_wireprotocol.c
andrey Fri Jun 12 13:24:57 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_enum_n_def.h mysqlnd_statistics.c
mysqlnd_statistics.h mysqlnd_wireprotocol.c
Log:
MFH:
Fix crash when tracing is enabled. Position after buffer was used also
direct usage of MYSQLND_STRING pointer instead of the s property of the
structure.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_enum_n_def.h?r1=1.2.2.13r2=1.2.2.14diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_enum_n_def.h
diff -u php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.2.2.13
php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.2.2.14
--- php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.2.2.13 Thu Jan 22 21:01:54 2009
+++ php-src/ext/mysqlnd/mysqlnd_enum_n_def.hFri Jun 12 13:24:57 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_enum_n_def.h,v 1.2.2.13 2009/01/22 21:01:54 johannes Exp $ */
+/* $Id: mysqlnd_enum_n_def.h,v 1.2.2.14 2009/06/12 13:24:57 andrey Exp $ */
#ifndef MYSQLND_ENUM_N_DEF_H
#define MYSQLND_ENUM_N_DEF_H
@@ -142,7 +142,6 @@
MYSQLND_OPT_NET_READ_BUFFER_SIZE = 203,
} enum_mysqlnd_option;
-
typedef enum mysqlnd_field_types
{
MYSQL_TYPE_DECIMAL,
@@ -177,7 +176,6 @@
/* Please update this if there is a new type after MYSQL_TYPE_GEOMETRY */
#define MYSQL_TYPE_LASTMYSQL_TYPE_GEOMETRY
-
typedef enum mysqlnd_server_option
{
MYSQL_OPTION_MULTI_STATEMENTS_ON,
@@ -241,7 +239,6 @@
/* see mysqlnd_charset.c for more information */
#define MYSQLND_BINARY_CHARSET_NR 63
-
/*
/- CONN_CLOSE ---\
| ^ \
@@ -261,7 +258,6 @@
CONN_QUIT_SENT, /* object is destroyed at this stage */
} enum_mysqlnd_connection_state;
-
typedef enum mysqlnd_stmt_state
{
MYSQLND_STMT_INITTED = 0,
@@ -272,13 +268,11 @@
MYSQLND_STMT_USER_FETCHING, /* fetch_row_buff or fetch_row_unbuf */
} enum_mysqlnd_stmt_state;
-
typedef enum param_bind_flags
{
MYSQLND_PARAM_BIND_BLOB_USED = 1
} enum_param_bind_flags;
-
/* PS */
enum mysqlnd_stmt_attr
{
@@ -286,7 +280,6 @@
STMT_ATTR_CURSOR_TYPE,
STMT_ATTR_PREFETCH_ROWS
};
-
enum myslqnd_cursor_type
{
CURSOR_TYPE_NO_CURSOR= 0,
@@ -294,7 +287,6 @@
CURSOR_TYPE_FOR_UPDATE= 2,
CURSOR_TYPE_SCROLLABLE= 4
};
-
typedef enum mysqlnd_connection_close_type
{
MYSQLND_CLOSE_EXPLICIT = 0,
@@ -303,7 +295,6 @@
MYSQLND_CLOSE_LAST /* for checking, should always be last */
} enum_connection_close_type;
-
typedef enum mysqlnd_collected_stats
{
STAT_BYTES_SENT,
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_statistics.c?r1=1.2.2.10r2=1.2.2.11diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_statistics.c
diff -u php-src/ext/mysqlnd/mysqlnd_statistics.c:1.2.2.10
php-src/ext/mysqlnd/mysqlnd_statistics.c:1.2.2.11
--- php-src/ext/mysqlnd/mysqlnd_statistics.c:1.2.2.10 Mon Mar 30 16:52:33 2009
+++ php-src/ext/mysqlnd/mysqlnd_statistics.cFri Jun 12 13:24:57 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_statistics.c,v 1.2.2.10 2009/03/30 16:52:33 felipe Exp $ */
+/* $Id: mysqlnd_statistics.c,v 1.2.2.11 2009/06/12 13:24:57 andrey Exp $ */
#include php.h
#include mysqlnd.h
#include mysqlnd_priv.h
@@ -168,7 +168,7 @@
UChar *ustr, *tstr;
int ulen, tlen;
#endif
- char tmp[22];
+ char tmp[25];
sprintf((char *)tmp, MYSQLND_LLU_SPEC, stats-values[i]);
#if PHP_MAJOR_VERSION = 6
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_statistics.h?r1=1.4.2.13r2=1.4.2.14diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_statistics.h
diff -u php-src/ext/mysqlnd/mysqlnd_statistics.h:1.4.2.13
php-src/ext/mysqlnd/mysqlnd_statistics.h:1.4.2.14
--- php-src/ext/mysqlnd/mysqlnd_statistics.h:1.4.2.13 Fri May 29 08:05:38 2009
+++ php-src/ext/mysqlnd/mysqlnd_statistics.hFri Jun 12 13:24:57 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_statistics.h,v 1.4.2.13 2009/05/29 08:05:38 andrey Exp $ */
+/* $Id: mysqlnd_statistics.h,v 1.4.2.14 2009/06/12 13:24:57 andrey Exp $ */
#ifndef MYSQLND_STATISTICS_H
#define MYSQLND_STATISTICS_H
@@ -39,7 +39,8 @@
#define MYSQLND_INC_GLOBAL_STATISTIC(statistic) \
{ \
if (MYSQLND_G(collect_statistics) (statistic) != STAT_LAST) { \
- DBG_INF_FMT(Global stat increase [%s],
mysqlnd_stats_values_names[(statistic)]); \
+ DBG_INF_FMT(Global stat increase [%s],
mysqlnd_stats_values_names[(statistic)].s); \
+ \
tsrm_mutex_lock(mysqlnd_global_stats-LOCK_access); \
[PHP-CVS] cvs: php-src /ext/exif exif.c
felipe Fri Jun 12 13:27:39 2009 UTC
Modified files:
/php-src/ext/exif exif.c
Log:
- Dropped unused var (HEAD only)
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.213r2=1.214diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.213 php-src/ext/exif/exif.c:1.214
--- php-src/ext/exif/exif.c:1.213 Thu May 28 13:44:43 2009
+++ php-src/ext/exif/exif.c Fri Jun 12 13:27:39 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.213 2009/05/28 13:44:43 pajoye Exp $ */
+/* $Id: exif.c,v 1.214 2009/06/12 13:27:39 felipe Exp $ */
/* ToDos
*
@@ -138,7 +138,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.213 2009/05/28 13:44:43 pajoye Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.214 2009/06/12 13:27:39 felipe Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -3888,7 +3888,7 @@
PHP_FUNCTION(exif_read_data)
{
zval **p_name;
- int i, ac = ZEND_NUM_ARGS(), ret, sections_needed=0;
+ int i, ret, sections_needed=0;
zend_bool sub_arrays=0, read_thumbnail=0, read_all=0;
image_info_type ImageInfo;
char tmp[64], *sections_str=0, *s;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/exif exif.c
felipe Fri Jun 12 14:00:10 2009 UTC
Modified files:
/php-src/ext/exif exif.c
Log:
- Sync with 5_3
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.214r2=1.215diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.214 php-src/ext/exif/exif.c:1.215
--- php-src/ext/exif/exif.c:1.214 Fri Jun 12 13:27:39 2009
+++ php-src/ext/exif/exif.c Fri Jun 12 14:00:10 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.214 2009/06/12 13:27:39 felipe Exp $ */
+/* $Id: exif.c,v 1.215 2009/06/12 14:00:10 felipe Exp $ */
/* ToDos
*
@@ -138,7 +138,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.214 2009/06/12 13:27:39 felipe Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.215 2009/06/12 14:00:10 felipe Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -3888,24 +3888,25 @@
PHP_FUNCTION(exif_read_data)
{
zval **p_name;
- int i, ret, sections_needed=0;
+ int i, ret, sections_needed=0, p_sections_needed_len;
zend_bool sub_arrays=0, read_thumbnail=0, read_all=0;
image_info_type ImageInfo;
- char tmp[64], *sections_str=0, *s;
+ char tmp[64], *sections_str = NULL, *p_sections_needed = NULL, *s;
char *filename;
int filename_len, sections_str_len = 0;
- memset(ImageInfo, 0, sizeof(ImageInfo));
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, Z|sbb, p_name,
sections_str, sections_str_len, sub_arrays, read_thumbnail) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, Z|sbb, p_name,
p_sections_needed, p_sections_needed_len, sub_arrays, read_thumbnail) ==
FAILURE) {
return;
}
if (php_stream_path_param_encode(p_name, filename, filename_len,
REPORT_ERRORS, FG(default_context)) == FAILURE) {
return;
}
+
+ memset(ImageInfo, 0, sizeof(ImageInfo));
- if (sections_needed) {
+ if (p_sections_needed) {
+ spprintf(sections_str, 0, ,%s,, p_sections_needed);
/* sections_str DOES start with , and SPACES are NOT allowed in
names */
s = sections_str;
while(*++s) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/exif exif.c
felipe Fri Jun 12 14:03:35 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/exif exif.c
Log:
- Dropped unnecessary var
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.20.2.15r2=1.173.2.5.2.20.2.16diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173.2.5.2.20.2.15
php-src/ext/exif/exif.c:1.173.2.5.2.20.2.16
--- php-src/ext/exif/exif.c:1.173.2.5.2.20.2.15 Thu May 28 13:45:15 2009
+++ php-src/ext/exif/exif.c Fri Jun 12 14:03:35 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.173.2.5.2.20.2.15 2009/05/28 13:45:15 pajoye Exp $ */
+/* $Id: exif.c,v 1.173.2.5.2.20.2.16 2009/06/12 14:03:35 felipe Exp $ */
/* ToDos
*
@@ -138,7 +138,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.173.2.5.2.20.2.15 2009/05/28
13:45:15 pajoye Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.173.2.5.2.20.2.16 2009/06/12
14:03:35 felipe Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -3913,17 +3913,17 @@
int p_name_len, p_sections_needed_len = 0;
zend_bool sub_arrays=0, read_thumbnail=0, read_all=0;
- int i, ac = ZEND_NUM_ARGS(), ret, sections_needed=0;
+ int i, ret, sections_needed=0;
image_info_type ImageInfo;
char tmp[64], *sections_str, *s;
- if (zend_parse_parameters(ac TSRMLS_CC, s|sbb, p_name, p_name_len,
p_sections_needed, p_sections_needed_len, sub_arrays, read_thumbnail) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|sbb, p_name,
p_name_len, p_sections_needed, p_sections_needed_len, sub_arrays,
read_thumbnail) == FAILURE) {
return;
}
memset(ImageInfo, 0, sizeof(ImageInfo));
- if (ac = 2) {
+ if (p_sections_needed) {
spprintf(sections_str, 0, ,%s,, p_sections_needed);
/* sections_str DOES start with , and SPACES are NOT allowed in
names */
s = sections_str;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring config.w32
kalle Fri Jun 12 16:15:51 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring config.w32
Log:
MFH: Fixed static build of mbstring on Windows (makes static build of exif
possible too)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.w32?r1=1.10.2.1.2.4.2.4r2=1.10.2.1.2.4.2.5diff_format=u
Index: php-src/ext/mbstring/config.w32
diff -u php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.4
php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.5
--- php-src/ext/mbstring/config.w32:1.10.2.1.2.4.2.4Fri Mar 20 18:42:02 2009
+++ php-src/ext/mbstring/config.w32 Fri Jun 12 16:15:51 2009
@@ -1,18 +1,18 @@
-// $Id: config.w32,v 1.10.2.1.2.4.2.4 2009/03/20 18:42:02 pajoye Exp $
+// $Id: config.w32,v 1.10.2.1.2.4.2.5 2009/06/12 16:15:51 kalle Exp $
// vim:ft=javascript
ARG_ENABLE(mbstring, multibyte string functions, no);
ARG_ENABLE(mbregex, multibyte regex support, no);
ARG_ENABLE(mbregex-backtrack, check multibyte regex backtrack, yes);
-if (PHP_MBSTRING == yes) {
+if (PHP_MBSTRING != no) {
FSO.CopyFile(ext\\mbstring\\libmbfl\\config.h.vc6,
ext\\mbstring\\libmbfl\\config.h, true);
FSO.CopyFile(ext\\mbstring\\oniguruma\\win32\\config.h,
ext\\mbstring\\oniguruma\\config.h, true);
- EXTENSION(mbstring, mbstring.c php_unicode.c mb_gpc.c, true,
+ EXTENSION(mbstring, mbstring.c php_unicode.c mb_gpc.c,
PHP_MBSTRING_SHARED,
-Iext/mbstring/libmbfl -Iext/mbstring/libmbfl/mbfl \
-Iext/mbstring/oniguruma /D NOT_RUBY=1 /D LIBMBFL_EXPORTS=1 \
/D HAVE_STDARG_PROTOTYPES=1 /D HAVE_CONFIG_H /D HAVE_STDLIB_H \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/iconv/tests iconv_basic.phpt iconv_encoding_basic.phpt iconv_get_encoding_error.phpt iconv_mime_decode_headers_variation1.phpt iconv_mime_decode_headers_variation2
wharmby Fri Jun 12 17:16:01 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/iconv/testsiconv_mime_decode_variation2.phpt iconv_encoding_basic.phpt iconv_strrpos_variation3.phpt iconv_strpos_variation1.phpt iconv_strpos_variation3_64bit.phpt iconv_strrpos_basic.phpt iconv_strpos_error1.phpt iconv_strrpos_variation1.phpt iconv_strpos_variation4.phpt iconv_strrpos_error2.phpt iconv_mime_decode_variation1.phpt iconv_basic.phpt iconv_strrpos_variation2.phpt iconv_set_encoding_error.phpt iconv_mime_decode_headers_variation1.phpt iconv_get_encoding_error.phpt iconv_mime_decode_headers_variation2.phpt iconv_strpos_variation2.phpt iconv_strrpos_error1.phpt iconv_mime_decode_variation3.phpt iconv_strpos_variation5.phpt iconv_set_encoding_variation.phpt iconv_mime_decode_headers_variation3.phpt iconv_strpos_variation3.phpt iconv_strpos_basic.phpt Log: New iconv extension tests. Tested on Windows, Linux and Linux 64 bit http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_mime_decode_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_mime_decode_variation2.phpt +++ php-src/ext/iconv/tests/iconv_mime_decode_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_encoding_basic.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_encoding_basic.phpt +++ php-src/ext/iconv/tests/iconv_encoding_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strrpos_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strrpos_variation3.phpt +++ php-src/ext/iconv/tests/iconv_strrpos_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strpos_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strpos_variation1.phpt +++ php-src/ext/iconv/tests/iconv_strpos_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt +++ php-src/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strrpos_basic.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strrpos_basic.phpt +++ php-src/ext/iconv/tests/iconv_strrpos_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strpos_error1.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strpos_error1.phpt +++ php-src/ext/iconv/tests/iconv_strpos_error1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strrpos_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strrpos_variation1.phpt +++ php-src/ext/iconv/tests/iconv_strrpos_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strpos_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strpos_variation4.phpt +++ php-src/ext/iconv/tests/iconv_strpos_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strrpos_error2.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strrpos_error2.phpt +++ php-src/ext/iconv/tests/iconv_strrpos_error2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_mime_decode_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_mime_decode_variation1.phpt +++ php-src/ext/iconv/tests/iconv_mime_decode_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_basic.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_basic.phpt +++ php-src/ext/iconv/tests/iconv_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strrpos_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strrpos_variation2.phpt +++ php-src/ext/iconv/tests/iconv_strrpos_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_set_encoding_error.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_set_encoding_error.phpt +++ php-src/ext/iconv/tests/iconv_set_encoding_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt?view=markuprev=1.1 Index:
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/iconv/tests iconv_basic.phpt iconv_encoding_basic.phpt iconv_get_encoding_error.phpt iconv_mime_decode_headers_variation1.phpt iconv_mime_decode_headers_variation2
wharmby Fri Jun 12 17:16:11 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/iconv/testsiconv_strpos_error1.phpt iconv_strrpos_variation1.phpt iconv_mime_decode_variation2.phpt iconv_strpos_variation4.phpt iconv_strpos_basic.phpt iconv_strpos_variation3.phpt iconv_strrpos_variation3.phpt iconv_strrpos_basic.phpt iconv_strpos_variation3_64bit.phpt iconv_strrpos_error1.phpt iconv_strpos_variation1.phpt iconv_mime_decode_headers_variation1.phpt iconv_mime_decode_variation3.phpt iconv_mime_decode_headers_variation2.phpt iconv_basic.phpt iconv_set_encoding_variation.phpt iconv_strrpos_variation2.phpt iconv_get_encoding_error.phpt iconv_mime_decode_headers_variation3.phpt iconv_encoding_basic.phpt iconv_mime_decode_variation1.phpt iconv_strrpos_error2.phpt iconv_set_encoding_error.phpt iconv_strpos_variation2.phpt iconv_strpos_variation5.phpt Log: New iconv extension tests. Tested on Windows, Linux and Linux 64 bit http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strpos_error1.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strpos_error1.phpt +++ php-src/ext/iconv/tests/iconv_strpos_error1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strrpos_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strrpos_variation1.phpt +++ php-src/ext/iconv/tests/iconv_strrpos_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_mime_decode_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_mime_decode_variation2.phpt +++ php-src/ext/iconv/tests/iconv_mime_decode_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strpos_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strpos_variation4.phpt +++ php-src/ext/iconv/tests/iconv_strpos_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strpos_basic.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strpos_basic.phpt +++ php-src/ext/iconv/tests/iconv_strpos_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strpos_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strpos_variation3.phpt +++ php-src/ext/iconv/tests/iconv_strpos_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strrpos_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strrpos_variation3.phpt +++ php-src/ext/iconv/tests/iconv_strrpos_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strrpos_basic.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strrpos_basic.phpt +++ php-src/ext/iconv/tests/iconv_strrpos_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt +++ php-src/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strrpos_error1.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strrpos_error1.phpt +++ php-src/ext/iconv/tests/iconv_strrpos_error1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strpos_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strpos_variation1.phpt +++ php-src/ext/iconv/tests/iconv_strpos_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt +++ php-src/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_mime_decode_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_mime_decode_variation3.phpt +++ php-src/ext/iconv/tests/iconv_mime_decode_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt +++ php-src/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/iconv/tests iconv_strlen_basic.phpt iconv_strlen_error1.phpt iconv_strlen_error2.phpt iconv_strlen_variation1.phpt iconv_strlen_variation2.phpt iconv_strpos_error2
wharmby Fri Jun 12 18:57:09 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/iconv/testsiconv_strpos_error2.phpt iconv_strlen_error1.phpt iconv_strlen_basic.phpt iconv_strlen_variation1.phpt iconv_strlen_variation2.phpt iconv_strlen_error2.phpt Log: New iconv extension tests. Tested on Windows, Linux and Linux 64 bit. http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strpos_error2.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strpos_error2.phpt +++ php-src/ext/iconv/tests/iconv_strpos_error2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strlen_error1.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strlen_error1.phpt +++ php-src/ext/iconv/tests/iconv_strlen_error1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strlen_basic.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strlen_basic.phpt +++ php-src/ext/iconv/tests/iconv_strlen_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strlen_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strlen_variation1.phpt +++ php-src/ext/iconv/tests/iconv_strlen_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strlen_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strlen_variation2.phpt +++ php-src/ext/iconv/tests/iconv_strlen_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strlen_error2.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strlen_error2.phpt +++ php-src/ext/iconv/tests/iconv_strlen_error2.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/iconv/tests iconv_strlen_basic.phpt iconv_strlen_error1.phpt iconv_strlen_error2.phpt iconv_strlen_variation1.phpt iconv_strlen_variation2.phpt iconv_strpos_error2.phpt
wharmby Fri Jun 12 18:57:11 2009 UTC
Modified files:
/php-src/ext/iconv/testsiconv_strlen_error1.phpt
iconv_strpos_error2.phpt
iconv_strlen_basic.phpt
iconv_strlen_variation2.phpt
iconv_strlen_error2.phpt
iconv_strlen_variation1.phpt
Log:
New iconv extension tests. Tested on Windows, Linux and Linux 64 bit.
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strlen_error1.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/iconv/tests/iconv_strlen_error1.phpt
diff -u /dev/null php-src/ext/iconv/tests/iconv_strlen_error1.phpt:1.2
--- /dev/null Fri Jun 12 18:57:10 2009
+++ php-src/ext/iconv/tests/iconv_strlen_error1.phptFri Jun 12 18:57:10 2009
@@ -0,0 +1,45 @@
+--TEST--
+Test iconv_strlen() function : error conditions - pass incorrect number of args
+--SKIPIF--
+?php
+extension_loaded('iconv') or die('skip');
+function_exists('iconv_strlen') or die(skip iconv_strlen() is not available
in this build);
+?
+--FILE--
+?php
+/* Prototype : int iconv_strlen(string str [, string charset])
+ * Description: Get character numbers of a string
+ * Source code: ext/iconv/iconv.c
+ */
+
+/*
+ * Pass iconv_strlen an incorrect number of arguments to test behaviour
+ */
+
+echo *** Testing iconv_strlen() : error conditions ***\n;
+
+// Zero arguments
+echo \n-- Testing iconv_strlen() function with Zero arguments --\n;
+var_dump( iconv_strlen() );
+
+//Test iconv_strlen with one more than the expected number of arguments
+echo \n-- Testing iconv_strlen() function with more than expected no. of
arguments --\n;
+$str = 'string_val';
+$encoding = 'string_val';
+$extra_arg = 10;
+var_dump( iconv_strlen($str, $encoding, $extra_arg) );
+?
+===DONE===
+--EXPECTF--
+*** Testing iconv_strlen() : error conditions ***
+
+-- Testing iconv_strlen() function with Zero arguments --
+
+Warning: iconv_strlen() expects at least 1 parameter, 0 given in %s on line %d
+bool(false)
+
+-- Testing iconv_strlen() function with more than expected no. of arguments --
+
+Warning: iconv_strlen() expects at most 2 parameters, 3 given in %s on line %d
+bool(false)
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strpos_error2.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/iconv/tests/iconv_strpos_error2.phpt
diff -u /dev/null php-src/ext/iconv/tests/iconv_strpos_error2.phpt:1.2
--- /dev/null Fri Jun 12 18:57:10 2009
+++ php-src/ext/iconv/tests/iconv_strpos_error2.phptFri Jun 12 18:57:10 2009
@@ -0,0 +1,36 @@
+--TEST--
+Test iconv_strpos() function : error conditions - Pass unknown encoding
+--SKIPIF--
+?php
+extension_loaded('iconv') or die('skip');
+function_exists('iconv_strpos') or die(skip iconv_strpos() is not available
in this build);
+?
+--XFAIL--
+Will fail until bug #48538 fixed
+--FILE--
+?php
+/* Prototype : int iconv_strpos(string haystack, string needle [, int offset
[, string charset]])
+ * Description: Find position of first occurrence of a string within another
+ * Source code: ext/iconv/iconv.c
+ */
+
+/*
+ * Pass an unknown encoding to iconv_strpos() to test behaviour
+ */
+
+echo *** Testing iconv_strpos() : error conditions ***\n;
+$haystack = 'Hello, world';
+$needle = 'world';
+$offset = 2;
+$encoding = 'unknown-encoding';
+
+var_dump( iconv_strpos($haystack, $needle, $offset, $encoding) );
+
+echo Done;
+?
+--EXPECTF--
+*** Testing iconv_strpos() : error conditions ***
+
+Notice: iconv_strpos(): Wrong charset, conversion from `unknown-encoding' to
`UCS-4LE' is not allowed in %s on line %d
+bool(false)
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strlen_basic.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/iconv/tests/iconv_strlen_basic.phpt
diff -u /dev/null php-src/ext/iconv/tests/iconv_strlen_basic.phpt:1.2
--- /dev/null Fri Jun 12 18:57:10 2009
+++ php-src/ext/iconv/tests/iconv_strlen_basic.phpt Fri Jun 12 18:57:10 2009
@@ -0,0 +1,40 @@
+--TEST--
+Test iconv_strlen() function : basic functionality
+--SKIPIF--
+?php
+extension_loaded('iconv') or die('skip');
+function_exists('iconv_strlen') or die(skip iconv_strlen() is not available
in this build);
+?
+--FILE--
+?php
+/* Prototype : int iconv_strlen(string str [, string charset])
+ * Description: Get character numbers of a string
+ * Source code: ext/iconv/iconv.c
+ */
+
+/*
+ * Test basic functionality of iconv_strlen()
+ */
+
+echo *** Testing iconv_strlen() : basic functionality***\n;
+
+$string_ascii = b'abc def';
+//Japanese string in UTF-8
+$string_mb =
base64_decode(b'5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+
+echo \n-- ASCII String --\n;
+var_dump(iconv_strlen($string_ascii));
+
+echo \n-- Multibyte String --\n;
+var_dump(iconv_strlen($string_mb, 'UTF-8'));
+?
+===DONE===
+--EXPECTF--
+*** Testing iconv_strlen() : basic functionality***
+
+-- ASCII
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/iconv/tests iconv_strlen_basic.phpt iconv_strlen_error1.phpt iconv_strlen_error2.phpt iconv_strlen_variation1.phpt iconv_strlen_variation2.phpt iconv_strpos_error2
wharmby Fri Jun 12 18:57:12 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/iconv/testsiconv_strlen_error1.phpt iconv_strlen_variation2.phpt iconv_strlen_variation1.phpt iconv_strlen_error2.phpt iconv_strpos_error2.phpt iconv_strlen_basic.phpt Log: New iconv extension tests. Tested on Windows, Linux and Linux 64 bit. http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strlen_error1.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strlen_error1.phpt +++ php-src/ext/iconv/tests/iconv_strlen_error1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strlen_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strlen_variation2.phpt +++ php-src/ext/iconv/tests/iconv_strlen_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strlen_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strlen_variation1.phpt +++ php-src/ext/iconv/tests/iconv_strlen_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strlen_error2.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strlen_error2.phpt +++ php-src/ext/iconv/tests/iconv_strlen_error2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strpos_error2.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strpos_error2.phpt +++ php-src/ext/iconv/tests/iconv_strpos_error2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_strlen_basic.phpt?view=markuprev=1.1 Index: php-src/ext/iconv/tests/iconv_strlen_basic.phpt +++ php-src/ext/iconv/tests/iconv_strlen_basic.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c /ext/curl/tests bug48514.phpt
felipe Fri Jun 12 20:43:29 2009 UTC
Added files:
/php-src/ext/curl/tests bug48514.phpt
Modified files:
/php-src/ext/curl interface.c
Log:
- Fixed bug #48514 (cURL extension uses same resource name for simple and
multi APIs)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.171r2=1.172diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.171 php-src/ext/curl/interface.c:1.172
--- php-src/ext/curl/interface.c:1.171 Thu Jun 11 09:46:27 2009
+++ php-src/ext/curl/interface.cFri Jun 12 20:43:29 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.171 2009/06/11 09:46:27 tony2001 Exp $ */
+/* $Id: interface.c,v 1.172 2009/06/12 20:43:29 felipe Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -456,7 +456,7 @@
PHP_MINIT_FUNCTION(curl)
{
le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL,
curl, module_number);
- le_curl_multi_handle =
zend_register_list_destructors_ex(_php_curl_multi_close, NULL, curl,
module_number);
+ le_curl_multi_handle =
zend_register_list_destructors_ex(_php_curl_multi_close, NULL, curl_multi,
module_number);
/* See http://curl.haxx.se/lxr/source/docs/libcurl/symbols-in-versions
or curl src/docs/libcurl/symbols-in-versions for a (almost) complete
list
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug48514.phpt?view=markuprev=1.1
Index: php-src/ext/curl/tests/bug48514.phpt
+++ php-src/ext/curl/tests/bug48514.phpt
--TEST--
Bug #48514 (cURL extension uses same resource name for simple and multi APIs)
--FILE--
?php
$ch1 = curl_init();
var_dump($ch1);
var_dump(get_resource_type($ch1));
$ch2 = curl_multi_init();
var_dump($ch2);
var_dump(get_resource_type($ch2));
?
--EXPECTF--
resource(4) of type (curl)
%string|unicode%(4) curl
resource(5) of type (curl_multi)
%string|unicode%(10) curl_multi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl/tests bug48514.phpt
felipe Fri Jun 12 20:44:50 2009 UTC Modified files: /php-src/ext/curl/tests bug48514.phpt Log: - Fix test http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug48514.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/curl/tests/bug48514.phpt diff -u php-src/ext/curl/tests/bug48514.phpt:1.1 php-src/ext/curl/tests/bug48514.phpt:1.2 --- php-src/ext/curl/tests/bug48514.phpt:1.1Fri Jun 12 20:43:29 2009 +++ php-src/ext/curl/tests/bug48514.phptFri Jun 12 20:44:50 2009 @@ -13,7 +13,7 @@ ? --EXPECTF-- -resource(4) of type (curl) +resource(%d) of type (curl) %string|unicode%(4) curl -resource(5) of type (curl_multi) +resource(%d) of type (curl_multi) %string|unicode%(10) curl_multi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl/tests bug48514.phpt
felipe Fri Jun 12 20:46:30 2009 UTC
Modified files:
/php-src/ext/curl/tests bug48514.phpt
Log:
- Refix the fix :| (missing skipif)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug48514.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/curl/tests/bug48514.phpt
diff -u php-src/ext/curl/tests/bug48514.phpt:1.2
php-src/ext/curl/tests/bug48514.phpt:1.3
--- php-src/ext/curl/tests/bug48514.phpt:1.2Fri Jun 12 20:44:50 2009
+++ php-src/ext/curl/tests/bug48514.phptFri Jun 12 20:46:30 2009
@@ -1,5 +1,13 @@
--TEST--
Bug #48514 (cURL extension uses same resource name for simple and multi APIs)
+--SKIPIF--
+?php
+
+if (!extension_loaded('curl')) {
+ exit(skip curl extension not loaded);
+}
+
+?
--FILE--
?php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/curl interface.c /ext/curl/tests bug48514.phpt
felipe Fri Jun 12 20:48:28 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/curl/tests bug48514.phpt
Modified files:
/php-src/ext/curl interface.c
Log:
- MFH: Fixed bug #48514 (cURL extension uses same resource name for simple
and multi APIs)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.55r2=1.62.2.14.2.27.2.56diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.55
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.56
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.55Thu Jun 11 09:46:43 2009
+++ php-src/ext/curl/interface.cFri Jun 12 20:48:28 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.14.2.27.2.55 2009/06/11 09:46:43 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.56 2009/06/12 20:48:28 felipe Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -456,7 +456,7 @@
PHP_MINIT_FUNCTION(curl)
{
le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL,
curl, module_number);
- le_curl_multi_handle =
zend_register_list_destructors_ex(_php_curl_multi_close, NULL, curl,
module_number);
+ le_curl_multi_handle =
zend_register_list_destructors_ex(_php_curl_multi_close, NULL, curl_multi,
module_number);
/* See http://curl.haxx.se/lxr/source/docs/libcurl/symbols-in-versions
or curl src/docs/libcurl/symbols-in-versions for a (almost) complete
list
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug48514.phpt?view=markuprev=1.1
Index: php-src/ext/curl/tests/bug48514.phpt
+++ php-src/ext/curl/tests/bug48514.phpt
--TEST--
Bug #48514 (cURL extension uses same resource name for simple and multi APIs)
--FILE--
?php
$ch1 = curl_init();
var_dump($ch1);
var_dump(get_resource_type($ch1));
$ch2 = curl_multi_init();
var_dump($ch2);
var_dump(get_resource_type($ch2));
?
--EXPECTF--
resource(4) of type (curl)
%string|unicode%(4) curl
resource(5) of type (curl_multi)
%string|unicode%(10) curl_multi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/curl interface.c /ext/curl/tests bug48514.phpt
felipe Fri Jun 12 20:50:58 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/curl/tests bug48514.phpt
Modified files:
/php-srcNEWS
/php-src/ext/curl interface.c
Log:
- MFH: Fixed bug #48514 (cURL extension uses same resource name for simple
and multi APIs)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1554r2=1.2027.2.547.2.1555diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1554 php-src/NEWS:1.2027.2.547.2.1555
--- php-src/NEWS:1.2027.2.547.2.1554Thu Jun 11 12:13:54 2009
+++ php-src/NEWSFri Jun 12 20:50:58 2009
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? Jun 2009, PHP 5.2.10
+- Fixed bug #48514 (cURL extension uses same resource name for simple and
+ multi APIs). (Felipe)
11 Jun 2009, PHP 5.2.10RC2
- Updated timezone database to version 2009.9 (2009i) (Derick)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.55r2=1.62.2.14.2.56diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.55
php-src/ext/curl/interface.c:1.62.2.14.2.56
--- php-src/ext/curl/interface.c:1.62.2.14.2.55 Thu Jun 11 09:49:57 2009
+++ php-src/ext/curl/interface.cFri Jun 12 20:50:58 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.14.2.55 2009/06/11 09:49:57 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.56 2009/06/12 20:50:58 felipe Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -367,7 +367,7 @@
PHP_MINIT_FUNCTION(curl)
{
le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL,
curl, module_number);
- le_curl_multi_handle =
zend_register_list_destructors_ex(_php_curl_multi_close, NULL, curl,
module_number);
+ le_curl_multi_handle =
zend_register_list_destructors_ex(_php_curl_multi_close, NULL, curl_multi,
module_number);
/* See http://curl.haxx.se/lxr/source/docs/libcurl/symbols-in-versions
or curl src/docs/libcurl/symbols-in-versions for a (almost) complete
list
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug48514.phpt?view=markuprev=1.1
Index: php-src/ext/curl/tests/bug48514.phpt
+++ php-src/ext/curl/tests/bug48514.phpt
--TEST--
Bug #48514 (cURL extension uses same resource name for simple and multi APIs)
--FILE--
?php
$ch1 = curl_init();
var_dump($ch1);
var_dump(get_resource_type($ch1));
$ch2 = curl_multi_init();
var_dump($ch2);
var_dump(get_resource_type($ch2));
?
--EXPECTF--
resource(4) of type (curl)
%string|unicode%(4) curl
resource(5) of type (curl_multi)
%string|unicode%(10) curl_multi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /code-samples/taskScheduler run.php /code-samples/taskScheduler/classes task.php taskInterface.php taskScheduler.php /code-samples/taskScheduler/example1 main.php taskCalc
g2 Sat Jun 13 03:13:31 2009 UTC
Added files:
/phpruntests/code-samples/taskScheduler/classes task.php
taskScheduler.php
taskInterface.php
/phpruntests/code-samples/taskScheduler/example3/files/src/adv
023.phpt
010.phpt
009.phpt
026.phpt
014.phpt
027.phpt
020.phpt
011.phpt
012.phpt
013.phpt
017.phpt
022.phpt
025.phpt
016.phpt
015.phpt
018.phpt
024.phpt
019.phpt
008.phpt
/phpruntests/code-samples/taskScheduler/example3/imgConverter
imageCreator.php
fileReader.php
fileCreator.php
imageReader.php
/phpruntests/code-samples/taskScheduler/example3/files/src/func
007.phpt
010.phpt
002.phpt
006.phpt
008.phpt
005a.phpt
005.phpt
003.phpt
004.phpt
001.phpt
009.phpt
/phpruntests/code-samples/taskScheduler/example3/files/src/basic
007.phpt
006.phpt
001.phpt
004.phpt
003.phpt
005.phpt
002.phpt
/phpruntests/code-samples/taskScheduler/example1main.php
taskCalculate.php
/phpruntests/code-samples/taskScheduler/example3taskConvert.php
main.php
/phpruntests/code-samples/taskScheduler run.php
/phpruntests/code-samples/taskScheduler/example2taskSleep.php
main.php
Log:
phpruntests - added taskScheduler-prototype
http://cvs.php.net/viewvc.cgi/phpruntests/code-samples/taskScheduler/classes/task.php?view=markuprev=1.1
Index: phpruntests/code-samples/taskScheduler/classes/task.php
+++ phpruntests/code-samples/taskScheduler/classes/task.php
?php
abstract class task
{
const NOEX = 0;
const PASS = 1;
const FAIL = -1;
private $state = self::NOEX;
private $index = NULL;
private $message = NULL;
