[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c
helly Tue Feb 21 09:12:32 2006 UTC
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
- Ansi compliance issue found by rob
http://cvs.php.net/viewcvs.cgi/php-src/ext/reflection/php_reflection.c?r1=1.213r2=1.214diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.213
php-src/ext/reflection/php_reflection.c:1.214
--- php-src/ext/reflection/php_reflection.c:1.213 Tue Feb 21 00:43:33 2006
+++ php-src/ext/reflection/php_reflection.c Tue Feb 21 09:12:32 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.213 2006/02/21 00:43:33 helly Exp $ */
+/* $Id: php_reflection.c,v 1.214 2006/02/21 09:12:32 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -4171,6 +4171,7 @@
while(dep-name) {
char *relation;
char *rel_type;
+ int len;
switch(dep-type) {
case MODULE_DEP_REQUIRED:
@@ -4187,7 +4188,7 @@
break;
}
- int len = spprintf(relation, 0, %s%s%s%s%s,
+ len = spprintf(relation, 0, %s%s%s%s%s,
rel_type,
dep-rel ? : ,
dep-rel ? dep-rel : ,
@@ -4471,7 +4472,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.213
2006/02/21 00:43:33 helly Exp $);
+ php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.214
2006/02/21 09:12:32 helly Exp $);
php_info_print_table_end();
} /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl.php
helly Tue Feb 21 09:45:38 2006 UTC Modified files: /php-src/ext/splspl.php Log: - Update http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl.php?r1=1.66r2=1.67diff_format=u Index: php-src/ext/spl/spl.php diff -u php-src/ext/spl/spl.php:1.66 php-src/ext/spl/spl.php:1.67 --- php-src/ext/spl/spl.php:1.66Mon Feb 20 22:21:24 2006 +++ php-src/ext/spl/spl.php Tue Feb 21 09:45:38 2006 @@ -66,8 +66,8 @@ * * SPL offers advanced Array overloading: * - * - class ArrayObject implements IteratorAggregate - * - class ArrayIterator implements Iterator + * - class ArrayObject implements IteratorAggregate, ArrayAccess, Countable + * - class ArrayIterator implements Iterator, ArrayAccess, Countable, SeekableIterator * - class RecursiveArrayIterator extends ArrayIterator implements RecursiveIterator * * As the above suggest an ArrayObject creates an ArrayIterator when it comes to -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl.php
helly Tue Feb 21 09:47:09 2006 UTC Modified files: /php-src/ext/splspl.php Log: - Its 2006 already http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl.php?r1=1.67r2=1.68diff_format=u Index: php-src/ext/spl/spl.php diff -u php-src/ext/spl/spl.php:1.67 php-src/ext/spl/spl.php:1.68 --- php-src/ext/spl/spl.php:1.67Tue Feb 21 09:45:38 2006 +++ php-src/ext/spl/spl.php Tue Feb 21 09:47:09 2006 @@ -128,7 +128,7 @@ * You can download this documentation as a chm file * a href=http://php.net/~helly/php/ext/spl/spl.chm;here/a. * - * (c) Marcus Boerger, 2003 - 2005 + * (c) Marcus Boerger, 2003 - 2006 */ /** @defgroup ZendEngine Zend engine classes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard basic_functions.c
iliaa Tue Feb 21 15:32:06 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/standard basic_functions.c
Log:
Fixed bug #36458 (sleep() accepts negative values).
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.422r2=1.2027.2.423diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.422 php-src/NEWS:1.2027.2.423
--- php-src/NEWS:1.2027.2.422 Mon Feb 20 23:33:32 2006
+++ php-src/NEWSTue Feb 21 15:32:06 2006
@@ -25,6 +25,7 @@
(Mike)
- Fixed tiger hash algorithm generating wrong results on big endian platforms.
(Mike)
+- Fixed bug #36458 (sleep() accepts negative values). (Ilia)
- Fixed bug #36436 (DBA problem with Berkeley DB4). (Marcus)
- Fixed bug #36434 (Improper resolution of declaring class name of an inherited
property). (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.22r2=1.725.2.23diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.22
php-src/ext/standard/basic_functions.c:1.725.2.23
--- php-src/ext/standard/basic_functions.c:1.725.2.22 Sat Feb 18 05:41:59 2006
+++ php-src/ext/standard/basic_functions.c Tue Feb 21 15:32:06 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.22 2006/02/18 05:41:59 rasmus Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.23 2006/02/21 15:32:06 iliaa Exp $ */
#include php.h
#include php_streams.h
@@ -1747,17 +1747,19 @@
Delay for a given number of seconds */
PHP_FUNCTION(sleep)
{
- zval **num;
+ long num;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, num) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l, num) ==
FAILURE) {
+ RETURN_FALSE;
+ }
+ if (num 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Number of seconds
must be greater than or equal to 0);
+ RETURN_FALSE;
}
-
- convert_to_long_ex(num);
#ifdef PHP_SLEEP_NON_VOID
- RETURN_LONG(php_sleep(Z_LVAL_PP(num)));
+ RETURN_LONG(php_sleep(num));
#else
- php_sleep(Z_LVAL_PP(num));
+ php_sleep(num);
#endif
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
iliaa Tue Feb 21 15:32:34 2006 UTC
Modified files:
/php-src/ext/standard basic_functions.c
Log:
MFB51: Fixed bug #36458 (sleep() accepts negative values).
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.754r2=1.755diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.754
php-src/ext/standard/basic_functions.c:1.755
--- php-src/ext/standard/basic_functions.c:1.754Mon Feb 20 17:14:18 2006
+++ php-src/ext/standard/basic_functions.c Tue Feb 21 15:32:34 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.754 2006/02/20 17:14:18 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.755 2006/02/21 15:32:34 iliaa Exp $ */
#include php.h
#include php_streams.h
@@ -1677,17 +1677,19 @@
Delay for a given number of seconds */
PHP_FUNCTION(sleep)
{
- zval **num;
+ long num;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, num) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l, num) ==
FAILURE) {
+ RETURN_FALSE;
+ }
+ if (num 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Number of seconds
must be greater than or equal to 0);
+ RETURN_FALSE;
}
-
- convert_to_long_ex(num);
#ifdef PHP_SLEEP_NON_VOID
- RETURN_LONG(php_sleep(Z_LVAL_PP(num)));
+ RETURN_LONG(php_sleep(num));
#else
- php_sleep(Z_LVAL_PP(num));
+ php_sleep(num);
#endif
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/standard basic_functions.c
iliaa Tue Feb 21 15:35:01 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/standard basic_functions.c
/php-srcNEWS
Log:
MFH: Fixed bug #36458 (sleep() accepts negative values).
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.543.2.51.2.6r2=1.543.2.51.2.7diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.543.2.51.2.6
php-src/ext/standard/basic_functions.c:1.543.2.51.2.7
--- php-src/ext/standard/basic_functions.c:1.543.2.51.2.6 Sun Jan 1
13:46:57 2006
+++ php-src/ext/standard/basic_functions.c Tue Feb 21 15:35:01 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.543.2.51.2.6 2006/01/01 13:46:57 sniper Exp $ */
+/* $Id: basic_functions.c,v 1.543.2.51.2.7 2006/02/21 15:35:01 iliaa Exp $ */
#include php.h
#include php_streams.h
@@ -1662,14 +1662,16 @@
Delay for a given number of seconds */
PHP_FUNCTION(sleep)
{
- pval **num;
-
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, num) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ long num;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l, num) ==
FAILURE) {
+ RETURN_FALSE;
}
-
- convert_to_long_ex(num);
- php_sleep(Z_LVAL_PP(num));
+ if (num 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Number of seconds
must be greater than or equal to 0);
+ RETURN_FALSE;
+ }
+ php_sleep(num);
}
/* }}} */
@@ -1678,13 +1680,16 @@
PHP_FUNCTION(usleep)
{
#if HAVE_USLEEP
- pval **num;
-
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, num) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ long num;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l, num) ==
FAILURE) {
+ RETURN_FALSE;
+ }
+ if (num 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Number of
microseconds must be greater than or equal to 0);
+ RETURN_FALSE;
}
- convert_to_long_ex(num);
- usleep(Z_LVAL_PP(num));
+ usleep(num);
#endif
}
/* }}} */
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.1247.2.920.2.116r2=1.1247.2.920.2.117diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.116 php-src/NEWS:1.1247.2.920.2.117
--- php-src/NEWS:1.1247.2.920.2.116 Mon Feb 13 12:19:09 2006
+++ php-src/NEWSTue Feb 21 15:35:01 2006
@@ -2,6 +2,7 @@
|||
?? ??? 2006, Version 4.4.3
- Added a check for special characters in the session name. (Ilia)
+- Fixed bug #36458 (sleep() accepts negative values). (Ilia)
- Fixed bug #36242 (Possible memory corruption in stream_select()). (Tony)
- Fixed bug #36223 (curl bypasses open_basedir restrictions). (Tony)
- Fixed bug #36205 (Memory leaks on duplicate cookies). (Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c
sebastian Tue Feb 21 20:23:10 2006 UTC
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
Add ReflectionMethod::isDeprecated(). Patch reviewed by Marcus Börger [EMAIL
PROTECTED].
http://cvs.php.net/viewcvs.cgi/php-src/ext/reflection/php_reflection.c?r1=1.215r2=1.216diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.215
php-src/ext/reflection/php_reflection.c:1.216
--- php-src/ext/reflection/php_reflection.c:1.215 Tue Feb 21 20:12:42 2006
+++ php-src/ext/reflection/php_reflection.c Tue Feb 21 20:23:10 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.215 2006/02/21 20:12:42 dmitry Exp $ */
+/* $Id: php_reflection.c,v 1.216 2006/02/21 20:23:10 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2414,6 +2414,14 @@
}
/* }}} */
+/* {{{ proto public bool ReflectionMethod::isDeprecated()
+ Returns whether this method is deprecated */
+ZEND_METHOD(reflection_method, isDeprecated)
+{
+ _function_check_flag(INTERNAL_FUNCTION_PARAM_PASSTHRU,
ZEND_ACC_DEPRECATED);
+}
+/* }}} */
+
/* {{{ proto public bool ReflectionMethod::isConstructor()
Returns whether this method is the constructor */
ZEND_METHOD(reflection_method, isConstructor)
@@ -4260,9 +4268,10 @@
ZEND_ME(reflection_method, isPublic, NULL, 0)
ZEND_ME(reflection_method, isPrivate, NULL, 0)
ZEND_ME(reflection_method, isProtected, NULL, 0)
- ZEND_ME(reflection_method, isAbstract, NULL, 0)
+ ZEND_ME(reflection_method, isAbstract, NULL, 0)
ZEND_ME(reflection_method, isFinal, NULL, 0)
ZEND_ME(reflection_method, isStatic, NULL, 0)
+ ZEND_ME(reflection_method, isDeprecated, NULL, 0)
ZEND_ME(reflection_method, isConstructor, NULL, 0)
ZEND_ME(reflection_method, isDestructor, NULL, 0)
ZEND_ME(reflection_method, getModifiers, NULL, 0)
@@ -4484,7 +4493,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.215
2006/02/21 20:12:42 dmitry Exp $);
+ php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.216
2006/02/21 20:23:10 sebastian Exp $);
php_info_print_table_end();
} /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection php_reflection.c
Hello Sebastian, watch ya WS :-) marcus Tuesday, February 21, 2006, 9:23:10 PM, you wrote: sebastian Tue Feb 21 20:23:10 2006 UTC Modified files: /php-src/ext/reflection php_reflection.c Log: Add ReflectionMethod::isDeprecated(). Patch reviewed by Marcus Börger [EMAIL PROTECTED]. http://cvs.php.net/viewcvs.cgi/php-src/ext/reflection/php_reflection.c?r1=1.215r2=1.216diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.215 php-src/ext/reflection/php_reflection.c:1.216 --- php-src/ext/reflection/php_reflection.c:1.215 Tue Feb 21 20:12:42 2006 +++ php-src/ext/reflection/php_reflection.c Tue Feb 21 20:23:10 2006 [...] @@ -4260,9 +4268,10 @@ ZEND_ME(reflection_method, isPublic, NULL, 0) ZEND_ME(reflection_method, isPrivate, NULL, 0) ZEND_ME(reflection_method, isProtected, NULL, 0) - ZEND_ME(reflection_method, isAbstract, NULL, 0) + ZEND_ME(reflection_method, isAbstract, NULL, 0) ZEND_ME(reflection_method, isFinal, NULL, 0) ZEND_ME(reflection_method, isStatic, NULL, 0) [...] Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/hash package.xml
pollita Tue Feb 21 20:35:38 2006 UTC Modified files: /php-src/ext/hash package.xml Log: Keep history in package.xml file.. http://cvs.php.net/viewcvs.cgi/php-src/ext/hash/package.xml?r1=1.18r2=1.19diff_format=u Index: php-src/ext/hash/package.xml diff -u php-src/ext/hash/package.xml:1.18 php-src/ext/hash/package.xml:1.19 --- php-src/ext/hash/package.xml:1.18 Sun Feb 19 23:53:06 2006 +++ php-src/ext/hash/package.xmlTue Feb 21 20:35:38 2006 @@ -20,12 +20,22 @@ /maintainer /maintainers - release - version1.2/version - statestable/state - date2006-02-00/date - notes + release +version1.2/version +statestable/stable +date2006-02-00/date +notes Fixed tiger algorithm generating wrong results on big endian platforms. +/notes + /release + + changelog + release +version1.1/version +statestable/state +date2005-12-07/date +notes +Fixed PECL bug #6183 - haval source file entries missing in package.xml Supported Algorithms: * md4, md5 @@ -34,8 +44,9 @@ * tiger128, tiger160, tiger192 (3 and 4 passes) * haval128, haval160, haval192, haval224, haval256 (3, 4 and 5 passes) * crc32, crc32b, adler32, gost, snefru, whirlpool - /notes - /release +/notes + /release + /changelog filelist file role=src name=config.m4/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/hash hash.c hash_md.c package.xml php_hash.h php_hash_md.h /ext/hash/tests md2.phpt
pollita Tue Feb 21 20:37:12 2006 UTC
Added files:
/php-src/ext/hash/tests md2.phpt
Modified files:
/php-src/ext/hash hash.c hash_md.c php_hash.h php_hash_md.h
package.xml
Log:
Add md2 algo support
http://cvs.php.net/viewcvs.cgi/php-src/ext/hash/hash.c?r1=1.23r2=1.24diff_format=u
Index: php-src/ext/hash/hash.c
diff -u php-src/ext/hash/hash.c:1.23 php-src/ext/hash/hash.c:1.24
--- php-src/ext/hash/hash.c:1.23Tue Feb 21 20:12:42 2006
+++ php-src/ext/hash/hash.c Tue Feb 21 20:37:12 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: hash.c,v 1.23 2006/02/21 20:12:42 dmitry Exp $ */
+/* $Id: hash.c,v 1.24 2006/02/21 20:37:12 pollita Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -516,6 +516,7 @@
zend_hash_init(php_hash_hashtable, 35, NULL, NULL, 1);
+ php_hash_register_algo(md2, php_hash_md2_ops);
php_hash_register_algo(md4, php_hash_md4_ops);
php_hash_register_algo(md5, php_hash_md5_ops);
php_hash_register_algo(sha1, php_hash_sha1_ops);
http://cvs.php.net/viewcvs.cgi/php-src/ext/hash/hash_md.c?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/hash/hash_md.c
diff -u php-src/ext/hash/hash_md.c:1.9 php-src/ext/hash/hash_md.c:1.10
--- php-src/ext/hash/hash_md.c:1.9 Sun Feb 19 04:29:40 2006
+++ php-src/ext/hash/hash_md.c Tue Feb 21 20:37:12 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: hash_md.c,v 1.9 2006/02/19 04:29:40 andi Exp $ */
+/* $Id: hash_md.c,v 1.10 2006/02/21 20:37:12 pollita Exp $ */
#include php_hash.h
#include php_hash_md.h
@@ -39,6 +39,15 @@
sizeof(PHP_MD4_CTX)
};
+php_hash_ops php_hash_md2_ops = {
+ (php_hash_init_func_t) PHP_MD2Init,
+ (php_hash_update_func_t) PHP_MD2Update,
+ (php_hash_final_func_t) PHP_MD2Final,
+ 16,
+ 16,
+ sizeof(PHP_MD2_CTX)
+};
+
/* MD common stuff */
static unsigned char PADDING[64] =
@@ -579,6 +588,95 @@
}
/* }}} */
+/* MD2 */
+
+static unsigned char MD2_S[256] = {
+41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240,
6, 19,
+98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188, 76,
130, 202,
+30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24, 138, 23,
229, 18,
+ 190, 78, 196, 214, 218, 158, 222, 73, 160, 251, 245, 142, 187, 47,
238, 122,
+ 169, 104, 121, 145, 21, 178, 7, 63, 148, 194, 16, 137, 11, 34,
95, 33,
+ 128, 127, 93, 154, 90, 144, 50, 39, 53, 62, 204, 231, 191, 247,
151, 3,
+ 255, 25, 48, 179, 72, 165, 181, 209, 215, 94, 146, 42, 172, 86,
170, 198,
+79, 184, 56, 210, 150, 164, 125, 182, 118, 252, 107, 226, 156, 116,
4, 241,
+69, 157, 112, 89, 100, 113, 135, 32, 134, 91, 207, 101, 230, 45,
168, 2,
+27, 96, 37, 173, 174, 176, 185, 246, 28, 70, 97, 105, 52, 64,
126, 15,
+85, 71, 163, 35, 221, 81, 175, 58, 195, 92, 249, 206, 186, 197,
234, 38,
+44, 83, 13, 110, 133, 40, 132, 9, 211, 223, 205, 244, 65, 129,
77, 82,
+ 106, 220, 55, 200, 108, 193, 171, 250, 36, 225, 123, 8, 12, 189,
177, 74,
+ 120, 136, 149, 139, 227, 99, 232, 109, 233, 203, 213, 254, 59, 0,
29, 57,
+ 242, 239, 183, 14, 102, 88, 208, 228, 166, 119, 114, 248, 235, 117,
75, 10,
+49, 68, 80, 180, 143, 237, 31, 26, 219, 153, 141, 51, 159, 17,
131, 20 };
+
+PHP_HASH_API void PHP_MD2Init(PHP_MD2_CTX *context)
+{
+ memset(context, 0, sizeof(PHP_MD2_CTX));
+}
+
+static void MD2_Transform(PHP_MD2_CTX *context, const unsigned char *block)
+{
+ unsigned char i,j,t = 0;
+
+ for(i = 0; i 16; i++) {
+ context-state[16+i] = block[i];
+ context-state[32+i] = (context-state[16+i] ^
context-state[i]);
+ }
+
+ for(i = 0; i 18; i++) {
+ for(j = 0; j 48; j++) {
+ t = context-state[j] = context-state[j] ^ MD2_S[t];
+ }
+ t += i;
+ }
+
+ /* Update checksum -- must be after transform to avoid fouling up last
message block */
+ t = context-checksum[15];
+ for(i = 0; i 16; i++) {
+ t = context-checksum[i] ^= MD2_S[block[i] ^ t];
+ }
+}
+
+PHP_HASH_API void PHP_MD2Update(PHP_MD2_CTX *context, const unsigned char
*buf, unsigned int len)
+{
+ const unsigned char *p = buf, *e = buf + len;
+
+ if (context-in_buffer) {
+ if (context-in_buffer + len 16) {
+ /* Not enough for block, just pass into buffer */
+ memcpy(context-buffer + context-in_buffer, p, len);
+ context-in_buffer += len;
+ return;
+
[PHP-CVS] cvs: php-src /sapi/cli php_cli_readline.c
johannesTue Feb 21 21:04:19 2006 UTC
Modified files:
/php-src/sapi/cli php_cli_readline.c
Log:
- Fix build with readline-support
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cli/php_cli_readline.c?r1=1.8r2=1.9diff_format=u
Index: php-src/sapi/cli/php_cli_readline.c
diff -u php-src/sapi/cli/php_cli_readline.c:1.8
php-src/sapi/cli/php_cli_readline.c:1.9
--- php-src/sapi/cli/php_cli_readline.c:1.8 Sun Jan 1 13:09:58 2006
+++ php-src/sapi/cli/php_cli_readline.c Tue Feb 21 21:04:19 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_cli_readline.c,v 1.8 2006/01/01 13:09:58 sniper Exp $ */
+/* $Id: php_cli_readline.c,v 1.9 2006/02/21 21:04:19 johannes Exp $ */
#include php.h
@@ -344,14 +344,14 @@
int32_t tmp_len, len;
UErrorCode status = U_ZERO_ERROR;
- len = u_strlen((UChar *)func-common.function_name);
+ len = u_strlen((UChar *)func-common.function_name.u);
zend_convert_from_unicode(ZEND_U_CONVERTER(UG(output_encoding_conv)), tmp,
tmp_len,
-
(UChar *)func-common.function_name, len, status);
+
(UChar *)func-common.function_name.u, len, status);
retval = strdup(tmp);
efree(tmp);
} else {
- retval = strdup(func-common.function_name);
+ retval = strdup(func-common.function_name.s);
}
}
@@ -370,14 +370,14 @@
int32_t tmp_len, len;
UErrorCode status = U_ZERO_ERROR;
- len = u_strlen((UChar *)(*pce)-name);
+ len = u_strlen((UChar *)(*pce)-name.u);
zend_convert_from_unicode(ZEND_U_CONVERTER(UG(output_encoding_conv)), tmp,
tmp_len,
-
(UChar *)(*pce)-name, len, status);
+
(UChar *)(*pce)-name.u, len, status);
retval = strdup(tmp);
efree(tmp);
} else {
- retval = strdup((*pce)-name);
+ retval = strdup((*pce)-name.s);
}
}
@@ -479,7 +479,7 @@
if (pce retval) {
char *tmp = malloc(class_name_len + 2 + strlen(retval)
+ 1);
- sprintf(tmp, %s::%s, (*pce)-name, retval);
+ sprintf(tmp, %s::%s, (*pce)-name.s, retval);
free(retval);
retval = tmp;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cli php_cli.c
johannesTue Feb 21 21:14:36 2006 UTC Modified files: /php-src/sapi/cli php_cli.c Log: - List --rf/--rc/--re only with enabled reflection http://cvs.php.net/viewcvs.cgi/php-src/sapi/cli/php_cli.c?r1=1.146r2=1.147diff_format=u Index: php-src/sapi/cli/php_cli.c diff -u php-src/sapi/cli/php_cli.c:1.146 php-src/sapi/cli/php_cli.c:1.147 --- php-src/sapi/cli/php_cli.c:1.146Tue Feb 21 20:12:43 2006 +++ php-src/sapi/cli/php_cli.c Tue Feb 21 21:14:36 2006 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_cli.c,v 1.146 2006/02/21 20:12:43 dmitry Exp $ */ +/* $Id: php_cli.c,v 1.147 2006/02/21 21:14:36 johannes Exp $ */ #include php.h #include php_globals.h @@ -438,10 +438,12 @@ args... Arguments passed to script. Use -- args when first argument\n starts with - or script is read from stdin\n \n +#if (HAVE_REFLECTION) --rf name Show information about function name.\n --rc name Show information about class name.\n --re name Show information about extension name.\n \n +#endif , prog, prog, prog, prog, prog, prog); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /sapi/cli php_cli.c
johannesTue Feb 21 21:15:13 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/sapi/cli php_cli.c Log: - MFH: List --rf/--rc/--re only with enabled reflection http://cvs.php.net/viewcvs.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.12r2=1.129.2.13diff_format=u Index: php-src/sapi/cli/php_cli.c diff -u php-src/sapi/cli/php_cli.c:1.129.2.12 php-src/sapi/cli/php_cli.c:1.129.2.13 --- php-src/sapi/cli/php_cli.c:1.129.2.12 Sun Jan 22 22:09:54 2006 +++ php-src/sapi/cli/php_cli.c Tue Feb 21 21:15:13 2006 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_cli.c,v 1.129.2.12 2006/01/22 22:09:54 helly Exp $ */ +/* $Id: php_cli.c,v 1.129.2.13 2006/02/21 21:15:13 johannes Exp $ */ #include php.h #include php_globals.h @@ -434,10 +434,12 @@ args... Arguments passed to script. Use -- args when first argument\n starts with - or script is read from stdin\n \n +#if (HAVE_REFLECTION) --rf name Show information about function name.\n --rc name Show information about class name.\n --re name Show information about extension name.\n \n +#endif , prog, prog, prog, prog, prog, prog); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl.php
helly Tue Feb 21 21:19:34 2006 UTC
Modified files:
/php-src/ext/splspl.php
Log:
- Ensure non abstract methods have code
# This is very usefull once doxygen 1.4.7 comes out with my patch :-)
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl.php?r1=1.68r2=1.69diff_format=u
Index: php-src/ext/spl/spl.php
diff -u php-src/ext/spl/spl.php:1.68 php-src/ext/spl/spl.php:1.69
--- php-src/ext/spl/spl.php:1.68Tue Feb 21 09:47:09 2006
+++ php-src/ext/spl/spl.php Tue Feb 21 21:19:34 2006
@@ -157,7 +157,7 @@
* @param class_namename of class to load
* @param file_extensions file extensions (use defaults if NULL)
*/
-function spl_autoload(string $class_name, string $file_extensions = NULL);
+function spl_autoload(string $class_name, string $file_extensions = NULL)
{/**/};
/** @ingroup SPL
* @brief Manual invocation of all registerd autoload functions
@@ -165,7 +165,7 @@
*
* @param class_namename of class to load
*/
-function spl_autoload_call(string $class_name);
+function spl_autoload_call(string $class_name) {/**/};
/** @ingroup SPL
* @brief Register and return default file extensions for spl_autoload
@@ -176,7 +176,7 @@
* @return comma separated list of file extensions to use in default autoload
*function.
*/
-function spl_autoload_extensions($file_extensions);
+function spl_autoload_extensions($file_extensions) {/**/};
/** @ingroup SPL
* @brief Return all registered autoload functionns
@@ -184,7 +184,7 @@
*
* @return array of all registered autoload functions or false
*/
-function spl_autoload_functions();
+function spl_autoload_functions() {/**/};
/** @ingroup SPL
* @brief Register given function as autoload implementation
@@ -194,7 +194,7 @@
* function name to register as autoload function.
* @param throw whether to throw or issue an error on failure.
*/
-function spl_autoload_register(string $autoload_function = spl_autoload,
$throw = true);
+function spl_autoload_register(string $autoload_function = spl_autoload,
$throw = true) {/**/};
/** @ingroup SPL
* @brief Unregister given function as autoload implementation
@@ -203,7 +203,7 @@
* @param autoload_function name of function or array of object/class and
* function name to unregister as autoload function.
*/
-function spl_autoload_unregister(string $autoload_function = spl_autoload);
+function spl_autoload_unregister(string $autoload_function = spl_autoload)
{/**/};
/** @ingroup SPL
* @brief Return an array of classes and interfaces in SPL
@@ -211,7 +211,7 @@
* @return array containing the names of all clsses and interfaces defined in
* extension SPL
*/
-function spl_classes();
+function spl_classes() {/**/};
/** @ingroup SPL
* @brief Count the elements in an iterator
@@ -219,7 +219,7 @@
*
* @return number of elements in an iterator
*/
-function iterator_count(Traversable $it);
+function iterator_count(Traversable $it) {/**/};
/** @ingroup SPL
* @brief Copy iterator elements into an array
@@ -228,7 +228,7 @@
* @param it iterator to copy
* @return array with elements copied from the iterator
*/
-function iterator_to_array(Traversable $it);
+function iterator_to_array(Traversable $it) {/**/};
/** @ingroup ZendEngine
* @brief Basic Exception class.
@@ -611,7 +611,7 @@
* @param $flags see setFlags().
* @param $iterator_class class used in getIterator()
*/
- function __construct($array, $flags = 0, $iterator_class =
ArrayIterator);
+ function __construct($array, $flags = 0, $iterator_class =
ArrayIterator) {/**/}
/** Set behavior flags.
*
@@ -620,90 +620,88 @@
* when accessed as list (var_dump, foreach, etc.)
*1 set: array indices can be accessed as properties in
read/write
*/
- function setFlags($flags);
+ function setFlags($flags) {/**/}
- /**
-* @ return current flags
+ /** @return current flags
*/
- function getFlags();
+ function getFlags() {/**/}
/** Sort the entries by values.
*/
- function asort();
+ function asort() {/**/}
/** Sort the entries by key.
*/
- function ksort();
+ function ksort() {/**/}
/** Sort the entries by values using user defined function.
*/
- function uasort(mixed cmp_function);
+ function uasort(mixed cmp_function) {/**/}
/** Sort the entries by key using user defined function.
*/
- function uksort(mixed cmp_function);
+ function uksort(mixed cmp_function) {/**/}
/** Sort the entries by values using natural order algorithm.
*/
- function natsort();
+ function natsort() {/**/}
/** Sort
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c
johannesTue Feb 21 21:42:54 2006 UTC
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
- Print deprecation info on reflection export
http://cvs.php.net/viewcvs.cgi/php-src/ext/reflection/php_reflection.c?r1=1.217r2=1.218diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.217
php-src/ext/reflection/php_reflection.c:1.218
--- php-src/ext/reflection/php_reflection.c:1.217 Tue Feb 21 21:38:28 2006
+++ php-src/ext/reflection/php_reflection.c Tue Feb 21 21:42:54 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.217 2006/02/21 21:38:28 sebastian Exp $ */
+/* $Id: php_reflection.c,v 1.218 2006/02/21 21:42:54 johannes Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -707,6 +707,9 @@
}
string_printf(str, );
+ if (fptr-common.fn_flags ZEND_ACC_DEPRECATED) {
+ string_printf(str, DEPRECATED );
+ }
if (fptr-common.fn_flags ZEND_ACC_ABSTRACT) {
string_printf(str, abstract );
}
@@ -4493,7 +4496,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.217
2006/02/21 21:38:28 sebastian Exp $);
+ php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.218
2006/02/21 21:42:54 johannes Exp $);
php_info_print_table_end();
} /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c
sebastian Tue Feb 21 21:38:28 2006 UTC Modified files: /php-src/ext/reflection php_reflection.c Log: Fix whitespace. http://cvs.php.net/viewcvs.cgi/php-src/ext/reflection/php_reflection.c?r1=1.216r2=1.217diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.216 php-src/ext/reflection/php_reflection.c:1.217 --- php-src/ext/reflection/php_reflection.c:1.216 Tue Feb 21 20:23:10 2006 +++ php-src/ext/reflection/php_reflection.c Tue Feb 21 21:38:28 2006 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_reflection.c,v 1.216 2006/02/21 20:23:10 sebastian Exp $ */ +/* $Id: php_reflection.c,v 1.217 2006/02/21 21:38:28 sebastian Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -4268,7 +4268,7 @@ ZEND_ME(reflection_method, isPublic, NULL, 0) ZEND_ME(reflection_method, isPrivate, NULL, 0) ZEND_ME(reflection_method, isProtected, NULL, 0) - ZEND_ME(reflection_method, isAbstract, NULL, 0) + ZEND_ME(reflection_method, isAbstract, NULL, 0) ZEND_ME(reflection_method, isFinal, NULL, 0) ZEND_ME(reflection_method, isStatic, NULL, 0) ZEND_ME(reflection_method, isDeprecated, NULL, 0) @@ -4493,7 +4493,7 @@ php_info_print_table_start(); php_info_print_table_header(2, Reflection, enabled); - php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.216 2006/02/21 20:23:10 sebastian Exp $); + php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.217 2006/02/21 21:38:28 sebastian Exp $); php_info_print_table_end(); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl.php /ext/spl/examples autoload.inc cachingrecursiveiterator.inc class_tree.php dba_array.php dba_dump.php dbaarray.inc dbareader.inc directoryfilterdots.inc direct
helly Tue Feb 21 23:21:53 2006 UTC Modified files: /php-src/ext/splspl.php /php-src/ext/spl/examples autoload.inc cachingrecursiveiterator.inc class_tree.php dba_array.php dba_dump.php dbaarray.inc dbareader.inc directoryfilterdots.inc directorygraphiterator.inc directorytree.inc directorytree.php directorytree_size.php directorytreeiterator.inc findfile.inc findfile.php ini_groups.php inigroups.inc keyfilter.inc regexfindfile.inc searchiterator.inc tree.php xml_tree.php xml_xpath_tree.php /php-src/ext/spl/internal appenditerator.inc cachingiterator.inc emptyiterator.inc filteriterator.inc infiniteiterator.inc iteratoriterator.inc limititerator.inc norewinditerator.inc outeriterator.inc parentiterator.inc recursivearrayiterator.inc recursivecachingiterator.inc recursivefilteriterator.inc recursiveiterator.inc recursiveiteratoriterator.inc seekableiterator.inc splfileobject.inc splobjectstorage.inc Log: - 2006 now http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl.php?r1=1.70r2=1.71diff_format=u Index: php-src/ext/spl/spl.php diff -u php-src/ext/spl/spl.php:1.70 php-src/ext/spl/spl.php:1.71 --- php-src/ext/spl/spl.php:1.70Tue Feb 21 21:22:39 2006 +++ php-src/ext/spl/spl.php Tue Feb 21 23:21:53 2006 @@ -6,7 +6,7 @@ * * SPL - Standard PHP Library * - * (c) Marcus Boerger, 2003 - 2005 + * (c) Marcus Boerger, 2003 - 2006 */ /** @mainpage SPL - Standard PHP Library http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/examples/autoload.inc?r1=1.7r2=1.8diff_format=u Index: php-src/ext/spl/examples/autoload.inc diff -u php-src/ext/spl/examples/autoload.inc:1.7 php-src/ext/spl/examples/autoload.inc:1.8 --- php-src/ext/spl/examples/autoload.inc:1.7 Tue Feb 8 19:10:04 2005 +++ php-src/ext/spl/examples/autoload.inc Tue Feb 21 23:21:53 2006 @@ -4,7 +4,7 @@ * @ingroup Examples * @brief function __autoload * @author Marcus Boerger - * @date2003 - 2005 + * @date2003 - 2006 * * SPL - Standard PHP Library */ http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/examples/cachingrecursiveiterator.inc?r1=1.10r2=1.11diff_format=u Index: php-src/ext/spl/examples/cachingrecursiveiterator.inc diff -u php-src/ext/spl/examples/cachingrecursiveiterator.inc:1.10 php-src/ext/spl/examples/cachingrecursiveiterator.inc:1.11 --- php-src/ext/spl/examples/cachingrecursiveiterator.inc:1.10 Mon Sep 19 18:28:01 2005 +++ php-src/ext/spl/examples/cachingrecursiveiterator.inc Tue Feb 21 23:21:53 2006 @@ -4,7 +4,7 @@ * @ingroup Examples * @brief class CachingRecursiveIterator * @author Marcus Boerger - * @date2003 - 2005 + * @date2003 - 2006 * * SPL - Standard PHP Library */ http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/examples/class_tree.php?r1=1.6r2=1.7diff_format=u Index: php-src/ext/spl/examples/class_tree.php diff -u php-src/ext/spl/examples/class_tree.php:1.6 php-src/ext/spl/examples/class_tree.php:1.7 --- php-src/ext/spl/examples/class_tree.php:1.6 Sun Oct 30 16:07:29 2005 +++ php-src/ext/spl/examples/class_tree.php Tue Feb 21 23:21:53 2006 @@ -4,7 +4,7 @@ * @brief Class Tree example * @ingroup Examples * @author Marcus Boerger - * @date2003 - 2005 + * @date2003 - 2006 * @version 1.1 * * Usage: php class_tree.php \class\ http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/examples/dba_array.php?r1=1.6r2=1.7diff_format=u Index: php-src/ext/spl/examples/dba_array.php diff -u php-src/ext/spl/examples/dba_array.php:1.6 php-src/ext/spl/examples/dba_array.php:1.7 --- php-src/ext/spl/examples/dba_array.php:1.6 Tue Feb 8 19:10:04 2005 +++ php-src/ext/spl/examples/dba_array.php Tue Feb 21 23:21:53 2006 @@ -4,7 +4,7 @@ * @brief Program DBA array utility * @ingroup Examples * @author Marcus Boerger - * @date2003 - 2005 + * @date2003 - 2006 * * Usage php dba_array.php \file\ \handler\ \key\ [\value\] * http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/examples/dba_dump.php?r1=1.10r2=1.11diff_format=u Index: php-src/ext/spl/examples/dba_dump.php diff -u php-src/ext/spl/examples/dba_dump.php:1.10 php-src/ext/spl/examples/dba_dump.php:1.11 --- php-src/ext/spl/examples/dba_dump.php:1.10 Tue Feb 8 19:10:04 2005 +++ php-src/ext/spl/examples/dba_dump.php Tue
Re: [PHP-CVS] cvs: php-src(PHP_4_4) /ext/openssl/tests bug25614.phpt /ext/session/tests bug31454.phpt /ext/standard/tests/general_functions bug32647.phpt /ext/standard/tests/serialize bug25378.phpt
On 20.02.2006 11:31, Dmitry Stogov wrote: dmitry Mon Feb 20 08:31:48 2006 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/openssl/tests bug25614.phpt /php-src/ext/session/tests bug31454.phpt /php-src/ext/standard/tests/general_functions bug32647.phpt /php-src/ext/standard/tests/serialize bug25378.phpt Log: Fixed test files (added docref) http://cvs.php.net/viewcvs.cgi/php-src/ext/openssl/tests/bug25614.phpt?r1=1.1.2.1r2=1.1.2.1.4.1diff_format=u Index: php-src/ext/openssl/tests/bug25614.phpt diff -u php-src/ext/openssl/tests/bug25614.phpt:1.1.2.1 php-src/ext/openssl/tests/bug25614.phpt:1.1.2.1.4.1 --- php-src/ext/openssl/tests/bug25614.phpt:1.1.2.1 Tue Sep 23 14:52:26 2003 +++ php-src/ext/openssl/tests/bug25614.phpt Mon Feb 20 08:31:48 2006 @@ -8,4 +8,4 @@ $pub = openssl_pkey_get_public($priv); ? --EXPECTF-- -Warning: openssl_pkey_get_public(): Don't know how to get public key from this private key (the documentation lied) %s +Warning: openssl_pkey_get_public() [/phpmanual/function.openssl-pkey-get-public.html]: Don't know how to get public key from this private key (the documentation lied) %s ^^ Are you sure you really want to add this? -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/wddx wddx.c
tony2001Wed Feb 22 07:25:09 2006 UTC Modified files: /php-src/ext/wddx wddx.c Log: fix ext/wddx build http://cvs.php.net/viewcvs.cgi/php-src/ext/wddx/wddx.c?r1=1.129r2=1.130diff_format=u Index: php-src/ext/wddx/wddx.c diff -u php-src/ext/wddx/wddx.c:1.129 php-src/ext/wddx/wddx.c:1.130 --- php-src/ext/wddx/wddx.c:1.129 Sat Jan 28 06:17:09 2006 +++ php-src/ext/wddx/wddx.c Wed Feb 22 07:25:09 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: wddx.c,v 1.129 2006/01/28 06:17:09 fmk Exp $ */ +/* $Id: wddx.c,v 1.130 2006/02/22 07:25:09 tony2001 Exp $ */ #include php.h @@ -239,7 +239,7 @@ php_wddx_add_chunk_static(packet, WDDX_STRUCT_S); PS_ENCODE_LOOP( - php_wddx_serialize_var(packet, *struc, key, key_length TSRMLS_CC); + php_wddx_serialize_var(packet, *struc, key.s, key_length TSRMLS_CC); ); php_wddx_add_chunk_static(packet, WDDX_STRUCT_E); @@ -479,7 +479,7 @@ sprintf(tmp_buf, WDDX_VAR_S, PHP_CLASS_NAME_VAR); php_wddx_add_chunk(packet, tmp_buf); php_wddx_add_chunk_static(packet, WDDX_STRING_S); - php_wddx_add_chunk_ex(packet, class_name, name_len); + php_wddx_add_chunk_ex(packet, class_name.s, name_len); php_wddx_add_chunk_static(packet, WDDX_STRING_E); php_wddx_add_chunk_static(packet, WDDX_VAR_E); @@ -511,7 +511,7 @@ sprintf(tmp_buf, WDDX_VAR_S, PHP_CLASS_NAME_VAR); php_wddx_add_chunk(packet, tmp_buf); php_wddx_add_chunk_static(packet, WDDX_STRING_S); - php_wddx_add_chunk_ex(packet, class_name, name_len); + php_wddx_add_chunk_ex(packet, class_name.s, name_len); php_wddx_add_chunk_static(packet, WDDX_STRING_E); php_wddx_add_chunk_static(packet, WDDX_VAR_E); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
