[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Wed Jan 30 01:31:32 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1228r2=1.1229diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1228 ZendEngine2/ChangeLog:1.1229 --- ZendEngine2/ChangeLog:1.1228Tue Jan 29 01:31:29 2008 +++ ZendEngine2/ChangeLog Wed Jan 30 01:31:32 2008 @@ -1,3 +1,40 @@ +2008-01-29 Dmitry Stogov [EMAIL PROTECTED] + +* zend_builtin_functions.c: + Unicode support + +* zend_execute_API.c + zend_execute_API.c + tests/bug43323.phpt: + Fixed bug #43323 (Wrong count abstract methods). (Felipe, Dmitry) + +* zend_execute.h + zend_execute.h: + Fixed types + +* tests/bug43323.phpt + tests/bug43323.phpt: + + file bug43323.phpt was initially added on branch PHP_5_3. + +* zend_gc.c + zend_gc.c + zend_gc.h + zend_gc.h + tests/bug43918.phpt: + Fixed bug #43918 (Segmentation fault in garbage collector) + +* tests/bug43918.phpt + tests/bug43918.phpt: + + file bug43918.phpt was initially added on branch PHP_5_3. + +2008-01-29 Antony Dovgal [EMAIL PROTECTED] + +* zend_compile.c + tests/bug30922.phpt: + fix typo and bug #43646 + 2008-01-28 Stanislav Malyshev [EMAIL PROTECTED] * zend_execute.h @@ -21005,7 +21042,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1228 2008/01/29 01:31:29 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1229 2008/01/30 01:31:32 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -22729,7 +22766,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1228 2008/01/29 01:31:29 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1229 2008/01/30 01:31:32 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
tony2001Tue Jan 29 09:30:09 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1061r2=1.2027.2.547.2.1062diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1061 php-src/NEWS:1.2027.2.547.2.1062 --- php-src/NEWS:1.2027.2.547.2.1061Mon Jan 28 16:12:54 2008 +++ php-src/NEWSTue Jan 29 09:30:08 2008 @@ -96,6 +96,7 @@ (Ilia) - Fixed bug #42190 (Constructing DateTime with TimeZone Indicator invalidates DateTimeZone). (Derick) +- Fixed bug #41941 (oci8 extension not lib64 savvy). (Chris) - Fixed bug #41599 (setTime() fails after modify() is used). (Derick) - Fixed bug #38468 (Unexpected creation of cycle). (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c ZendEngine2 zend_gc.c zend_gc.h ZendEngine2/tests bug43918.phpt
dmitry Tue Jan 29 09:59:53 2008 UTC
Modified files:
/ZendEngine2zend_gc.c zend_gc.h
/ZendEngine2/tests bug43918.phpt
/php-src/ext/simplexml simplexml.c
Log:
Fixed bug #43918 (Segmentation fault in garbage collector)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_gc.c?r1=1.3r2=1.4diff_format=u
Index: ZendEngine2/zend_gc.c
diff -u ZendEngine2/zend_gc.c:1.3 ZendEngine2/zend_gc.c:1.4
--- ZendEngine2/zend_gc.c:1.3 Thu Jan 24 11:54:55 2008
+++ ZendEngine2/zend_gc.c Tue Jan 29 09:59:53 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_gc.c,v 1.3 2008/01/24 11:54:55 dmitry Exp $ */
+/* $Id: zend_gc.c,v 1.4 2008/01/29 09:59:53 dmitry Exp $ */
#include zend.h
#include zend_API.h
@@ -47,6 +47,7 @@
static void gc_globals_ctor_ex(zend_gc_globals *gc_globals TSRMLS_DC)
{
gc_globals-gc_enabled = 0;
+ gc_globals-gc_active = 0;
gc_globals-buf = NULL;
@@ -156,8 +157,11 @@
zv-refcount__gc++;
gc_collect_cycles(TSRMLS_C);
zv-refcount__gc--;
- GC_ZVAL_SET_PURPLE(zv);
newRoot = GC_G(unused);
+ if (!newRoot) {
+ return;
+ }
+ GC_ZVAL_SET_PURPLE(zv);
}
GC_G(unused) = newRoot-prev;
@@ -183,7 +187,8 @@
{
struct _store_object *obj;
- if (UNEXPECTED(Z_OBJ_HT_P(zv)-get_properties == NULL)) {
+ if (UNEXPECTED(Z_OBJ_HT_P(zv)-get_properties == NULL ||
+ EG(objects_store).object_buckets == NULL)) {
return;
}
@@ -203,9 +208,12 @@
zv-refcount__gc++;
gc_collect_cycles(TSRMLS_C);
zv-refcount__gc--;
+ newRoot = GC_G(unused);
+ if (!newRoot) {
+ return;
+ }
obj =
EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(zv)].bucket.obj;
GC_SET_PURPLE(obj-buffered);
- newRoot = GC_G(unused);
}
GC_G(unused) = newRoot-prev;
@@ -240,7 +248,7 @@
{
GC_ZVAL_SET_BLACK(pz);
- if (Z_TYPE_P(pz) == IS_OBJECT) {
+ if (Z_TYPE_P(pz) == IS_OBJECT EG(objects_store).object_buckets) {
struct _store_object *obj =
EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].bucket.obj;
obj-refcount++;
@@ -282,7 +290,7 @@
GC_BENCH_INC(zval_marked_grey);
GC_ZVAL_SET_COLOR(pz, GC_GREY);
- if (Z_TYPE_P(pz) == IS_OBJECT) {
+ if (Z_TYPE_P(pz) == IS_OBJECT
EG(objects_store).object_buckets) {
struct _store_object *obj =
EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].bucket.obj;
obj-refcount--;
@@ -309,7 +317,7 @@
gc_root_buffer *current = GC_G(roots).next;
while (current != GC_G(roots)) {
- if (current-handle) {
+ if (current-handle EG(objects_store).object_buckets) {
struct _store_object *obj =
EG(objects_store).object_buckets[current-handle].bucket.obj;
if (GC_GET_COLOR(obj-buffered) == GC_PURPLE) {
@@ -337,15 +345,17 @@
static void zobj_scan(zval *pz TSRMLS_DC)
{
- struct _store_object *obj =
EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].bucket.obj;
+ if (EG(objects_store).object_buckets) {
+ struct _store_object *obj =
EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].bucket.obj;
- if (GC_GET_COLOR(obj-buffered) == GC_GREY) {
- if (obj-refcount 0) {
- zobj_scan_black(obj, pz TSRMLS_CC);
- } else {
- GC_SET_COLOR(obj-buffered, GC_WHITE);
- if (EXPECTED(Z_OBJ_HANDLER_P(pz, get_properties) !=
NULL)) {
- zend_hash_apply(Z_OBJPROP_P(pz), (apply_func_t)
children_scan TSRMLS_CC);
+ if (GC_GET_COLOR(obj-buffered) == GC_GREY) {
+ if (obj-refcount 0) {
+ zobj_scan_black(obj, pz TSRMLS_CC);
+ } else {
+ GC_SET_COLOR(obj-buffered, GC_WHITE);
+ if (EXPECTED(Z_OBJ_HANDLER_P(pz,
get_properties) != NULL)) {
+ zend_hash_apply(Z_OBJPROP_P(pz),
(apply_func_t) children_scan TSRMLS_CC);
+ }
}
[PHP-CVS] cvs: php-src /ext/standard/tests/array compact_variation1.phpt
nicholsrTue Jan 29 08:49:12 2008 UTC
Modified files:
/php-src/ext/standard/tests/array compact_variation1.phpt
Log:
- update compact_variation1.phpt to take into account fix for bug #29044
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/compact_variation1.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/array/compact_variation1.phpt
diff -u php-src/ext/standard/tests/array/compact_variation1.phpt:1.1
php-src/ext/standard/tests/array/compact_variation1.phpt:1.2
--- php-src/ext/standard/tests/array/compact_variation1.phpt:1.1Thu Jan
24 14:50:18 2008
+++ php-src/ext/standard/tests/array/compact_variation1.phptTue Jan 29
08:49:11 2008
@@ -29,12 +29,22 @@
var_dump (compact ($arr3));
echo Done;
?
---EXPECT--
+--EXPECTF--
*** Testing compact() : usage variations - arrays containg references ***
+
+Warning: compact(): recursion detected in %s on line %d
array(1) {
[a]=
int(1)
}
+
+Warning: compact(): recursion detected in %s on line %d
+
+Warning: compact(): recursion detected in %s on line %d
+
+Warning: compact(): recursion detected in %s on line %d
+
+Warning: compact(): recursion detected in %s on line %d
array(2) {
[a]=
int(1)
@@ -46,12 +56,22 @@
int(3)
}
Done
---UEXPECT--
+--UEXPECTF--
*** Testing compact() : usage variations - arrays containg references ***
+
+Warning: compact(): recursion detected in %s on line %d
array(1) {
[ua]=
int(1)
}
+
+Warning: compact(): recursion detected in %s on line %d
+
+Warning: compact(): recursion detected in %s on line %d
+
+Warning: compact(): recursion detected in %s on line %d
+
+Warning: compact(): recursion detected in %s on line %d
array(2) {
[ua]=
int(1)
--
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/standard/tests/array compact_variation1.phpt
nicholsrTue Jan 29 08:50:43 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/array compact_variation1.phpt
Log:
- MFH compact_variation1.phpt - fix for bug #29044
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/compact_variation1.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/compact_variation1.phpt
+++ php-src/ext/standard/tests/array/compact_variation1.phpt
--TEST--
Test compact() function : usage variations - arrays containing references.
--FILE--
?php
/* Prototype : proto array compact(mixed var_names [, mixed ...])
* Description: Creates a hash containing variables and their values
* Source code: ext/standard/array.c
* Alias to functions:
*/
/*
* compact variations - arrays with references
*/
echo *** Testing compact() : usage variations - arrays containg references
***\n;
$a=1;
$b=2;
$c=3;
$string=c;
$arr1=array (a,$arr1);
$arr2=array (a,array(array(array(b;
$arr2[1][0][0][]=$arr2;
$arr2[1][0][0][]=$arr2[1];
$arr3=array($string);
var_dump (compact ($arr1));
var_dump (compact ($arr2));
var_dump (compact ($arr3));
echo Done;
?
--EXPECT--
*** Testing compact() : usage variations - arrays containg references ***
array(1) {
[a]=
int(1)
}
array(2) {
[a]=
int(1)
[b]=
int(2)
}
array(1) {
[c]=
int(3)
}
Done
--UEXPECT--
*** Testing compact() : usage variations - arrays containg references ***
array(1) {
[ua]=
int(1)
}
array(2) {
[ua]=
int(1)
[ub]=
int(2)
}
array(1) {
[uc]=
int(3)
}
Done
--
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/simplexml simplexml.c ZendEngine2 zend_gc.c zend_gc.h ZendEngine2/tests bug43918.phpt
dmitry Tue Jan 29 09:59:42 2008 UTC
Added files: (Branch: PHP_5_3)
/ZendEngine2/tests bug43918.phpt
Modified files:
/ZendEngine2zend_gc.c zend_gc.h
/php-src/ext/simplexml simplexml.c
Log:
Fixed bug #43918 (Segmentation fault in garbage collector)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_gc.c?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: ZendEngine2/zend_gc.c
diff -u ZendEngine2/zend_gc.c:1.1.2.2 ZendEngine2/zend_gc.c:1.1.2.3
--- ZendEngine2/zend_gc.c:1.1.2.2 Thu Jan 24 11:48:54 2008
+++ ZendEngine2/zend_gc.c Tue Jan 29 09:59:42 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_gc.c,v 1.1.2.2 2008/01/24 11:48:54 dmitry Exp $ */
+/* $Id: zend_gc.c,v 1.1.2.3 2008/01/29 09:59:42 dmitry Exp $ */
#include zend.h
#include zend_API.h
@@ -47,6 +47,7 @@
static void gc_globals_ctor_ex(zend_gc_globals *gc_globals TSRMLS_DC)
{
gc_globals-gc_enabled = 0;
+ gc_globals-gc_active = 0;
gc_globals-buf = NULL;
@@ -156,8 +157,11 @@
zv-refcount__gc++;
gc_collect_cycles(TSRMLS_C);
zv-refcount__gc--;
- GC_ZVAL_SET_PURPLE(zv);
newRoot = GC_G(unused);
+ if (!newRoot) {
+ return;
+ }
+ GC_ZVAL_SET_PURPLE(zv);
}
GC_G(unused) = newRoot-prev;
@@ -183,7 +187,8 @@
{
struct _store_object *obj;
- if (UNEXPECTED(Z_OBJ_HT_P(zv)-get_properties == NULL)) {
+ if (UNEXPECTED(Z_OBJ_HT_P(zv)-get_properties == NULL ||
+ EG(objects_store).object_buckets == NULL)) {
return;
}
@@ -203,9 +208,12 @@
zv-refcount__gc++;
gc_collect_cycles(TSRMLS_C);
zv-refcount__gc--;
+ newRoot = GC_G(unused);
+ if (!newRoot) {
+ return;
+ }
obj =
EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(zv)].bucket.obj;
GC_SET_PURPLE(obj-buffered);
- newRoot = GC_G(unused);
}
GC_G(unused) = newRoot-prev;
@@ -240,7 +248,7 @@
{
GC_ZVAL_SET_BLACK(pz);
- if (Z_TYPE_P(pz) == IS_OBJECT) {
+ if (Z_TYPE_P(pz) == IS_OBJECT EG(objects_store).object_buckets) {
struct _store_object *obj =
EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].bucket.obj;
obj-refcount++;
@@ -282,7 +290,7 @@
GC_BENCH_INC(zval_marked_grey);
GC_ZVAL_SET_COLOR(pz, GC_GREY);
- if (Z_TYPE_P(pz) == IS_OBJECT) {
+ if (Z_TYPE_P(pz) == IS_OBJECT
EG(objects_store).object_buckets) {
struct _store_object *obj =
EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].bucket.obj;
obj-refcount--;
@@ -309,7 +317,7 @@
gc_root_buffer *current = GC_G(roots).next;
while (current != GC_G(roots)) {
- if (current-handle) {
+ if (current-handle EG(objects_store).object_buckets) {
struct _store_object *obj =
EG(objects_store).object_buckets[current-handle].bucket.obj;
if (GC_GET_COLOR(obj-buffered) == GC_PURPLE) {
@@ -337,15 +345,17 @@
static void zobj_scan(zval *pz TSRMLS_DC)
{
- struct _store_object *obj =
EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].bucket.obj;
+ if (EG(objects_store).object_buckets) {
+ struct _store_object *obj =
EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].bucket.obj;
- if (GC_GET_COLOR(obj-buffered) == GC_GREY) {
- if (obj-refcount 0) {
- zobj_scan_black(obj, pz TSRMLS_CC);
- } else {
- GC_SET_COLOR(obj-buffered, GC_WHITE);
- if (EXPECTED(Z_OBJ_HANDLER_P(pz, get_properties) !=
NULL)) {
- zend_hash_apply(Z_OBJPROP_P(pz), (apply_func_t)
children_scan TSRMLS_CC);
+ if (GC_GET_COLOR(obj-buffered) == GC_GREY) {
+ if (obj-refcount 0) {
+ zobj_scan_black(obj, pz TSRMLS_CC);
+ } else {
+ GC_SET_COLOR(obj-buffered, GC_WHITE);
+ if (EXPECTED(Z_OBJ_HANDLER_P(pz,
get_properties) != NULL)) {
+ zend_hash_apply(Z_OBJPROP_P(pz),
(apply_func_t) children_scan
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
tony2001Tue Jan 29 08:57:26 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.95r2=1.2027.2.547.2.965.2.96diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.95 php-src/NEWS:1.2027.2.547.2.965.2.96 --- php-src/NEWS:1.2027.2.547.2.965.2.95Mon Jan 28 23:08:54 2008 +++ php-src/NEWSTue Jan 29 08:57:26 2008 @@ -155,6 +155,8 @@ - Fixed bug #30907 (ibase_query() crashes (same bug as #32143). (Lars W) - Fixed bug #30690 (Resource handle from ibase_execute becomes invalid after return). (Lars W) +- Fixed bug #29044 (compact function doesn't have infinite recursion protection). + (Tony) - Fixed bug #27372 (parse error loading browscap.ini at apache startup). (Jani) -- 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/standard array.c /ext/standard/tests/array bug43505.phpt
dmitry Tue Jan 29 10:44:54 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/array bug43505.phpt
Modified files:
/php-srcNEWS
/php-src/ext/standard array.c
Log:
Fixed bug #43505 (Assign by reference bug)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1062r2=1.2027.2.547.2.1063diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1062 php-src/NEWS:1.2027.2.547.2.1063
--- php-src/NEWS:1.2027.2.547.2.1062Tue Jan 29 09:30:08 2008
+++ php-src/NEWSTue Jan 29 10:44:53 2008
@@ -39,6 +39,7 @@
timezone). (Derick)
- Fixed bug #43522 (stream_get_line() eats additional characters). (Felipe,
Ilia, Tony)
+- Fixed bug #43505 (Assign by reference bug). (Dmitry)
- Fixed bug #43497 (OCI8 XML/getClobVal aka temporary LOBs leak UGA memory).
(Chris)
- Fixed bug #43495 (array_merge_recursive() crashes with recursive arrays).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.47r2=1.308.2.21.2.48diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.47
php-src/ext/standard/array.c:1.308.2.21.2.48
--- php-src/ext/standard/array.c:1.308.2.21.2.47Mon Jan 14 22:10:08 2008
+++ php-src/ext/standard/array.cTue Jan 29 10:44:53 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.308.2.21.2.47 2008/01/14 22:10:08 shire Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.48 2008/01/29 10:44:53 dmitry Exp $ */
#include php.h
#include php_ini.h
@@ -324,7 +324,7 @@
if (Z_OBJ_HT_P(array)-get_class_entry
instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) {
zend_call_method_with_0_params(array, NULL,
NULL, count, retval);
if (retval) {
- convert_to_long(retval);
+ convert_to_long_ex(retval);
RETVAL_LONG(Z_LVAL_P(retval));
zval_ptr_dtor(retval);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug43505.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/bug43505.phpt
+++ php-src/ext/standard/tests/array/bug43505.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard array.c /ext/standard/tests/array bug43505.phpt
dmitry Tue Jan 29 10:45:19 2008 UTC
Modified files:
/php-src/ext/standard array.c
/php-src/ext/standard/tests/array bug43505.phpt
Log:
Fixed bug #43505 (Assign by reference bug)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.439r2=1.440diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.439 php-src/ext/standard/array.c:1.440
--- php-src/ext/standard/array.c:1.439 Tue Jan 29 00:39:26 2008
+++ php-src/ext/standard/array.cTue Jan 29 10:45:19 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.439 2008/01/29 00:39:26 tony2001 Exp $ */
+/* $Id: array.c,v 1.440 2008/01/29 10:45:19 dmitry Exp $ */
#include php.h
#include php_ini.h
@@ -324,7 +324,7 @@
if (Z_OBJ_HT_P(array)-get_class_entry
instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) {
zend_call_method_with_0_params(array, NULL,
NULL, count, retval);
if (retval) {
- convert_to_long(retval);
+ convert_to_long_ex(retval);
RETVAL_LONG(Z_LVAL_P(retval));
zval_ptr_dtor(retval);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug43505.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/array/bug43505.phpt
diff -u /dev/null php-src/ext/standard/tests/array/bug43505.phpt:1.2
--- /dev/null Tue Jan 29 10:45:19 2008
+++ php-src/ext/standard/tests/array/bug43505.phpt Tue Jan 29 10:45:19 2008
@@ -0,0 +1,43 @@
+--TEST--
+Bug #43505 (Assign by reference bug)
+--INI--
+error_reporting=0
+--FILE--
+?php
+class Test implements Countable {
+public function count() {
+return $some;
+}
+}
+
+$obj = new Test();
+
+$a = array();
+$b = $a['test'];
+var_dump($a);
+
+$t = count($obj);
+
+$a = array();
+$b = $a['test'];
+var_dump($a);
+?
+--EXPECT--
+array(1) {
+ [test]=
+ NULL
+}
+array(1) {
+ [test]=
+ NULL
+}
+--UEXPECT--
+array(1) {
+ [utest]=
+ NULL
+}
+array(1) {
+ [utest]=
+ NULL
+}
+
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cli/tests 006.phpt
tony2001Tue Jan 29 12:27:49 2008 UTC
Modified files:
/php-src/sapi/cli/tests 006.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/006.phpt?r1=1.7r2=1.8diff_format=u
Index: php-src/sapi/cli/tests/006.phpt
diff -u php-src/sapi/cli/tests/006.phpt:1.7 php-src/sapi/cli/tests/006.phpt:1.8
--- php-src/sapi/cli/tests/006.phpt:1.7 Sun Jan 27 19:10:26 2008
+++ php-src/sapi/cli/tests/006.phpt Tue Jan 29 12:27:49 2008
@@ -185,6 +185,8 @@
}
Function [ internal:date function date_timestamp_set ] {
}
+Function [ internal:date function date_timestamp_get ] {
+}
Function [ internal:date function timezone_open ] {
}
Function [ internal:date function timezone_name_get ] {
@@ -273,7 +275,7 @@
- Properties [0] {
}
- - Methods [10] {
+ - Methods [11] {
Method [ internal:date, ctor public method __construct ] {
}
@@ -303,6 +305,9 @@
Method [ internal:date public method setTimestamp ] {
}
+
+Method [ internal:date public method getTimestamp ] {
+}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd config.w32
dmitry Tue Jan 29 12:25:39 2008 UTC
Modified files:
/php-src/ext/mysqlndconfig.w32
Log:
missing spaces
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config.w32?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/mysqlnd/config.w32
diff -u php-src/ext/mysqlnd/config.w32:1.8 php-src/ext/mysqlnd/config.w32:1.9
--- php-src/ext/mysqlnd/config.w32:1.8 Mon Jan 28 23:24:05 2008
+++ php-src/ext/mysqlnd/config.w32 Tue Jan 29 12:25:38 2008
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.8 2008/01/28 23:24:05 andrey Exp $
+// $Id: config.w32,v 1.9 2008/01/29 12:25:38 dmitry Exp $
// vim:ft=javascript
if (CHECK_LIB(ws2_32.lib, mysqlnd)) {
mysqlnd_source =
mysqlnd.c +
- mysqlnd_block_alloc.c +
+ mysqlnd_block_alloc.c +
mysqlnd_charset.c +
mysqlnd_debug.c +
mysqlnd_loaddata.c +
@@ -15,7 +15,7 @@
mysqlnd_result.c +
mysqlnd_result_meta.c +
mysqlnd_statistics.c +
- mysqlnd_wireprotocol.c +
+ mysqlnd_wireprotocol.c +
php_mysqlnd.c;
EXTENSION(mysqlnd, mysqlnd_source, false);
}
--
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) /sapi/cli/tests 006.phpt
tony2001Tue Jan 29 12:23:48 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cli/tests 006.phpt
Log:
fix test
Derick, you're adding new methods too fast =)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/006.phpt?r1=1.1.2.9.2.3r2=1.1.2.9.2.4diff_format=u
Index: php-src/sapi/cli/tests/006.phpt
diff -u php-src/sapi/cli/tests/006.phpt:1.1.2.9.2.3
php-src/sapi/cli/tests/006.phpt:1.1.2.9.2.4
--- php-src/sapi/cli/tests/006.phpt:1.1.2.9.2.3 Sun Jan 27 19:10:41 2008
+++ php-src/sapi/cli/tests/006.phpt Tue Jan 29 12:23:48 2008
@@ -185,6 +185,8 @@
}
Function [ internal:date function date_timestamp_set ] {
}
+Function [ internal:date function date_timestamp_get ] {
+}
Function [ internal:date function timezone_open ] {
}
Function [ internal:date function timezone_name_get ] {
@@ -273,7 +275,7 @@
- Properties [0] {
}
- - Methods [10] {
+ - Methods [11] {
Method [ internal:date, ctor public method __construct ] {
}
@@ -303,6 +305,9 @@
Method [ internal:date public method setTimestamp ] {
}
+
+Method [ internal:date public method getTimestamp ] {
+}
}
}
--
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/mysqlnd mysqlnd.c mysqlnd_statistics.c mysqlnd_statistics.h
andrey Tue Jan 29 11:59:53 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd.c mysqlnd_statistics.c
mysqlnd_statistics.h
Log:
Moved initialization code into a function.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.5.2.11r2=1.5.2.12diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.5.2.11
php-src/ext/mysqlnd/mysqlnd.c:1.5.2.12
--- php-src/ext/mysqlnd/mysqlnd.c:1.5.2.11 Mon Jan 28 23:23:08 2008
+++ php-src/ext/mysqlnd/mysqlnd.c Tue Jan 29 11:59:53 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd.c,v 1.5.2.11 2008/01/28 23:23:08 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.5.2.12 2008/01/29 11:59:53 andrey Exp $ */
#include php.h
#include mysqlnd.h
#include mysqlnd_wireprotocol.h
@@ -133,10 +133,7 @@
mysqlnd_library_initted = TRUE;
_mysqlnd_init_ps_subsystem();
/* Should be calloc, as mnd_calloc will reference LOCK_access*/
- mysqlnd_global_stats = calloc(1, sizeof(MYSQLND_STATS));
-#ifdef ZTS
- mysqlnd_global_stats-LOCK_access = tsrm_mutex_alloc();
-#endif
+ mysqlnd_stats_init(mysqlnd_global_stats);
}
}
/* }}} */
@@ -146,11 +143,7 @@
void mysqlnd_library_end(TSRMLS_D)
{
if (mysqlnd_library_initted == TRUE) {
-#ifdef ZTS
- tsrm_mutex_free(mysqlnd_global_stats-LOCK_access);
-#endif
- /* mnd_free will reference LOCK_access and crash...*/
- free(mysqlnd_global_stats);
+ mysqlnd_stats_end(mysqlnd_global_stats);
mysqlnd_global_stats = NULL;
mysqlnd_library_initted = FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_statistics.c?r1=1.2.2.4r2=1.2.2.5diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_statistics.c
diff -u php-src/ext/mysqlnd/mysqlnd_statistics.c:1.2.2.4
php-src/ext/mysqlnd/mysqlnd_statistics.c:1.2.2.5
--- php-src/ext/mysqlnd/mysqlnd_statistics.c:1.2.2.4Wed Jan 23 19:11:28 2008
+++ php-src/ext/mysqlnd/mysqlnd_statistics.cTue Jan 29 11:59:53 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_statistics.c,v 1.2.2.4 2008/01/23 19:11:28 andrey Exp $ */
+/* $Id: mysqlnd_statistics.c,v 1.2.2.5 2008/01/29 11:59:53 andrey Exp $ */
#include php.h
#include mysqlnd.h
#include mysqlnd_priv.h
@@ -145,6 +145,32 @@
/* }}} */
+/* {{{ mysqlnd_stats_init */
+void
+mysqlnd_stats_init(MYSQLND_STATS ** stats)
+{
+ *stats = calloc(1, sizeof(MYSQLND_STATS));
+#ifdef ZTS
+ (*stats)-LOCK_access = tsrm_mutex_alloc();
+#endif
+
+}
+/* }}} */
+
+
+/* {{{ mysqlnd_stats_end */
+void
+mysqlnd_stats_end(MYSQLND_STATS * stats)
+{
+#ifdef ZTS
+ tsrm_mutex_free(stats-LOCK_access);
+#endif
+ /* mnd_free will reference LOCK_access and crash...*/
+ free(stats);
+}
+/* }}} */
+
+
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_statistics.h?r1=1.4.2.6r2=1.4.2.7diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_statistics.h
diff -u php-src/ext/mysqlnd/mysqlnd_statistics.h:1.4.2.6
php-src/ext/mysqlnd/mysqlnd_statistics.h:1.4.2.7
--- php-src/ext/mysqlnd/mysqlnd_statistics.h:1.4.2.6Wed Jan 23 19:11:28 2008
+++ php-src/ext/mysqlnd/mysqlnd_statistics.hTue Jan 29 11:59:53 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_statistics.h,v 1.4.2.6 2008/01/23 19:11:28 andrey Exp $ */
+/* $Id: mysqlnd_statistics.h,v 1.4.2.7 2008/01/29 11:59:53 andrey Exp $ */
#ifndef MYSQLND_STATISTICS_H
#define MYSQLND_STATISTICS_H
@@ -196,6 +196,10 @@
void mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, zval
*return_value
TSRMLS_DC
ZEND_FILE_LINE_DC);
+
+void mysqlnd_stats_init(MYSQLND_STATS ** stats);
+void mysqlnd_stats_end(MYSQLND_STATS * stats);
+
#endif /* MYSQLND_STATISTICS_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli.c mysqli_mysqlnd.h mysqli_nonapi.c mysqli_prop.c php_mysqli_structs.h /ext/mysqli/tests mysqli_get_client_stats.phpt /ext/mysqlnd mysqlnd.c mys
Hi Andrey, The win32 build is completely broken because of ext/mysqlnd. Thanks. Dmitry. Andrey Hristov wrote: andrey Mon Jan 28 18:25:51 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqli mysqli.c mysqli_mysqlnd.h mysqli_nonapi.c mysqli_prop.c php_mysqli_structs.h /php-src/ext/mysqli/tests mysqli_get_client_stats.phpt /php-src/ext/mysqlnd mysqlnd.c mysqlnd.h mysqlnd_enum_n_def.h mysqlnd_libmysql_compat.h mysqlnd_priv.h mysqlnd_ps.c mysqlnd_result.c mysqlnd_result.h mysqlnd_result_meta.c mysqlnd_structs.h mysqlnd_wireprotocol.c mysqlnd_wireprotocol.h Log: More optimizations - less MM calls Clearly separated fetching (physical reading) from decoding phases (data interpretation). Threaded fetching added but disabled as needs more work for Windows. For Linux needs some touches to add pthreads if this is enabled, probably with a compile-time switch. The code reorganisation makes it easy to add also async API, similar to cURL's one. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml simplexml.c ZendEngine2 zend_gc.c zend_gc.h ZendEngine2/tests bug43918.phpt
Hello Dmitry,
Tuesday, January 29, 2008, 10:59:42 AM, you wrote:
[...]
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.8r2=1.151.2.22.2.35.2.9diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.8
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.9
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.8 Wed Jan 23
09:52:57 2008
+++ php-src/ext/simplexml/simplexml.c Tue Jan 29 09:59:42 2008
@@ -1081,6 +1081,9 @@
zend_hash_init(rv, 0, NULL, ZVAL_PTR_DTOR, 0);
}
else if (sxe-properties) {
+ if (GC_G(gc_active)) {
+ return sxe-properties;
+ }
zend_hash_clean(sxe-properties);
rv = sxe-properties;
} else {
Excuse my ignorance to the GC stuff :-) but this change results in a very
big change of behavior, so how is this a fix?
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/dom xpath.c
sebastian Tue Jan 29 15:55:14 2008 UTC
Modified files:
/php-src/ext/domxpath.c
Log:
Add Reflection API metadata for DOMXPath.
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/xpath.c?r1=1.36r2=1.37diff_format=u
Index: php-src/ext/dom/xpath.c
diff -u php-src/ext/dom/xpath.c:1.36 php-src/ext/dom/xpath.c:1.37
--- php-src/ext/dom/xpath.c:1.36Mon Dec 31 07:12:09 2007
+++ php-src/ext/dom/xpath.c Tue Jan 29 15:55:14 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xpath.c,v 1.36 2007/12/31 07:12:09 sebastian Exp $ */
+/* $Id: xpath.c,v 1.37 2008/01/29 15:55:14 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -36,12 +36,41 @@
#if defined(LIBXML_XPATH_ENABLED)
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_construct, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_register_ns, 0, 0, 2)
+ ZEND_ARG_INFO(0, prefix)
+ ZEND_ARG_INFO(0, uri)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_query, 0, 0, 1)
+ ZEND_ARG_INFO(0, expr)
+ ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_evaluate, 0, 0, 1)
+ ZEND_ARG_INFO(0, expr)
+ ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_register_php_functions, 0, 0, 0)
+ZEND_END_ARG_INFO();
+/* }}} */
+
const zend_function_entry php_dom_xpath_class_functions[] = {
- PHP_ME(domxpath, __construct, NULL, ZEND_ACC_PUBLIC)
- PHP_FALIAS(registerNamespace, dom_xpath_register_ns, NULL)
- PHP_FALIAS(query, dom_xpath_query, NULL)
- PHP_FALIAS(evaluate, dom_xpath_evaluate, NULL)
- PHP_FALIAS(registerPhpFunctions, dom_xpath_register_php_functions, NULL)
+ PHP_ME(domxpath, __construct, arginfo_dom_xpath_construct,
ZEND_ACC_PUBLIC)
+ PHP_FALIAS(registerNamespace, dom_xpath_register_ns,
arginfo_dom_xpath_register_ns)
+ PHP_FALIAS(query, dom_xpath_query, arginfo_dom_xpath_query)
+ PHP_FALIAS(evaluate, dom_xpath_evaluate, arginfo_dom_xpath_evaluate)
+ PHP_FALIAS(registerPhpFunctions, dom_xpath_register_php_functions,
arginfo_dom_xpath_register_php_functions)
{NULL, NULL, NULL}
};
--
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/dom xpath.c
sebastian Tue Jan 29 15:55:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/domxpath.c
Log:
MFH: Add Reflection API metadata for DOMXPath.
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/xpath.c?r1=1.26.2.1.2.1.2.3r2=1.26.2.1.2.1.2.4diff_format=u
Index: php-src/ext/dom/xpath.c
diff -u php-src/ext/dom/xpath.c:1.26.2.1.2.1.2.3
php-src/ext/dom/xpath.c:1.26.2.1.2.1.2.4
--- php-src/ext/dom/xpath.c:1.26.2.1.2.1.2.3Fri Jan 25 16:13:04 2008
+++ php-src/ext/dom/xpath.c Tue Jan 29 15:55:23 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xpath.c,v 1.26.2.1.2.1.2.3 2008/01/25 16:13:04 rrichards Exp $ */
+/* $Id: xpath.c,v 1.26.2.1.2.1.2.4 2008/01/29 15:55:23 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -36,12 +36,41 @@
#if defined(LIBXML_XPATH_ENABLED)
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_construct, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_register_ns, 0, 0, 2)
+ ZEND_ARG_INFO(0, prefix)
+ ZEND_ARG_INFO(0, uri)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_query, 0, 0, 1)
+ ZEND_ARG_INFO(0, expr)
+ ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_evaluate, 0, 0, 1)
+ ZEND_ARG_INFO(0, expr)
+ ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_register_php_functions, 0, 0, 0)
+ZEND_END_ARG_INFO();
+/* }}} */
+
const zend_function_entry php_dom_xpath_class_functions[] = {
- PHP_ME(domxpath, __construct, NULL, ZEND_ACC_PUBLIC)
- PHP_FALIAS(registerNamespace, dom_xpath_register_ns, NULL)
- PHP_FALIAS(query, dom_xpath_query, NULL)
- PHP_FALIAS(evaluate, dom_xpath_evaluate, NULL)
- PHP_FALIAS(registerPhpFunctions, dom_xpath_register_php_functions, NULL)
+ PHP_ME(domxpath, __construct, arginfo_dom_xpath_construct,
ZEND_ACC_PUBLIC)
+ PHP_FALIAS(registerNamespace, dom_xpath_register_ns,
arginfo_dom_xpath_register_ns)
+ PHP_FALIAS(query, dom_xpath_query, arginfo_dom_xpath_query)
+ PHP_FALIAS(evaluate, dom_xpath_evaluate, arginfo_dom_xpath_evaluate)
+ PHP_FALIAS(registerPhpFunctions, dom_xpath_register_php_functions,
arginfo_dom_xpath_register_php_functions)
{NULL, NULL, NULL}
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Tue Jan 29 17:21:04 2008 UTC Modified files: /CVSROOTavail Log: More karma for Felipe and a new doc contributor http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1351r2=1.1352diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1351 CVSROOT/avail:1.1352 --- CVSROOT/avail:1.1351Tue Jan 29 17:17:58 2008 +++ CVSROOT/avail Tue Jan 29 17:21:04 2008 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjor! i,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no +avail|dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjor! i,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no # fastcgi implementation for IIS avail|shane,wez,edink|fastcgi-isapi @@ -44,7 +44,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,c!
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom xpath.c
sebastian Tue Jan 29 15:55:30 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/domxpath.c
Log:
MFH: Add Reflection API metadata for DOMXPath.
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/xpath.c?r1=1.26.2.1.2.2r2=1.26.2.1.2.3diff_format=u
Index: php-src/ext/dom/xpath.c
diff -u php-src/ext/dom/xpath.c:1.26.2.1.2.2
php-src/ext/dom/xpath.c:1.26.2.1.2.3
--- php-src/ext/dom/xpath.c:1.26.2.1.2.2Mon Dec 31 07:20:06 2007
+++ php-src/ext/dom/xpath.c Tue Jan 29 15:55:29 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xpath.c,v 1.26.2.1.2.2 2007/12/31 07:20:06 sebastian Exp $ */
+/* $Id: xpath.c,v 1.26.2.1.2.3 2008/01/29 15:55:29 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -36,11 +36,36 @@
#if defined(LIBXML_XPATH_ENABLED)
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_construct, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_register_ns, 0, 0, 2)
+ ZEND_ARG_INFO(0, prefix)
+ ZEND_ARG_INFO(0, uri)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_query, 0, 0, 1)
+ ZEND_ARG_INFO(0, expr)
+ ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_evaluate, 0, 0, 1)
+ ZEND_ARG_INFO(0, expr)
+ ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0)
+ZEND_END_ARG_INFO();
+/* }}} */
+
zend_function_entry php_dom_xpath_class_functions[] = {
- PHP_ME(domxpath, __construct, NULL, ZEND_ACC_PUBLIC)
- PHP_FALIAS(registerNamespace, dom_xpath_register_ns, NULL)
- PHP_FALIAS(query, dom_xpath_query, NULL)
- PHP_FALIAS(evaluate, dom_xpath_evaluate, NULL)
+ PHP_ME(domxpath, __construct, arginfo_dom_xpath_construct,
ZEND_ACC_PUBLIC)
+ PHP_FALIAS(registerNamespace, dom_xpath_register_ns,
arginfo_dom_xpath_register_ns)
+ PHP_FALIAS(query, dom_xpath_query, arginfo_dom_xpath_query)
+ PHP_FALIAS(evaluate, dom_xpath_evaluate, arginfo_dom_xpath_evaluate)
{NULL, NULL, NULL}
};
--
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) /ext/dom node.c
sebastian Tue Jan 29 15:23:25 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/domnode.c
Log:
MFH: Add Reflection API metadata for DOMNode.
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.37.2.3.2.9r2=1.37.2.3.2.10diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.37.2.3.2.9 php-src/ext/dom/node.c:1.37.2.3.2.10
--- php-src/ext/dom/node.c:1.37.2.3.2.9 Mon Dec 31 07:20:06 2007
+++ php-src/ext/dom/node.c Tue Jan 29 15:23:25 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: node.c,v 1.37.2.3.2.9 2007/12/31 07:20:06 sebastian Exp $ */
+/* $Id: node.c,v 1.37.2.3.2.10 2008/01/29 15:23:25 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -27,6 +27,122 @@
#if HAVE_LIBXML HAVE_DOM
#include php_dom.h
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 2)
+ ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+ ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_replace_child, 0, 0, 2)
+ ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+ ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_remove_child, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_append_child, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_has_child_nodes, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_clone_node, 0, 0, 1)
+ ZEND_ARG_INFO(0, deep)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_normalize, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_supported, 0, 0, 2)
+ ZEND_ARG_INFO(0, feature)
+ ZEND_ARG_INFO(0, version)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_has_attributes, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_compare_document_position, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_same_node, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_prefix, 0, 0, 1)
+ ZEND_ARG_INFO(0, namespaceURI)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_default_namespace, 0, 0, 1)
+ ZEND_ARG_INFO(0, namespaceURI)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_namespace_uri, 0, 0, 1)
+ ZEND_ARG_INFO(0, prefix)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_equal_node, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_feature, 0, 0, 2)
+ ZEND_ARG_INFO(0, feature)
+ ZEND_ARG_INFO(0, version)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_set_user_data, 0, 0, 3)
+ ZEND_ARG_INFO(0, key)
+ ZEND_ARG_OBJ_INFO(0, data, DOMUserData, 0)
+ ZEND_ARG_INFO(0, handler)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_user_data, 0, 0, 1)
+ ZEND_ARG_INFO(0, key)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_getNodePath, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14N, 0, 0, 0)
+ ZEND_ARG_INFO(0, exclusive)
+ ZEND_ARG_INFO(0, with_comments)
+ ZEND_ARG_ARRAY_INFO(0, xpath, 0)
+ ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14NFile, 0, 0, 1)
+ ZEND_ARG_INFO(0, uri)
+ ZEND_ARG_INFO(0, exclusive)
+ ZEND_ARG_INFO(0, with_comments)
+ ZEND_ARG_ARRAY_INFO(0, xpath, 0)
+ ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ZEND_END_ARG_INFO();
+/* }}} */
+
/*
* class DOMNode
*
@@ -35,27 +151,27 @@
*/
zend_function_entry php_dom_node_class_functions[] = {
- PHP_FALIAS(insertBefore, dom_node_insert_before, NULL)
- PHP_FALIAS(replaceChild, dom_node_replace_child, NULL)
- PHP_FALIAS(removeChild, dom_node_remove_child, NULL)
- PHP_FALIAS(appendChild, dom_node_append_child, NULL)
- PHP_FALIAS(hasChildNodes, dom_node_has_child_nodes, NULL)
- PHP_FALIAS(cloneNode, dom_node_clone_node, NULL)
- PHP_FALIAS(normalize, dom_node_normalize, NULL)
- PHP_FALIAS(isSupported, dom_node_is_supported, NULL)
- PHP_FALIAS(hasAttributes, dom_node_has_attributes, NULL)
- PHP_FALIAS(compareDocumentPosition, dom_node_compare_document_position,
NULL)
- PHP_FALIAS(isSameNode, dom_node_is_same_node, NULL)
-
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom node.c
sebastian Tue Jan 29 15:23:18 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/domnode.c
Log:
MFH: Add Reflection API metadata for DOMNode.
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.37.2.3.2.8.2.3r2=1.37.2.3.2.8.2.4diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.37.2.3.2.8.2.3
php-src/ext/dom/node.c:1.37.2.3.2.8.2.4
--- php-src/ext/dom/node.c:1.37.2.3.2.8.2.3 Mon Dec 31 07:17:07 2007
+++ php-src/ext/dom/node.c Tue Jan 29 15:23:18 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: node.c,v 1.37.2.3.2.8.2.3 2007/12/31 07:17:07 sebastian Exp $ */
+/* $Id: node.c,v 1.37.2.3.2.8.2.4 2008/01/29 15:23:18 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -27,6 +27,122 @@
#if HAVE_LIBXML HAVE_DOM
#include php_dom.h
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 2)
+ ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+ ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_replace_child, 0, 0, 2)
+ ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+ ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_remove_child, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_append_child, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_has_child_nodes, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_clone_node, 0, 0, 1)
+ ZEND_ARG_INFO(0, deep)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_normalize, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_supported, 0, 0, 2)
+ ZEND_ARG_INFO(0, feature)
+ ZEND_ARG_INFO(0, version)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_has_attributes, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_compare_document_position, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_same_node, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_prefix, 0, 0, 1)
+ ZEND_ARG_INFO(0, namespaceURI)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_default_namespace, 0, 0, 1)
+ ZEND_ARG_INFO(0, namespaceURI)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_namespace_uri, 0, 0, 1)
+ ZEND_ARG_INFO(0, prefix)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_equal_node, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_feature, 0, 0, 2)
+ ZEND_ARG_INFO(0, feature)
+ ZEND_ARG_INFO(0, version)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_set_user_data, 0, 0, 3)
+ ZEND_ARG_INFO(0, key)
+ ZEND_ARG_OBJ_INFO(0, data, DOMUserData, 0)
+ ZEND_ARG_INFO(0, handler)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_user_data, 0, 0, 1)
+ ZEND_ARG_INFO(0, key)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_getNodePath, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14N, 0, 0, 0)
+ ZEND_ARG_INFO(0, exclusive)
+ ZEND_ARG_INFO(0, with_comments)
+ ZEND_ARG_ARRAY_INFO(0, xpath, 0)
+ ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14NFile, 0, 0, 1)
+ ZEND_ARG_INFO(0, uri)
+ ZEND_ARG_INFO(0, exclusive)
+ ZEND_ARG_INFO(0, with_comments)
+ ZEND_ARG_ARRAY_INFO(0, xpath, 0)
+ ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ZEND_END_ARG_INFO();
+/* }}} */
+
/*
* class DOMNode
*
@@ -35,27 +151,27 @@
*/
const zend_function_entry php_dom_node_class_functions[] = {
- PHP_FALIAS(insertBefore, dom_node_insert_before, NULL)
- PHP_FALIAS(replaceChild, dom_node_replace_child, NULL)
- PHP_FALIAS(removeChild, dom_node_remove_child, NULL)
- PHP_FALIAS(appendChild, dom_node_append_child, NULL)
- PHP_FALIAS(hasChildNodes, dom_node_has_child_nodes, NULL)
- PHP_FALIAS(cloneNode, dom_node_clone_node, NULL)
- PHP_FALIAS(normalize, dom_node_normalize, NULL)
- PHP_FALIAS(isSupported, dom_node_is_supported, NULL)
- PHP_FALIAS(hasAttributes, dom_node_has_attributes, NULL)
- PHP_FALIAS(compareDocumentPosition, dom_node_compare_document_position,
NULL)
- PHP_FALIAS(isSameNode,
[PHP-CVS] cvs: php-src /main fopen_wrappers.c
dmitry Tue Jan 29 14:25:08 2008 UTC
Modified files:
/php-src/main fopen_wrappers.c
Log:
Fixed bug #43491 (Under certain conditions, file_exists() never returns)
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.c?r1=1.201r2=1.202diff_format=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.201 php-src/main/fopen_wrappers.c:1.202
--- php-src/main/fopen_wrappers.c:1.201 Mon Dec 31 07:12:18 2007
+++ php-src/main/fopen_wrappers.c Tue Jan 29 14:25:07 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fopen_wrappers.c,v 1.201 2007/12/31 07:12:18 sebastian Exp $ */
+/* $Id: fopen_wrappers.c,v 1.202 2008/01/29 14:25:07 dmitry Exp $ */
/* {{{ includes
*/
@@ -204,6 +204,9 @@
path_len = path_file - path_tmp + 1;
#if defined(PHP_WIN32) || defined(NETWARE)
if (path_len 1 path_tmp[path_len - 2] == ':') {
+ if (path_len != 3) {
+ return -1;
+ }
/* this is c:\ */
path_tmp[path_len] = '\0';
} else {
--
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) /main fopen_wrappers.c
dmitry Tue Jan 29 14:24:55 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main fopen_wrappers.c
Log:
Fixed bug #43491 (Under certain conditions, file_exists() never returns)
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.c?r1=1.175.2.3.2.13.2.5r2=1.175.2.3.2.13.2.6diff_format=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.175.2.3.2.13.2.5
php-src/main/fopen_wrappers.c:1.175.2.3.2.13.2.6
--- php-src/main/fopen_wrappers.c:1.175.2.3.2.13.2.5Mon Dec 31 07:17:17 2007
+++ php-src/main/fopen_wrappers.c Tue Jan 29 14:24:55 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fopen_wrappers.c,v 1.175.2.3.2.13.2.5 2007/12/31 07:17:17 sebastian
Exp $ */
+/* $Id: fopen_wrappers.c,v 1.175.2.3.2.13.2.6 2008/01/29 14:24:55 dmitry Exp $
*/
/* {{{ includes
*/
@@ -148,6 +148,9 @@
path_len = path_file - path_tmp + 1;
#if defined(PHP_WIN32) || defined(NETWARE)
if (path_len 1 path_tmp[path_len - 2] == ':') {
+ if (path_len != 3) {
+ return -1;
+ }
/* this is c:\ */
path_tmp[path_len] = '\0';
} else {
--
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) / NEWS
tony2001Tue Jan 29 13:39:58 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: entry moved to 5_2 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.97r2=1.2027.2.547.2.965.2.98diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.97 php-src/NEWS:1.2027.2.547.2.965.2.98 --- php-src/NEWS:1.2027.2.547.2.965.2.97Tue Jan 29 11:12:57 2008 +++ php-src/NEWSTue Jan 29 13:39:57 2008 @@ -98,8 +98,6 @@ to different characters with cp1251 and cp866. (Scott) - Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf) -- Fixed bug #43927 (koi8r is missing from html_entity_decode()). - (andy at demos dot su, Tony) - Fixed bug #43808 (date_create never fails (even when it should)). (Derick) - Fixed bug #43559 (array_merge_recursive() doesn't behave as expected with duplicate NULL values). (Felipe, Tony) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml simplexml.c ZendEngine2 zend_gc.c zend_gc.h ZendEngine2/tests bug43918.phpt
The fix affects get_properties() callback only in the moments when GC is
in progress (not when GC is enabled).
The SimpleXML extensions already makes a trick keeping and reusing
fictive properties HashTable, so I've extend it to support GC.
Thanks. Dmitry.
Marcus Boerger wrote:
Hello Dmitry,
Tuesday, January 29, 2008, 10:59:42 AM, you wrote:
[...]
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.8r2=1.151.2.22.2.35.2.9diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.8
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.9
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.8 Wed Jan 23
09:52:57 2008
+++ php-src/ext/simplexml/simplexml.c Tue Jan 29 09:59:42 2008
@@ -1081,6 +1081,9 @@
zend_hash_init(rv, 0, NULL, ZVAL_PTR_DTOR, 0);
}
else if (sxe-properties) {
+ if (GC_G(gc_active)) {
+ return sxe-properties;
+ }
zend_hash_clean(sxe-properties);
rv = sxe-properties;
} else {
Excuse my ignorance to the GC stuff :-) but this change results in a very
big change of behavior, so how is this a fix?
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(PHP_5_2) /ext/date/tests bug43003.phpt
dmitry Tue Jan 29 10:43:42 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/date/tests bug43003.phpt
Log:
Fixed test
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug43003.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/ext/date/tests/bug43003.phpt
diff -u php-src/ext/date/tests/bug43003.phpt:1.1.4.2
php-src/ext/date/tests/bug43003.phpt:1.1.4.3
--- php-src/ext/date/tests/bug43003.phpt:1.1.4.2Sat Jan 26 16:26:47 2008
+++ php-src/ext/date/tests/bug43003.phptTue Jan 29 10:43:42 2008
@@ -2,6 +2,8 @@
Bug #43003 (Invalid timezone reported for DateTime objects constructed using a
timestamp)
--FILE--
?php
+date_default_timezone_set('Europe/Oslo');
+
$oDateTest = new DateTime(@0, new DateTimeZone(date_default_timezone_get()));
echo $oDateTest-getTimezone()-getName().: . $oDateTest-format(Y-m-d
H:i:s).\n;
--
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/mysqlnd config.w32
dmitry Tue Jan 29 12:25:25 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlndconfig.w32
Log:
missing spaces
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config.w32?r1=1.4.2.5r2=1.4.2.6diff_format=u
Index: php-src/ext/mysqlnd/config.w32
diff -u php-src/ext/mysqlnd/config.w32:1.4.2.5
php-src/ext/mysqlnd/config.w32:1.4.2.6
--- php-src/ext/mysqlnd/config.w32:1.4.2.5 Mon Jan 28 23:23:08 2008
+++ php-src/ext/mysqlnd/config.w32 Tue Jan 29 12:25:25 2008
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.4.2.5 2008/01/28 23:23:08 andrey Exp $
+// $Id: config.w32,v 1.4.2.6 2008/01/29 12:25:25 dmitry Exp $
// vim:ft=javascript
if (CHECK_LIB(ws2_32.lib, mysqlnd)) {
mysqlnd_source =
mysqlnd.c +
- mysqlnd_block_alloc.c +
+ mysqlnd_block_alloc.c +
mysqlnd_charset.c +
mysqlnd_debug.c +
mysqlnd_loaddata.c +
@@ -15,7 +15,7 @@
mysqlnd_result.c +
mysqlnd_result_meta.c +
mysqlnd_statistics.c +
- mysqlnd_wireprotocol.c +
+ mysqlnd_wireprotocol.c +
php_mysqlnd.c;
EXTENSION(mysqlnd, mysqlnd_source, false);
}
--
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.c mysqlnd_statistics.c mysqlnd_statistics.h
andrey Tue Jan 29 12:00:52 2008 UTC
Modified files:
/php-src/ext/mysqlndmysqlnd.c mysqlnd_statistics.c
mysqlnd_statistics.h
Log:
Moved initialization into a separate function
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.14r2=1.15diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.14 php-src/ext/mysqlnd/mysqlnd.c:1.15
--- php-src/ext/mysqlnd/mysqlnd.c:1.14 Mon Jan 28 23:24:05 2008
+++ php-src/ext/mysqlnd/mysqlnd.c Tue Jan 29 12:00:52 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd.c,v 1.14 2008/01/28 23:24:05 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.15 2008/01/29 12:00:52 andrey Exp $ */
#include php.h
#include mysqlnd.h
#include mysqlnd_wireprotocol.h
@@ -133,10 +133,7 @@
mysqlnd_library_initted = TRUE;
_mysqlnd_init_ps_subsystem();
/* Should be calloc, as mnd_calloc will reference LOCK_access*/
- mysqlnd_global_stats = calloc(1, sizeof(MYSQLND_STATS));
-#ifdef ZTS
- mysqlnd_global_stats-LOCK_access = tsrm_mutex_alloc();
-#endif
+ mysqlnd_stats_init(mysqlnd_global_stats);
}
}
/* }}} */
@@ -146,11 +143,7 @@
void mysqlnd_library_end(TSRMLS_D)
{
if (mysqlnd_library_initted == TRUE) {
-#ifdef ZTS
- tsrm_mutex_free(mysqlnd_global_stats-LOCK_access);
-#endif
- /* mnd_free will reference LOCK_access and crash...*/
- free(mysqlnd_global_stats);
+ mysqlnd_stats_end(mysqlnd_global_stats);
mysqlnd_global_stats = NULL;
mysqlnd_library_initted = FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_statistics.c?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_statistics.c
diff -u php-src/ext/mysqlnd/mysqlnd_statistics.c:1.3
php-src/ext/mysqlnd/mysqlnd_statistics.c:1.4
--- php-src/ext/mysqlnd/mysqlnd_statistics.c:1.3Mon Dec 31 07:12:12 2007
+++ php-src/ext/mysqlnd/mysqlnd_statistics.cTue Jan 29 12:00:52 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_statistics.c,v 1.3 2007/12/31 07:12:12 sebastian Exp $ */
+/* $Id: mysqlnd_statistics.c,v 1.4 2008/01/29 12:00:52 andrey Exp $ */
#include php.h
#include mysqlnd.h
#include mysqlnd_priv.h
@@ -145,6 +145,32 @@
/* }}} */
+/* {{{ mysqlnd_stats_init */
+void
+mysqlnd_stats_init(MYSQLND_STATS ** stats)
+{
+ *stats = calloc(1, sizeof(MYSQLND_STATS));
+#ifdef ZTS
+ (*stats)-LOCK_access = tsrm_mutex_alloc();
+#endif
+
+}
+/* }}} */
+
+
+/* {{{ mysqlnd_stats_end */
+void
+mysqlnd_stats_end(MYSQLND_STATS * stats)
+{
+#ifdef ZTS
+ tsrm_mutex_free(stats-LOCK_access);
+#endif
+ /* mnd_free will reference LOCK_access and crash...*/
+ free(stats);
+}
+/* }}} */
+
+
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_statistics.h?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_statistics.h
diff -u php-src/ext/mysqlnd/mysqlnd_statistics.h:1.6
php-src/ext/mysqlnd/mysqlnd_statistics.h:1.7
--- php-src/ext/mysqlnd/mysqlnd_statistics.h:1.6Wed Jan 2 21:16:46 2008
+++ php-src/ext/mysqlnd/mysqlnd_statistics.hTue Jan 29 12:00:52 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_statistics.h,v 1.6 2008/01/02 21:16:46 andrey Exp $ */
+/* $Id: mysqlnd_statistics.h,v 1.7 2008/01/29 12:00:52 andrey Exp $ */
#ifndef MYSQLND_STATISTICS_H
#define MYSQLND_STATISTICS_H
@@ -196,6 +196,10 @@
void mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, zval
*return_value
TSRMLS_DC
ZEND_FILE_LINE_DC);
+
+void mysqlnd_stats_init(MYSQLND_STATS ** stats);
+void mysqlnd_stats_end(MYSQLND_STATS * stats);
+
#endif /* MYSQLND_STATISTICS_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/mysqlnd config9.m4 mysqlnd.c mysqlnd.h mysqlnd_result.c mysqlnd_result.h mysqlnd_structs.h php_mysqlnd.c
andrey Tue Jan 29 18:11:46 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/mysqlndphp_mysqlnd.c
Modified files:
/php-src/ext/mysqlndconfig9.m4 mysqlnd.c mysqlnd.h
mysqlnd_result.c mysqlnd_result.h
mysqlnd_structs.h
Log:
Fix the build, add a missing file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config9.m4?r1=1.3.2.5r2=1.3.2.6diff_format=u
Index: php-src/ext/mysqlnd/config9.m4
diff -u php-src/ext/mysqlnd/config9.m4:1.3.2.5
php-src/ext/mysqlnd/config9.m4:1.3.2.6
--- php-src/ext/mysqlnd/config9.m4:1.3.2.5 Mon Jan 28 23:23:08 2008
+++ php-src/ext/mysqlnd/config9.m4 Tue Jan 29 18:11:46 2008
@@ -1,7 +1,12 @@
dnl
-dnl $Id: config9.m4,v 1.3.2.5 2008/01/28 23:23:08 andrey Exp $
+dnl $Id: config9.m4,v 1.3.2.6 2008/01/29 18:11:46 andrey Exp $
dnl config.m4 for mysqlnd driver
+
+PHP_ARG_ENABLE(mysqlnd_threading, whether to enable threaded fetch in mysqlnd,
+[ --enable-mysqlnd-threading mysqlnd: Enable threaded fetch], no, no)
+
+
dnl If some extension uses mysqlnd it will get compiled in PHP core
if test $PHP_MYSQLND_ENABLED = yes; then
mysqlnd_sources=mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
@@ -16,6 +21,13 @@
PHP_INSTALL_HEADERS([$ext_builddir/php_mysqlnd_config.h])
AC_DEFINE([HAVE_MYSQLND], 1, [Whether mysqlnd is enabled])
+ dnl Windows uses config.w32 thus this code is safe for now
+ if test $PHP_MYSQLND_THREADING = yes; then
+PHP_BUILD_THREAD_SAFE
+AC_DEFINE([MYSQLND_THREADED], 1, [Whether mysqlnd threading is enabled])
+ fi
+
+
dnl This creates a file so it has to be after above macros
PHP_CHECK_TYPES([int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t
uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t], [
$ext_builddir/php_mysqlnd_config.h
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.5.2.12r2=1.5.2.13diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.5.2.12
php-src/ext/mysqlnd/mysqlnd.c:1.5.2.13
--- php-src/ext/mysqlnd/mysqlnd.c:1.5.2.12 Tue Jan 29 11:59:53 2008
+++ php-src/ext/mysqlnd/mysqlnd.c Tue Jan 29 18:11:46 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd.c,v 1.5.2.12 2008/01/29 11:59:53 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.5.2.13 2008/01/29 18:11:46 andrey Exp $ */
#include php.h
#include mysqlnd.h
#include mysqlnd_wireprotocol.h
@@ -68,63 +68,6 @@
static enum_func_status mysqlnd_send_close(MYSQLND * conn TSRMLS_DC);
-#define MYSQLND_SILENT 1
-
-#ifdef MYSQLND_THREADED
-/* {{{ _mysqlnd_fetch_thread */
-void * _mysqlnd_fetch_thread(void *arg)
-{
- MYSQLND *conn = (MYSQLND *) arg;
- MYSQLND_RES * result = NULL;
- void ***tsrm_ls = conn-tsrm_ls;
-#ifndef MYSQLND_SILENT
- printf(conn=%p tsrm_ls=%p\n, conn, conn-tsrm_ls);
-#endif
- do {
- pthread_mutex_lock(conn-LOCK_work);
- while (conn-thread_killed == FALSE /* there is work */) {
-#ifndef MYSQLND_SILENT
- printf(Waiting for work in %s\n, __FUNCTION__);
-#endif
- pthread_cond_wait(conn-COND_work, conn-LOCK_work);
- }
- if (conn-thread_killed == TRUE) {
-#ifndef MYSQLND_SILENT
- printf(Thread killed in %s\n, __FUNCTION__);
-#endif
- pthread_cond_signal(conn-COND_thread_ended);
- pthread_mutex_unlock(conn-LOCK_work);
- break;
- }
-#ifndef MYSQLND_SILENT
- printf(Got work in %s\n, __FUNCTION__);
-#endif
- CONN_SET_STATE(conn, CONN_FETCHING_DATA);
- result = conn-current_result;
- conn-current_result = NULL;
- pthread_mutex_unlock(conn-LOCK_work);
-
- mysqlnd_background_store_result_fetch_data(result TSRMLS_CC);
-
- /* do fetch the data from the wire */
-
- pthread_mutex_lock(conn-LOCK_work);
- CONN_SET_STATE(conn, CONN_READY);
- pthread_cond_signal(conn-COND_work_done);
-#ifndef MYSQLND_SILENT
- printf(Signaling work done in %s\n, __FUNCTION__);
-#endif
- pthread_mutex_unlock(conn-LOCK_work);
- } while (1);
-
-#ifndef MYSQLND_SILENT
- printf(Exiting worker thread in %s\n, __FUNCTION__);
-#endif
- return NULL;
-}
-/* }}} */
-#endif /* MYSQLND_THREADED */
-
/* {{{ mysqlnd_library_init */
void mysqlnd_library_init(TSRMLS_D)
@@ -839,7 +782,7 @@
pthread_attr_setdetachstate(connection_attrib,
PTHREAD_CREATE_DETACHED);
conn-thread_is_running = TRUE;
- if (pthread_create(th, connection_attrib,
_mysqlnd_fetch_thread, (void*)conn)) {
+ if (pthread_create(th,
[PHP-CVS] cvs: php-src /ext/mysqlnd config9.m4 mysqlnd.c mysqlnd.h mysqlnd_result.c mysqlnd_result.h php_mysqlnd.c
andrey Tue Jan 29 18:13:12 2008 UTC
Modified files:
/php-src/ext/mysqlndphp_mysqlnd.c config9.m4 mysqlnd.c mysqlnd.h
mysqlnd_result.c mysqlnd_result.h
Log:
Fix the build, add a missing file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/php_mysqlnd.c?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/mysqlnd/php_mysqlnd.c
diff -u /dev/null php-src/ext/mysqlnd/php_mysqlnd.c:1.2
--- /dev/null Tue Jan 29 18:13:12 2008
+++ php-src/ext/mysqlnd/php_mysqlnd.c Tue Jan 29 18:13:12 2008
@@ -0,0 +1,249 @@
+/*
+ +--+
+ | PHP Version 6|
+ +--+
+ | Copyright (c) 2006-2008 The PHP Group|
+ +--+
+ | This source file is subject to version 3.01 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is|
+ | available through the world-wide-web at the following url: |
+ | http://www.php.net/license/3_01.txt |
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | [EMAIL PROTECTED] so we can mail you a copy immediately. |
+ +--+
+ | Authors: Georg Richter [EMAIL PROTECTED] |
+ | Andrey Hristov [EMAIL PROTECTED] |
+ | Ulf Wendel [EMAIL PROTECTED] |
+ +--+
+*/
+
+/* $Id: php_mysqlnd.c,v 1.2 2008/01/29 18:13:12 andrey Exp $ */
+#include php.h
+#include php_ini.h
+#include mysqlnd.h
+#include mysqlnd_priv.h
+#include mysqlnd_debug.h
+#include ext/standard/info.h
+
+/* {{{ mysqlnd_functions[]
+ *
+ * Every user visible function must have an entry in mysqlnd_functions[].
+ */
+static zend_function_entry mysqlnd_functions[] = {
+ {NULL, NULL, NULL} /* Must be the last line in mysqlnd_functions[]
*/
+};
+/* }}} */
+
+
+/* {{{ mysqlnd_minfo_print_hash */
+#if PHP_MAJOR_VERSION = 6
+PHPAPI void mysqlnd_minfo_print_hash(zval *values)
+{
+ zval **values_entry;
+ HashPosition pos_values;
+
+ zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), pos_values);
+ while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values),
+
(void **)values_entry, pos_values) == SUCCESS) {
+ TSRMLS_FETCH();
+ zstrstring_key;
+ uintstring_key_len;
+ ulong num_key;
+ char*s = NULL;
+
+ zend_hash_get_current_key_ex(Z_ARRVAL_P(values), string_key,
string_key_len, num_key, 0, pos_values);
+
+ convert_to_string(*values_entry);
+
+ if (UG(unicode)) {
+ int s_len;
+ if
(zend_unicode_to_string(ZEND_U_CONVERTER(UG(runtime_encoding_conv)),
+ s,
s_len, string_key.u, string_key_len TSRMLS_CC) == SUCCESS) {
+ php_info_print_table_row(2, s,
Z_STRVAL_PP(values_entry));
+ }
+ if (s) {
+ mnd_efree(s);
+ }
+ } else {
+ php_info_print_table_row(2, string_key.s,
Z_STRVAL_PP(values_entry));
+ }
+
+ zend_hash_move_forward_ex(Z_ARRVAL_P(values), pos_values);
+ }
+}
+#else
+void mysqlnd_minfo_print_hash(zval *values)
+{
+ zval **values_entry;
+ HashPosition pos_values;
+
+ zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), pos_values);
+ while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values), (void
**)values_entry, pos_values) == SUCCESS) {
+ char*string_key;
+ uintstring_key_len;
+ ulong num_key;
+
+ zend_hash_get_current_key_ex(Z_ARRVAL_P(values), string_key,
string_key_len, num_key, 0, pos_values);
+
+ convert_to_string(*values_entry);
+ php_info_print_table_row(2, string_key,
Z_STRVAL_PP(values_entry));
+
+ zend_hash_move_forward_ex(Z_ARRVAL_P(values), pos_values);
+ }
+}
+#endif
+/* }}} */
+
+
+/* {{{ PHP_MINFO_FUNCTION
+ */
+PHP_MINFO_FUNCTION(mysqlnd)
+{
+ char buf[32];
+ zval values;
+
+ php_info_print_table_start();
+ php_info_print_table_header(2, mysqlnd, enabled);
+ php_info_print_table_row(2, Version, mysqlnd_get_client_info());
+
+
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard html.c /ext/standard/tests/strings bug43927.phpt
tony2001Tue Jan 29 13:39:04 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings bug43927.phpt Modified files: /php-srcNEWS /php-src/ext/standard html.c Log: MFH: fix #43927 (koi8r is missing from html_entity_decode()) patch by andy at demos dot su http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1063r2=1.2027.2.547.2.1064diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1063 php-src/NEWS:1.2027.2.547.2.1064 --- php-src/NEWS:1.2027.2.547.2.1063Tue Jan 29 10:44:53 2008 +++ php-src/NEWSTue Jan 29 13:39:03 2008 @@ -10,6 +10,8 @@ - Fixed bug #43954 (Memory leak when sending the same HTTP status code multiple times). (Scott) +- Fixed bug #43927 (koi8r is missing from html_entity_decode()). + (andy at demos dot su, Tony) - Fixed faulty fix for bug #40189 (endless loop in zlib.inflate stream filter). (Greg) - Fixed bug #43912 (Interbase column names are truncated to 31 characters). http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.18r2=1.111.2.2.2.19diff_format=u Index: php-src/ext/standard/html.c diff -u php-src/ext/standard/html.c:1.111.2.2.2.18 php-src/ext/standard/html.c:1.111.2.2.2.19 --- php-src/ext/standard/html.c:1.111.2.2.2.18 Mon Dec 31 07:20:12 2007 +++ php-src/ext/standard/html.c Tue Jan 29 13:39:03 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: html.c,v 1.111.2.2.2.18 2007/12/31 07:20:12 sebastian Exp $ */ +/* $Id: html.c,v 1.111.2.2.2.19 2008/01/29 13:39:03 tony2001 Exp $ */ /* * HTML entity resources: @@ -954,6 +954,7 @@ case cs_cp1251: case cs_8859_5: case cs_cp866: + case cs_koi8r: replacement[0] = k; replacement[1] = '\0'; replacement_len = 1; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug43927.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/bug43927.phpt +++ php-src/ext/standard/tests/strings/bug43927.phpt -- 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 /main fopen_wrappers.c
dmitry Tue Jan 29 14:23:19 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/main fopen_wrappers.c
Log:
Fixed bug #43491 (Under certain conditions, file_exists() never returns)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1064r2=1.2027.2.547.2.1065diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1064 php-src/NEWS:1.2027.2.547.2.1065
--- php-src/NEWS:1.2027.2.547.2.1064Tue Jan 29 13:39:03 2008
+++ php-src/NEWSTue Jan 29 14:23:18 2008
@@ -50,6 +50,8 @@
allowed in ASCII mode). (Ilia, crrodriguez at suse dot de)
- Fixed bug #43493 (pdo_pgsql does not send username on connect when password
is not available). (Ilia)
+- Fixed bug #43491 (Under certain conditions, file_exists() never returns).
+ (Dmitry)
- Fixed bug #43482 (array_pad() does not warn on very small pad numbers).
(Ilia)
- Fixed bug #43457 (Prepared statement with incorrect parms doesn't throw
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.c?r1=1.175.2.3.2.18r2=1.175.2.3.2.19diff_format=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.175.2.3.2.18
php-src/main/fopen_wrappers.c:1.175.2.3.2.19
--- php-src/main/fopen_wrappers.c:1.175.2.3.2.18Mon Dec 31 07:20:14 2007
+++ php-src/main/fopen_wrappers.c Tue Jan 29 14:23:19 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fopen_wrappers.c,v 1.175.2.3.2.18 2007/12/31 07:20:14 sebastian Exp $
*/
+/* $Id: fopen_wrappers.c,v 1.175.2.3.2.19 2008/01/29 14:23:19 dmitry Exp $ */
/* {{{ includes
*/
@@ -148,6 +148,9 @@
path_len = path_file - path_tmp + 1;
#if defined(PHP_WIN32) || defined(NETWARE)
if (path_len 1 path_tmp[path_len - 2] == ':') {
+ if (path_len != 3) {
+ return -1;
+ }
/* this is c:\ */
path_tmp[path_len] = '\0';
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /sapi/cli/tests 006.phpt
On Tue, 29 Jan 2008, Antony Dovgal wrote: tony2001 Tue Jan 29 12:23:48 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/sapi/cli/tests 006.phpt Log: fix test Derick, you're adding new methods too fast =) It's a silly test then ;-) Expect more of this. regards, Derick -- Derick Rethans http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /sapi/cli/tests 006.phpt
On 29.01.2008 17:30, Derick Rethans wrote: On Tue, 29 Jan 2008, Antony Dovgal wrote: tony2001 Tue Jan 29 12:23:48 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/sapi/cli/tests 006.phpt Log: fix test Derick, you're adding new methods too fast =) It's a silly test then ;-) Expect more of this. Well, we need an extension to describe with `php --re`. ext/date seemed the best at that moment. -- 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/dom node.c
sebastian Tue Jan 29 15:23:08 2008 UTC
Modified files:
/php-src/ext/domnode.c
Log:
Add Reflection API metadata for DOMNode.
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.59r2=1.60diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.59 php-src/ext/dom/node.c:1.60
--- php-src/ext/dom/node.c:1.59 Mon Dec 31 07:12:09 2007
+++ php-src/ext/dom/node.c Tue Jan 29 15:23:08 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: node.c,v 1.59 2007/12/31 07:12:09 sebastian Exp $ */
+/* $Id: node.c,v 1.60 2008/01/29 15:23:08 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -27,6 +27,122 @@
#if HAVE_LIBXML HAVE_DOM
#include php_dom.h
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 2)
+ ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+ ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_replace_child, 0, 0, 2)
+ ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+ ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_remove_child, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_append_child, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_has_child_nodes, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_clone_node, 0, 0, 1)
+ ZEND_ARG_INFO(0, deep)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_normalize, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_supported, 0, 0, 2)
+ ZEND_ARG_INFO(0, feature)
+ ZEND_ARG_INFO(0, version)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_has_attributes, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_compare_document_position, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_same_node, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_prefix, 0, 0, 1)
+ ZEND_ARG_INFO(0, namespaceURI)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_default_namespace, 0, 0, 1)
+ ZEND_ARG_INFO(0, namespaceURI)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_namespace_uri, 0, 0, 1)
+ ZEND_ARG_INFO(0, prefix)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_equal_node, 0, 0, 1)
+ ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_feature, 0, 0, 2)
+ ZEND_ARG_INFO(0, feature)
+ ZEND_ARG_INFO(0, version)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_set_user_data, 0, 0, 3)
+ ZEND_ARG_INFO(0, key)
+ ZEND_ARG_OBJ_INFO(0, data, DOMUserData, 0)
+ ZEND_ARG_INFO(0, handler)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_user_data, 0, 0, 1)
+ ZEND_ARG_INFO(0, key)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_getNodePath, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14N, 0, 0, 0)
+ ZEND_ARG_INFO(0, exclusive)
+ ZEND_ARG_INFO(0, with_comments)
+ ZEND_ARG_ARRAY_INFO(0, xpath, 0)
+ ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14NFile, 0, 0, 1)
+ ZEND_ARG_INFO(0, uri)
+ ZEND_ARG_INFO(0, exclusive)
+ ZEND_ARG_INFO(0, with_comments)
+ ZEND_ARG_ARRAY_INFO(0, xpath, 0)
+ ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ZEND_END_ARG_INFO();
+/* }}} */
+
/*
* class DOMNode
*
@@ -35,27 +151,27 @@
*/
const zend_function_entry php_dom_node_class_functions[] = {
- PHP_FALIAS(insertBefore, dom_node_insert_before, NULL)
- PHP_FALIAS(replaceChild, dom_node_replace_child, NULL)
- PHP_FALIAS(removeChild, dom_node_remove_child, NULL)
- PHP_FALIAS(appendChild, dom_node_append_child, NULL)
- PHP_FALIAS(hasChildNodes, dom_node_has_child_nodes, NULL)
- PHP_FALIAS(cloneNode, dom_node_clone_node, NULL)
- PHP_FALIAS(normalize, dom_node_normalize, NULL)
- PHP_FALIAS(isSupported, dom_node_is_supported, NULL)
- PHP_FALIAS(hasAttributes, dom_node_has_attributes, NULL)
- PHP_FALIAS(compareDocumentPosition, dom_node_compare_document_position,
NULL)
- PHP_FALIAS(isSameNode, dom_node_is_same_node, NULL)
- PHP_FALIAS(lookupPrefix, dom_node_lookup_prefix, NULL)
-
[PHP-CVS] cvs: CVSROOT / avail
pajoye Tue Jan 29 17:17:58 2008 UTC Modified files: /CVSROOTavail Log: - seariver karma for wxwidgets binding in pecl - move custom pecl karma out of ibm's protected area http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1350r2=1.1351diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1350 CVSROOT/avail:1.1351 --- CVSROOT/avail:1.1350Fri Jan 25 13:28:52 2008 +++ CVSROOT/avail Tue Jan 29 17:17:58 2008 @@ -289,6 +289,8 @@ avail|bdeshong|pecl/usblib avail|francois|pecl/phk,pecl/automap avail|sfox|pecl/phar +avail|ramsey|pecl/uploadprogress,pecl/pdo_user +avail|seariver|pecl/wxwidgets # Objective-C bridge avail|wez,jan|php-objc @@ -310,9 +312,6 @@ avail|dbs,kraman,kfbombar|pecl/pdo_ids,pecl/pdo_informix,pecl/pdo_ibm avail|dsr|pecl/sam,phpdoc -avail|ramsey|pecl/uploadprogress -avail|ramsey|pecl/pdo_user - # PDO Specs. CLA required to commit unavail||pdo-specs avail|wez,andi,stas,iliaa|pdo-specs -- 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) /ext/xsl xsltprocessor.c
sebastian Tue Jan 29 21:21:28 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/xslxsltprocessor.c
Log:
MFH: Fix arginfo and prototype.
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.12r2=1.39.2.2.2.13diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.12
php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.13
--- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.12 Tue Jan 29 07:51:46 2008
+++ php-src/ext/xsl/xsltprocessor.c Tue Jan 29 21:21:28 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.39.2.2.2.12 2008/01/29 07:51:46 sebastian Exp $ */
+/* $Id: xsltprocessor.c,v 1.39.2.2.2.13 2008/01/29 21:21:28 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -74,6 +74,7 @@
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_register_php_functions, 0, 0,
0)
+ ZEND_ARG_INFO(0, restrict)
ZEND_END_ARG_INFO();
/* }}} */
@@ -773,7 +774,7 @@
}
/* }}} end xsl_xsltprocessor_remove_parameter */
-/* {{{ proto void xsl_xsltprocessor_register_php_functions();
+/* {{{ proto void xsl_xsltprocessor_register_php_functions([mixed $restrict]);
*/
PHP_FUNCTION(xsl_xsltprocessor_register_php_functions)
{
--
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/xsl xsltprocessor.c
sebastian Tue Jan 29 21:21:20 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/xslxsltprocessor.c
Log:
MFH: Fix arginfo and prototype.
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.9.2.6r2=1.39.2.2.2.9.2.7diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.6
php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.7
--- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.6Tue Jan 29 07:51:43 2008
+++ php-src/ext/xsl/xsltprocessor.c Tue Jan 29 21:21:20 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.6 2008/01/29 07:51:43 sebastian Exp $
*/
+/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.7 2008/01/29 21:21:20 sebastian Exp $
*/
#ifdef HAVE_CONFIG_H
#include config.h
@@ -74,6 +74,7 @@
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_register_php_functions, 0, 0,
0)
+ ZEND_ARG_INFO(0, restrict)
ZEND_END_ARG_INFO();
static
@@ -796,7 +797,7 @@
}
/* }}} end xsl_xsltprocessor_remove_parameter */
-/* {{{ proto void xsl_xsltprocessor_register_php_functions();
+/* {{{ proto void xsl_xsltprocessor_register_php_functions([mixed $restrict]);
*/
PHP_FUNCTION(xsl_xsltprocessor_register_php_functions)
{
--
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/standard html.c
stasTue Jan 29 22:03:01 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard html.c
Log:
rm cruft
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.14.2.7r2=1.111.2.2.2.14.2.8diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.111.2.2.2.14.2.7
php-src/ext/standard/html.c:1.111.2.2.2.14.2.8
--- php-src/ext/standard/html.c:1.111.2.2.2.14.2.7 Mon Jan 28 23:07:12 2008
+++ php-src/ext/standard/html.c Tue Jan 29 22:03:01 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: html.c,v 1.111.2.2.2.14.2.7 2008/01/28 23:07:12 tony2001 Exp $ */
+/* $Id: html.c,v 1.111.2.2.2.14.2.8 2008/01/29 22:03:01 stas Exp $ */
/*
* HTML entity resources:
@@ -1122,7 +1122,6 @@
maxlen = 128;
replaced = emalloc (maxlen);
len = 0;
- //Sleep(10*1000);
i = 0;
while (i oldlen) {
unsigned char mbsequence[16]; /* allow up to 15 characters in
a multibyte sequence */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard html.c
stasTue Jan 29 22:03:44 2008 UTC
Modified files:
/php-src/ext/standard html.c
Log:
no sleep here either
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.131r2=1.132diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.131 php-src/ext/standard/html.c:1.132
--- php-src/ext/standard/html.c:1.131 Mon Jan 28 23:08:07 2008
+++ php-src/ext/standard/html.c Tue Jan 29 22:03:44 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: html.c,v 1.131 2008/01/28 23:08:07 tony2001 Exp $ */
+/* $Id: html.c,v 1.132 2008/01/29 22:03:44 stas Exp $ */
/*
* HTML entity resources:
@@ -1125,7 +1125,6 @@
maxlen = 128;
replaced = emalloc (maxlen);
len = 0;
- //Sleep(10*1000);
i = 0;
while (i oldlen) {
unsigned char mbsequence[16]; /* allow up to 15 characters in
a multibyte sequence */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c parse_date.re
derick Tue Jan 29 20:15:44 2008 UTC
Modified files:
/php-src/ext/date/lib parse_date.re parse_date.c
Log:
- MF53: That should have been ||.
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.re?r1=1.69r2=1.70diff_format=u
Index: php-src/ext/date/lib/parse_date.re
diff -u php-src/ext/date/lib/parse_date.re:1.69
php-src/ext/date/lib/parse_date.re:1.70
--- php-src/ext/date/lib/parse_date.re:1.69 Tue Jan 29 20:08:41 2008
+++ php-src/ext/date/lib/parse_date.re Tue Jan 29 20:15:44 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: parse_date.re,v 1.69 2008/01/29 20:08:41 derick Exp $ */
+/* $Id: parse_date.re,v 1.70 2008/01/29 20:15:44 derick Exp $ */
#include timelib.h
@@ -755,7 +755,7 @@
while (**ptr == ' ' || **ptr == '\t' || **ptr == '(') {
++*ptr;
}
- if ((*ptr)[0] == 'G' (*ptr)[1] == 'M' (*ptr)[2] == 'T'
((*ptr)[3] == '+' | (*ptr)[3] == '-')) {
+ if ((*ptr)[0] == 'G' (*ptr)[1] == 'M' (*ptr)[2] == 'T'
((*ptr)[3] == '+' || (*ptr)[3] == '-')) {
*ptr += 3;
}
if (**ptr == '+') {
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.78r2=1.79diff_format=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.78
php-src/ext/date/lib/parse_date.c:1.79
--- php-src/ext/date/lib/parse_date.c:1.78 Tue Jan 29 20:10:53 2008
+++ php-src/ext/date/lib/parse_date.c Tue Jan 29 20:15:44 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.12.1 on Tue Jan 29 21:07:53 2008 */
+/* Generated by re2c 0.12.1 on Tue Jan 29 21:14:49 2008 */
#line 1 ext/date/lib/parse_date.re
/*
+--+
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: parse_date.c,v 1.78 2008/01/29 20:10:53 derick Exp $ */
+/* $Id: parse_date.c,v 1.79 2008/01/29 20:15:44 derick Exp $ */
#include timelib.h
@@ -757,7 +757,7 @@
while (**ptr == ' ' || **ptr == '\t' || **ptr == '(') {
++*ptr;
}
- if ((*ptr)[0] == 'G' (*ptr)[1] == 'M' (*ptr)[2] == 'T'
((*ptr)[3] == '+' | (*ptr)[3] == '-')) {
+ if ((*ptr)[0] == 'G' (*ptr)[1] == 'M' (*ptr)[2] == 'T'
((*ptr)[3] == '+' || (*ptr)[3] == '-')) {
*ptr += 3;
}
if (**ptr == '+') {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/lib parse_date.re /ext/date/tests bug43960.phpt
derick Tue Jan 29 20:08:42 2008 UTC
Added files:
/php-src/ext/date/tests bug43960.phpt
Modified files:
/php-src/ext/date/lib parse_date.re
Log:
- Fixed bug #43960 (strtotime() returns timestamp in the future when given a
bogus string).
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.re?r1=1.68r2=1.69diff_format=u
Index: php-src/ext/date/lib/parse_date.re
diff -u php-src/ext/date/lib/parse_date.re:1.68
php-src/ext/date/lib/parse_date.re:1.69
--- php-src/ext/date/lib/parse_date.re:1.68 Sun Jan 27 22:15:59 2008
+++ php-src/ext/date/lib/parse_date.re Tue Jan 29 20:08:41 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: parse_date.re,v 1.68 2008/01/27 22:15:59 derick Exp $ */
+/* $Id: parse_date.re,v 1.69 2008/01/29 20:08:41 derick Exp $ */
#include timelib.h
@@ -107,7 +107,7 @@
#define TIMELIB_HAVE_RELATIVE() { s-time-have_relative = 1;
s-time-relative.weekday_behavior = 1; }
#define TIMELIB_HAVE_WEEKDAY_RELATIVE() { s-time-have_weekday_relative = 1; }
#define TIMELIB_HAVE_SPECIAL_RELATIVE() { s-time-have_special_relative = 1; }
-#define TIMELIB_HAVE_TZ() { s-cur = cursor; if (s-time-have_zone) {
add_warning(s, Double timezone specification); timelib_string_free(str);
return TIMELIB_ERROR; } else { s-time-have_zone = 1; } }
+#define TIMELIB_HAVE_TZ() { s-cur = cursor; if (s-time-have_zone) {
s-time-have_zone 1 ? add_error(s, Double timezone specification) :
add_warning(s, Double timezone specification); timelib_string_free(str);
s-time-have_zone++; return TIMELIB_ERROR; } else { s-time-have_zone++; } }
#define TIMELIB_INIT s-cur = cursor; str = timelib_string(s); ptr = str
#define TIMELIB_DEINIT timelib_string_free(str)
@@ -755,6 +755,9 @@
while (**ptr == ' ' || **ptr == '\t' || **ptr == '(') {
++*ptr;
}
+ if ((*ptr)[0] == 'G' (*ptr)[1] == 'M' (*ptr)[2] == 'T'
((*ptr)[3] == '+' | (*ptr)[3] == '-')) {
+ *ptr += 3;
+ }
if (**ptr == '+') {
++*ptr;
t-is_localtime = 1;
@@ -845,7 +848,7 @@
secondlz = minutelz | 60;
meridian = ([AaPp] .? [Mm] .?) [\000\t ];
tz = (? [A-Za-z]{1,6} )? | [A-Z][a-z]+([_/][A-Z][a-z]+)+;
-tzcorrection = [+-] hour24 :? minute?;
+tzcorrection = GMT? [+-] hour24 :? minute?;
daysuf = st | nd | rd | th;
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug43960.phpt?view=markuprev=1.1
Index: php-src/ext/date/tests/bug43960.phpt
+++ php-src/ext/date/tests/bug43960.phpt
--TEST--
Bug #43960 (strtotime() returns timestamp in the future when given a bogus
string)
--FILE--
?php
var_dump(strtotime('i like to eat slices at work'));
?
--EXPECT--
bool(false)
--
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
dmitry Tue Jan 29 20:01:43 2008 UTC
Modified files:
/php-src/sapi/cli php_cli.c
Log:
Fixed bug #43968 (Extending internal class causes a crash)
The fix is a workaround for GCC optizer bug.
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.183r2=1.184diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.183 php-src/sapi/cli/php_cli.c:1.184
--- php-src/sapi/cli/php_cli.c:1.183Mon Dec 31 07:12:19 2007
+++ php-src/sapi/cli/php_cli.c Tue Jan 29 20:01:43 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.183 2007/12/31 07:12:19 sebastian Exp $ */
+/* $Id: php_cli.c,v 1.184 2008/01/29 20:01:43 dmitry Exp $ */
#include php.h
#include php_globals.h
@@ -590,7 +590,7 @@
int main(int argc, char *argv[])
#endif
{
- int exit_status = SUCCESS;
+ volatile int exit_status = SUCCESS;
int c;
zend_file_handle file_handle;
/* temporary locals */
@@ -601,8 +601,8 @@
char *arg_free=NULL, **arg_excp=arg_free;
char *script_file=NULL;
int interactive=0;
- int module_started = 0;
- int request_started = 0;
+ volatile int module_started = 0;
+ volatile int request_started = 0;
int lineno = 0;
char *exec_direct=NULL, *exec_run=NULL, *exec_begin=NULL,
*exec_end=NULL;
const char *param_error=NULL;
@@ -1232,8 +1232,9 @@
if (exec_end zend_eval_string_ex(exec_end,
NULL, Command line end code, 1 TSRMLS_CC) == FAILURE) {
exit_status=254;
}
-
+
break;
+ }
#ifdef HAVE_REFLECTION
case PHP_MODE_REFLECTION_FUNCTION:
case PHP_MODE_REFLECTION_CLASS:
@@ -1314,7 +1315,6 @@
zend_printf(Additional .ini files
parsed: %s\n, php_ini_scanned_files ? php_ini_scanned_files : (none));
break;
}
- }
}
} zend_end_try();
--
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) /sapi/cli php_cli.c
dmitry Tue Jan 29 20:01:31 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cli php_cli.c
Log:
Fixed bug #43968 (Extending internal class causes a crash)
The fix is a workaround for GCC optizer bug.
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.22.2.2r2=1.129.2.13.2.22.2.3diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.2
php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.3
--- php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.2 Mon Dec 31 07:17:18 2007
+++ php-src/sapi/cli/php_cli.c Tue Jan 29 20:01:31 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.129.2.13.2.22.2.2 2007/12/31 07:17:18 sebastian Exp $ */
+/* $Id: php_cli.c,v 1.129.2.13.2.22.2.3 2008/01/29 20:01:31 dmitry Exp $ */
#include php.h
#include php_globals.h
@@ -588,7 +588,7 @@
int main(int argc, char *argv[])
#endif
{
- int exit_status = SUCCESS;
+ volatile int exit_status = SUCCESS;
int c;
zend_file_handle file_handle;
/* temporary locals */
@@ -599,8 +599,8 @@
char *arg_free=NULL, **arg_excp=arg_free;
char *script_file=NULL;
int interactive=0;
- int module_started = 0;
- int request_started = 0;
+ volatile int module_started = 0;
+ volatile int request_started = 0;
int lineno = 0;
char *exec_direct=NULL, *exec_run=NULL, *exec_begin=NULL,
*exec_end=NULL;
const char *param_error=NULL;
@@ -1229,8 +1229,9 @@
if (exec_end zend_eval_string_ex(exec_end,
NULL, Command line end code, 1 TSRMLS_CC) == FAILURE) {
exit_status=254;
}
-
+
break;
+ }
#ifdef HAVE_REFLECTION
case PHP_MODE_REFLECTION_FUNCTION:
case PHP_MODE_REFLECTION_CLASS:
@@ -1311,7 +1312,6 @@
zend_printf(Additional .ini files
parsed: %s\n, php_ini_scanned_files ? php_ini_scanned_files : (none));
break;
}
- }
}
} zend_end_try();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
derick Tue Jan 29 20:12:23 2008 UTC
Modified files:
/php-src/ext/date php_date.c
Log:
- Make whitespace the same as in 5.3.
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.162r2=1.163diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.162 php-src/ext/date/php_date.c:1.163
--- php-src/ext/date/php_date.c:1.162 Mon Jan 28 21:12:24 2008
+++ php-src/ext/date/php_date.c Tue Jan 29 20:12:23 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.162 2008/01/28 21:12:24 derick Exp $ */
+/* $Id: php_date.c,v 1.163 2008/01/29 20:12:23 derick Exp $ */
#include php.h
#include php_streams.h
@@ -205,7 +205,6 @@
{NULL, NULL, NULL}
};
-
const zend_function_entry date_funcs_date[] = {
PHP_ME(DateTime,__construct, NULL,
ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
PHP_ME_MAPPING(createFromFormat, date_create_from_format, NULL,
ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
@@ -233,8 +232,8 @@
{NULL, NULL, NULL}
};
-static char* guess_timezone(const timelib_tzdb *tzdb TSRMLS_DC);
static void date_register_classes(TSRMLS_D);
+static char* guess_timezone(const timelib_tzdb *tzdb TSRMLS_DC);
/* }}} */
ZEND_DECLARE_MODULE_GLOBALS(date)
@@ -494,9 +493,7 @@
PHP_MINIT_FUNCTION(date)
{
REGISTER_INI_ENTRIES();
-
date_register_classes(TSRMLS_C);
-
/*
* RFC4287, Section 3.3: http://www.ietf.org/rfc/rfc4287.txt
* A Date construct is an element whose content MUST conform to the
@@ -1196,7 +1193,7 @@
ret = php_idate(format[0], ts, 0);
if (ret == -1) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unrecognized date
format token);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unrecognized date
format token.);
RETURN_FALSE;
}
RETURN_LONG(ret);
@@ -1291,7 +1288,7 @@
timelib_tzinfo_dtor(t-tz_info);
}
- timelib_time_dtor(now);
+ timelib_time_dtor(now);
timelib_time_dtor(t);
if (error1 || error2) {
@@ -1514,7 +1511,6 @@
} else {
RETURN_STRINGL(buf, real_len, 0);
}
-
}
efree(buf);
RETURN_FALSE;
@@ -1945,7 +1941,7 @@
dateobj-time-have_weekday_relative = dateobj-time-have_relative = 0;
- if (type == TIMELIB_ZONETYPE_ID now-tz_info != tzi) {
+ if (type == TIMELIB_ZONETYPE_ID now-tz_info != tzi) {
timelib_tzinfo_dtor(now-tz_info);
}
if (free_tzi) {
@@ -2074,7 +2070,7 @@
add_ascii_assoc_double(return_value, fraction,
parsed_time-f);
}
- zval_from_error_container(return_value, error);
+ zval_from_error_container(return_value, error);
timelib_error_container_dtor(error);
--
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/date php_date.c
derick Tue Jan 29 20:12:53 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/date php_date.c
Log:
- Make whitespace the same as in HEAD.
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.16r2=1.43.2.45.2.51.2.17diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.16
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.17
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.16 Mon Jan 28 21:12:41 2008
+++ php-src/ext/date/php_date.c Tue Jan 29 20:12:53 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.16 2008/01/28 21:12:41 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.17 2008/01/29 20:12:53 derick Exp $ */
#include php.h
#include php_streams.h
@@ -221,15 +221,16 @@
};
const zend_function_entry date_funcs_timezone[] = {
- PHP_ME(DateTimeZone,__construct,
NULL, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
- PHP_ME_MAPPING(getName, timezone_name_get,
NULL, 0)
- PHP_ME_MAPPING(getOffset, timezone_offset_get,
NULL, 0)
- PHP_ME_MAPPING(getTransitions, timezone_transitions_get,
NULL, 0)
- PHP_ME_MAPPING(listAbbreviations, timezone_abbreviations_list,
NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
- PHP_ME_MAPPING(listIdentifiers, timezone_identifiers_list,
NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+ PHP_ME(DateTimeZone, __construct, NULL,
ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
+ PHP_ME_MAPPING(getName, timezone_name_get, NULL, 0)
+ PHP_ME_MAPPING(getOffset, timezone_offset_get, NULL, 0)
+ PHP_ME_MAPPING(getTransitions,timezone_transitions_get,NULL, 0)
+ PHP_ME_MAPPING(listAbbreviations, timezone_abbreviations_list, NULL,
ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+ PHP_ME_MAPPING(listIdentifiers, timezone_identifiers_list, NULL,
ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
{NULL, NULL, NULL}
};
+static char* guess_timezone(const timelib_tzdb *tzdb TSRMLS_DC);
static void date_register_classes(TSRMLS_D);
static char* guess_timezone(const timelib_tzdb *tzdb TSRMLS_DC);
/* }}} */
@@ -1152,7 +1153,7 @@
timelib_time_dtor(now);
RETURN_FALSE;
}
-
+
t = timelib_strtotime(times, time_len, error, DATE_TIMEZONEDB);
error1 = error-error_count;
timelib_error_container_dtor(error);
--
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/date/lib parse_date.c parse_date.re
derick Tue Jan 29 20:14:28 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/date/lib parse_date.c parse_date.re
Log:
- That should have been ||.
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.c?r1=1.29.2.30.2.14.2.5r2=1.29.2.30.2.14.2.6diff_format=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.5
php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.6
--- php-src/ext/date/lib/parse_date.c:1.29.2.30.2.14.2.5Tue Jan 29
20:10:09 2008
+++ php-src/ext/date/lib/parse_date.c Tue Jan 29 20:14:02 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.12.1 on Tue Jan 29 20:58:48 2008 */
+/* Generated by re2c 0.12.1 on Tue Jan 29 21:13:35 2008 */
#line 1 ext/date/lib/parse_date.re
/*
+--+
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: parse_date.c,v 1.29.2.30.2.14.2.5 2008/01/29 20:10:09 derick Exp $ */
+/* $Id: parse_date.c,v 1.29.2.30.2.14.2.6 2008/01/29 20:14:02 derick Exp $ */
#include timelib.h
@@ -757,7 +757,7 @@
while (**ptr == ' ' || **ptr == '\t' || **ptr == '(') {
++*ptr;
}
- if ((*ptr)[0] == 'G' (*ptr)[1] == 'M' (*ptr)[2] == 'T'
((*ptr)[3] == '+' | (*ptr)[3] == '-')) {
+ if ((*ptr)[0] == 'G' (*ptr)[1] == 'M' (*ptr)[2] == 'T'
((*ptr)[3] == '+' || (*ptr)[3] == '-')) {
*ptr += 3;
}
if (**ptr == '+') {
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/parse_date.re?r1=1.26.2.27.2.12.2.4r2=1.26.2.27.2.12.2.5diff_format=u
Index: php-src/ext/date/lib/parse_date.re
diff -u php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.4
php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.5
--- php-src/ext/date/lib/parse_date.re:1.26.2.27.2.12.2.4 Tue Jan 29
20:10:09 2008
+++ php-src/ext/date/lib/parse_date.re Tue Jan 29 20:14:18 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: parse_date.re,v 1.26.2.27.2.12.2.4 2008/01/29 20:10:09 derick Exp $ */
+/* $Id: parse_date.re,v 1.26.2.27.2.12.2.5 2008/01/29 20:14:18 derick Exp $ */
#include timelib.h
@@ -755,7 +755,7 @@
while (**ptr == ' ' || **ptr == '\t' || **ptr == '(') {
++*ptr;
}
- if ((*ptr)[0] == 'G' (*ptr)[1] == 'M' (*ptr)[2] == 'T'
((*ptr)[3] == '+' | (*ptr)[3] == '-')) {
+ if ((*ptr)[0] == 'G' (*ptr)[1] == 'M' (*ptr)[2] == 'T'
((*ptr)[3] == '+' || (*ptr)[3] == '-')) {
*ptr += 3;
}
if (**ptr == '+') {
--
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/pcre/pcrelib AUTHORS ChangeLog LICENCE NEWS NON-UNIX-USE README config.h dftables.c pcre.h pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c pcre_ge
nlopess Tue Jan 29 20:25:48 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/ext/pcre/pcrelib AUTHORS ChangeLog LICENCE NEWS NON-UNIX-USE README config.h dftables.c pcre.h pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c pcre_get.c pcre_globals.c pcre_info.c pcre_internal.h pcre_maketables.c pcre_newline.c pcre_ord2utf8.c pcre_printint.src pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c pcre_ucp_searchfuncs.c pcre_valid_utf8.c pcre_version.c pcre_xclass.c pcredemo.c pcregrep.c pcreposix.c pcreposix.h /php-src/ext/pcre/pcrelib/doc pcre.txt /php-src/ext/pcre/pcrelib/testdata testinput4 testoutput4 Log: upgrade to pcre 7.6 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1065r2=1.2027.2.547.2.1066diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1065 php-src/NEWS:1.2027.2.547.2.1066 --- php-src/NEWS:1.2027.2.547.2.1065Tue Jan 29 14:23:18 2008 +++ php-src/NEWSTue Jan 29 20:25:47 2008 @@ -6,7 +6,7 @@ (Ilia) - Fixed a bug with PDO::FETCH_COLUMN|PDO::FETCH_GROUP mode when a column # by which to group by data is specified. (Ilia) -- Upgraded PCRE to version 7.5 (Nuno) +- Upgraded PCRE to version 7.6 (Nuno) - Fixed bug #43954 (Memory leak when sending the same HTTP status code multiple times). (Scott) http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/AUTHORS?r1=1.5.4.2r2=1.5.4.3diff_format=u Index: php-src/ext/pcre/pcrelib/AUTHORS diff -u php-src/ext/pcre/pcrelib/AUTHORS:1.5.4.2 php-src/ext/pcre/pcrelib/AUTHORS:1.5.4.3 --- php-src/ext/pcre/pcrelib/AUTHORS:1.5.4.2Fri Jun 15 19:09:24 2007 +++ php-src/ext/pcre/pcrelib/AUTHORSTue Jan 29 20:25:47 2008 @@ -8,7 +8,7 @@ University of Cambridge Computing Service, Cambridge, England. -Copyright (c) 1997-2007 University of Cambridge +Copyright (c) 1997-2008 University of Cambridge All rights reserved @@ -17,7 +17,7 @@ Written by: Google Inc. -Copyright (c) 2007 Google Inc +Copyright (c) 2007-2008 Google Inc All rights reserved http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/ChangeLog?r1=1.12.2.1.2.6r2=1.12.2.1.2.7diff_format=u Index: php-src/ext/pcre/pcrelib/ChangeLog diff -u php-src/ext/pcre/pcrelib/ChangeLog:1.12.2.1.2.6 php-src/ext/pcre/pcrelib/ChangeLog:1.12.2.1.2.7 --- php-src/ext/pcre/pcrelib/ChangeLog:1.12.2.1.2.6 Mon Jan 14 09:39:40 2008 +++ php-src/ext/pcre/pcrelib/ChangeLog Tue Jan 29 20:25:47 2008 @@ -1,6 +1,54 @@ ChangeLog for PCRE -- +Version 7.6 28-Jan-08 +- + +1. A character class containing a very large number of characters with +codepoints greater than 255 (in UTF-8 mode, of course) caused a buffer +overflow. + +2. Patch to cut out the long long test in pcrecpp_unittest when +HAVE_LONG_LONG is not defined. + +3. Applied Christian Ehrlicher's patch to update the CMake build files to +bring them up to date and include new features. This patch includes: + +- Fixed PH's badly added libz and libbz2 support. +- Fixed a problem with static linking. +- Added pcredemo. [But later removed - see 7 below.] +- Fixed dftables problem and added an option. +- Added a number of HAVE_XXX tests, including HAVE_WINDOWS_H and +HAVE_LONG_LONG. +- Added readline support for pcretest. +- Added an listing of the option settings after cmake has run. + +4. A user submitted a patch to Makefile that makes it easy to create +pcre.dll under mingw when using Configure/Make. I added stuff to +Makefile.am that cause it to include this special target, without +affecting anything else. Note that the same mingw target plus all +the other distribution libraries and programs are now supported +when configuring with CMake (see 6 below) instead of with +Configure/Make. + +5. Applied Craig's patch that moves no_arg into the RE class in the C++ code. +This is an attempt to solve the reported problem pcrecpp::no_arg is not +exported in the Windows port. It has not yet been confirmed that the patch +solves the problem, but it does no harm. + +6. Applied Sheri's patch to CMakeLists.txt to add NON_STANDARD_LIB_PREFIX and +NON_STANDARD_LIB_SUFFIX for dll names built with mingw when configured +with CMake, and also correct the comment about stack recursion. + +7. Remove the automatic building of pcredemo from the ./configure system and +from CMakeLists.txt. The whole idea of pcredemo.c is that it is an example +of a program that users should build themselves
[PHP-CVS] cvs: php-src /ext/xsl xsltprocessor.c
sebastian Tue Jan 29 21:21:04 2008 UTC
Modified files:
/php-src/ext/xslxsltprocessor.c
Log:
- Fix arginfo and prototype.
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.62r2=1.63diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.62
php-src/ext/xsl/xsltprocessor.c:1.63
--- php-src/ext/xsl/xsltprocessor.c:1.62Tue Jan 29 07:51:40 2008
+++ php-src/ext/xsl/xsltprocessor.c Tue Jan 29 21:21:04 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.62 2008/01/29 07:51:40 sebastian Exp $ */
+/* $Id: xsltprocessor.c,v 1.63 2008/01/29 21:21:04 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -74,6 +74,7 @@
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_register_php_functions, 0, 0,
0)
+ ZEND_ARG_INFO(0, restrict)
ZEND_END_ARG_INFO();
static
@@ -831,7 +832,7 @@
}
/* }}} end xsl_xsltprocessor_remove_parameter */
-/* {{{ proto void xsl_xsltprocessor_register_php_functions() U
+/* {{{ proto void xsl_xsltprocessor_register_php_functions([mixed $restrict]);
U
*/
PHP_FUNCTION(xsl_xsltprocessor_register_php_functions)
{
--
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/mysqlnd mysqlnd_block_alloc.c mysqlnd_ps.c mysqlnd_result.c
rrichards Tue Jan 29 22:06:43 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_block_alloc.c mysqlnd_ps.c
mysqlnd_result.c
Log:
MFH: fix win32 build
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_block_alloc.c?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_block_alloc.c
diff -u php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.1.2.1
php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.1.2.2
--- php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.1.2.1 Mon Jan 28 22:50:06 2008
+++ php-src/ext/mysqlnd/mysqlnd_block_alloc.c Tue Jan 29 22:06:43 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_block_alloc.c,v 1.1.2.1 2008/01/28 22:50:06 andrey Exp $ */
+/* $Id: mysqlnd_block_alloc.c,v 1.1.2.2 2008/01/29 22:06:43 rrichards Exp $ */
#include php.h
#include mysqlnd.h
@@ -31,8 +31,8 @@
static void
mysqlnd_mempool_free_contents(MYSQLND_MEMORY_POOL * pool TSRMLS_DC)
{
- DBG_ENTER(mysqlnd_mempool_dtor);
uint i;
+ DBG_ENTER(mysqlnd_mempool_dtor);
for (i = 0; i pool-free_chunk_list_elements; i++) {
MYSQLND_MEMORY_POOL_CHUNK * chunk = pool-free_chunk_list[i];
chunk-free_chunk(chunk, FALSE TSRMLS_CC);
@@ -47,8 +47,8 @@
static void
mysqlnd_mempool_free_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, zend_bool
cache_it TSRMLS_DC)
{
- DBG_ENTER(mysqlnd_mempool_free_chunk);
MYSQLND_MEMORY_POOL * pool = chunk-pool;
+ DBG_ENTER(mysqlnd_mempool_free_chunk);
if (chunk-from_pool) {
/* Try to back-off and guess if this is the last block
allocated */
if (chunk-ptr == (pool-arena + (pool-arena_size -
pool-free_size - chunk-size))) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_ps.c?r1=1.3.2.8r2=1.3.2.9diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_ps.c
diff -u php-src/ext/mysqlnd/mysqlnd_ps.c:1.3.2.8
php-src/ext/mysqlnd/mysqlnd_ps.c:1.3.2.9
--- php-src/ext/mysqlnd/mysqlnd_ps.c:1.3.2.8Mon Jan 28 22:50:06 2008
+++ php-src/ext/mysqlnd/mysqlnd_ps.cTue Jan 29 22:06:43 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_ps.c,v 1.3.2.8 2008/01/28 22:50:06 andrey Exp $ */
+/* $Id: mysqlnd_ps.c,v 1.3.2.9 2008/01/29 22:06:43 rrichards Exp $ */
#include php.h
#include mysqlnd.h
#include mysqlnd_wireprotocol.h
@@ -613,8 +613,8 @@
zval **current_row = set-data_cursor;
if (NULL == current_row[0]) {
- set-initialized_rows++;
uint64 row_num = (set-data_cursor - set-data)
/ field_count;
+ set-initialized_rows++;
result-m.row_decoder(set-row_buffers[row_num],
current_row,
result-meta-field_count,
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_result.c?r1=1.4.2.10r2=1.4.2.11diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_result.c
diff -u php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.10
php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.11
--- php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.10 Tue Jan 29 18:11:46 2008
+++ php-src/ext/mysqlnd/mysqlnd_result.cTue Jan 29 22:06:43 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_result.c,v 1.4.2.10 2008/01/29 18:11:46 andrey Exp $ */
+/* $Id: mysqlnd_result.c,v 1.4.2.11 2008/01/29 22:06:43 rrichards Exp $ */
#include php.h
#include mysqlnd.h
#include mysqlnd_wireprotocol.h
@@ -1005,8 +1005,8 @@
unsigned int i;
if (NULL == current_row[0]) {
- set-initialized_rows++;
uint64 row_num = (set-data_cursor - set-data) /
result-meta-field_count;
+ set-initialized_rows++;
result-m.row_decoder(set-row_buffers[row_num],
current_row,
result-meta-field_count,
@@ -1071,8 +1071,8 @@
struct mysqlnd_field_hash_key *zend_hash_key =
result-meta-zend_hash_keys;
if (NULL == current_row[0]) {
- set-initialized_rows++;
uint64 row_num = (set-data_cursor - set-data) /
result-meta-field_count;
+ set-initialized_rows++;
result-m.row_decoder(set-row_buffers[row_num],
current_row,
result-meta-field_count,
--
[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_block_alloc.c mysqlnd_ps.c mysqlnd_result.c mysqlnd_structs.h
rrichards Tue Jan 29 22:06:16 2008 UTC
Modified files:
/php-src/ext/mysqlndmysqlnd_block_alloc.c mysqlnd_ps.c
mysqlnd_result.c mysqlnd_structs.h
Log:
fix win32 build
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_block_alloc.c?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_block_alloc.c
diff -u php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.2
php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.3
--- php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.2 Mon Jan 28 22:54:21 2008
+++ php-src/ext/mysqlnd/mysqlnd_block_alloc.c Tue Jan 29 22:06:16 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_block_alloc.c,v 1.2 2008/01/28 22:54:21 andrey Exp $ */
+/* $Id: mysqlnd_block_alloc.c,v 1.3 2008/01/29 22:06:16 rrichards Exp $ */
#include php.h
#include mysqlnd.h
@@ -31,8 +31,8 @@
static void
mysqlnd_mempool_free_contents(MYSQLND_MEMORY_POOL * pool TSRMLS_DC)
{
- DBG_ENTER(mysqlnd_mempool_dtor);
uint i;
+ DBG_ENTER(mysqlnd_mempool_dtor);
for (i = 0; i pool-free_chunk_list_elements; i++) {
MYSQLND_MEMORY_POOL_CHUNK * chunk = pool-free_chunk_list[i];
chunk-free_chunk(chunk, FALSE TSRMLS_CC);
@@ -47,8 +47,8 @@
static void
mysqlnd_mempool_free_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, zend_bool
cache_it TSRMLS_DC)
{
- DBG_ENTER(mysqlnd_mempool_free_chunk);
MYSQLND_MEMORY_POOL * pool = chunk-pool;
+ DBG_ENTER(mysqlnd_mempool_free_chunk);
if (chunk-from_pool) {
/* Try to back-off and guess if this is the last block
allocated */
if (chunk-ptr == (pool-arena + (pool-arena_size -
pool-free_size - chunk-size))) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_ps.c?r1=1.10r2=1.11diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_ps.c
diff -u php-src/ext/mysqlnd/mysqlnd_ps.c:1.10
php-src/ext/mysqlnd/mysqlnd_ps.c:1.11
--- php-src/ext/mysqlnd/mysqlnd_ps.c:1.10 Mon Jan 28 22:54:21 2008
+++ php-src/ext/mysqlnd/mysqlnd_ps.cTue Jan 29 22:06:16 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_ps.c,v 1.10 2008/01/28 22:54:21 andrey Exp $ */
+/* $Id: mysqlnd_ps.c,v 1.11 2008/01/29 22:06:16 rrichards Exp $ */
#include php.h
#include mysqlnd.h
#include mysqlnd_wireprotocol.h
@@ -613,8 +613,8 @@
zval **current_row = set-data_cursor;
if (NULL == current_row[0]) {
- set-initialized_rows++;
uint64 row_num = (set-data_cursor - set-data)
/ field_count;
+ set-initialized_rows++;
result-m.row_decoder(set-row_buffers[row_num],
current_row,
result-meta-field_count,
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_result.c?r1=1.14r2=1.15diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_result.c
diff -u php-src/ext/mysqlnd/mysqlnd_result.c:1.14
php-src/ext/mysqlnd/mysqlnd_result.c:1.15
--- php-src/ext/mysqlnd/mysqlnd_result.c:1.14 Tue Jan 29 18:13:12 2008
+++ php-src/ext/mysqlnd/mysqlnd_result.cTue Jan 29 22:06:16 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_result.c,v 1.14 2008/01/29 18:13:12 andrey Exp $ */
+/* $Id: mysqlnd_result.c,v 1.15 2008/01/29 22:06:16 rrichards Exp $ */
#include php.h
#include mysqlnd.h
@@ -1006,8 +1006,8 @@
unsigned int i;
if (NULL == current_row[0]) {
- set-initialized_rows++;
uint64 row_num = (set-data_cursor - set-data) /
result-meta-field_count;
+ set-initialized_rows++;
result-m.row_decoder(set-row_buffers[row_num],
current_row,
result-meta-field_count,
@@ -1072,8 +1072,8 @@
struct mysqlnd_field_hash_key *zend_hash_key =
result-meta-zend_hash_keys;
if (NULL == current_row[0]) {
- set-initialized_rows++;
uint64 row_num = (set-data_cursor - set-data) /
result-meta-field_count;
+ set-initialized_rows++;
result-m.row_decoder(set-row_buffers[row_num],
current_row,
result-meta-field_count,
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_structs.h?r1=1.9r2=1.10diff_format=u
Index:
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom xpath.c
On 29.01.2008 18:55, Sebastian Bergmann wrote: sebastian Tue Jan 29 15:55:30 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/dom xpath.c Log: MFH: Add Reflection API metadata for DOMXPath. This broke ext/dom/tests/canonicalization.phpt and ext/dom/tests/bug32615.phpt: # cat ext/dom/tests/bug32615.diff 001+ Catchable fatal error: Argument 2 passed to DOMNode::insertBefore() must be an instance of DOMNode, null given in /local/qa/5_2/ext/dom/tests/bug32615.php on line 25 001- ?xml version=1.0? 002- rootfirst/newsecond/newthird/newfourth//root 003- 004- ?xml version=1.0? 005- rootfirst/second/third/fourth//root 006- 007- ?xml version=1.0? 008- rootsecond/third/fourth//root # cat ext/dom/tests/canonicalization.diff 044- contain xmlns=http://www.example.com/ns/foo; xmlns:test=urn::test 045- bartest1/test1/bar 046- bartest2/test2/bar 047- fubar:bar xmlns:fubar=http://www.example.com/ns/fubar;test3/test3/fubar:bar 048- fubar:bar xmlns:fubar=http://www.example.com/ns/fubar;test4/test4/fubar:bar 045+ Catchable fatal error: Argument 3 passed to DOMNode::C14N() must be an array, null given in /local/qa/5_2/ext/dom/tests/canonicalization.php on line 44 -- 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(PHP_5_2) /ext/xml xml.c /ext/xml/tests bug43957.phpt
rasmus Tue Jan 29 23:21:20 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/xml/tests bug43957.phpt
Modified files:
/php-src/ext/xmlxml.c
Log:
Fixed bug #43957 (utf8_decode() bogus conversion of partial multibyte UTF8
char)
http://cvs.php.net/viewvc.cgi/php-src/ext/xml/xml.c?r1=1.157.2.4.2.6r2=1.157.2.4.2.7diff_format=u
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.157.2.4.2.6 php-src/ext/xml/xml.c:1.157.2.4.2.7
--- php-src/ext/xml/xml.c:1.157.2.4.2.6 Mon Dec 31 07:20:14 2007
+++ php-src/ext/xml/xml.c Tue Jan 29 23:21:20 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: xml.c,v 1.157.2.4.2.6 2007/12/31 07:20:14 sebastian Exp $ */
+/* $Id: xml.c,v 1.157.2.4.2.7 2008/01/29 23:21:20 rasmus Exp $ */
#define IS_EXT_MODULE
@@ -579,15 +579,27 @@
while (pos 0) {
c = (unsigned char)(*s);
if (c = 0xf0) { /* four bytes encoded, 21 bits */
- c = ((s[0]7)18) | ((s[1]63)12) | ((s[2]63)6) |
(s[3]63);
+ if(pos-4 = 0) {
+ c = ((s[0]7)18) | ((s[1]63)12) |
((s[2]63)6) | (s[3]63);
+ } else {
+ c = '?';
+ }
s += 4;
pos -= 4;
} else if (c = 0xe0) { /* three bytes encoded, 16 bits */
- c = ((s[0]63)12) | ((s[1]63)6) | (s[2]63);
+ if(pos-3 = 0) {
+ c = ((s[0]63)12) | ((s[1]63)6) |
(s[2]63);
+ } else {
+ c = '?';
+ }
s += 3;
pos -= 3;
} else if (c = 0xc0) { /* two bytes encoded, 11 bits */
- c = ((s[0]63)6) | (s[1]63);
+ if(pos-3 = 0) {
+ c = ((s[0]63)6) | (s[1]63);
+ } else {
+ c = '?';
+ }
s += 2;
pos -= 2;
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/xml/tests/bug43957.phpt?view=markuprev=1.1
Index: php-src/ext/xml/tests/bug43957.phpt
+++ php-src/ext/xml/tests/bug43957.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xml xml.c /ext/xml/tests bug43957.phpt
rasmus Tue Jan 29 23:29:04 2008 UTC
Modified files:
/php-src/ext/xmlxml.c
/php-src/ext/xml/tests bug43957.phpt
Log:
Fixed bug #43957
http://cvs.php.net/viewvc.cgi/php-src/ext/xml/xml.c?r1=1.174r2=1.175diff_format=u
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.174 php-src/ext/xml/xml.c:1.175
--- php-src/ext/xml/xml.c:1.174 Mon Dec 31 07:12:17 2007
+++ php-src/ext/xml/xml.c Tue Jan 29 23:29:04 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: xml.c,v 1.174 2007/12/31 07:12:17 sebastian Exp $ */
+/* $Id: xml.c,v 1.175 2008/01/29 23:29:04 rasmus Exp $ */
#define IS_EXT_MODULE
@@ -591,15 +591,27 @@
while (pos 0) {
c = (unsigned char)(*s);
if (c = 0xf0) { /* four bytes encoded, 21 bits */
- c = ((s[0]7)18) | ((s[1]63)12) | ((s[2]63)6) |
(s[3]63);
+ if(pos-4 = 0) {
+ c = ((s[0]7)18) | ((s[1]63)12) |
((s[2]63)6) | (s[3]63);
+ } else {
+ c = '?';
+ }
s += 4;
pos -= 4;
} else if (c = 0xe0) { /* three bytes encoded, 16 bits */
- c = ((s[0]63)12) | ((s[1]63)6) | (s[2]63);
+ if(pos-3 = 0) {
+ c = ((s[0]63)12) | ((s[1]63)6) |
(s[2]63);
+ } else {
+ c = '?';
+ }
s += 3;
pos -= 3;
} else if (c = 0xc0) { /* two bytes encoded, 11 bits */
- c = ((s[0]63)6) | (s[1]63);
+ if(pos-3 = 0) {
+ c = ((s[0]63)6) | (s[1]63);
+ } else {
+ c = '?';
+ }
s += 2;
pos -= 2;
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/xml/tests/bug43957.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/xml/tests/bug43957.phpt
diff -u /dev/null php-src/ext/xml/tests/bug43957.phpt:1.2
--- /dev/null Tue Jan 29 23:29:04 2008
+++ php-src/ext/xml/tests/bug43957.phpt Tue Jan 29 23:29:04 2008
@@ -0,0 +1,13 @@
+--TEST--
+Bug #43957 - utf8_decode() bogus conversion on multibyte indicator near end of
string
+--SKIPIF--
+?php
+require_once(skipif.inc);
+if (!extension_loaded('xml')) die (skip xml extension not available);
+?
+--FILE--
+?php
+ echo utf8_decode('abc'.chr(0xe0));
+?
+--EXPECTF--
+abc?
--
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) / EXTENSIONS
iliaa Wed Jan 30 00:07:38 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcEXTENSIONS Log: Change readline extension status to Working http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.72.2.4.2.4.2.2r2=1.72.2.4.2.4.2.3diff_format=u Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.72.2.4.2.4.2.2 php-src/EXTENSIONS:1.72.2.4.2.4.2.3 --- php-src/EXTENSIONS:1.72.2.4.2.4.2.2 Wed Jan 23 23:08:27 2008 +++ php-src/EXTENSIONS Wed Jan 30 00:07:38 2008 @@ -445,7 +445,7 @@ --- EXTENSION: readline MAINTENANCE: Unknown -STATUS: Unknown +STATUS: Working --- EXTENSION: recode PRIMARY MAINTAINER: Kristian Köhntopp [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/json json.c utf8_to_utf16.c /ext/json/tests bug43941.phpt
stasWed Jan 30 03:21:30 2008 UTC
Modified files:
/php-src/ext/json json.c utf8_to_utf16.c
/php-src/ext/json/tests bug43941.phpt
Log:
fix #43941: invalid utf-8 not accepted
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.33r2=1.34diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.33 php-src/ext/json/json.c:1.34
--- php-src/ext/json/json.c:1.33Mon Dec 31 07:12:10 2007
+++ php-src/ext/json/json.c Wed Jan 30 03:21:30 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: json.c,v 1.33 2007/12/31 07:12:10 sebastian Exp $ */
+/* $Id: json.c,v 1.34 2008/01/30 03:21:30 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -265,12 +265,17 @@
len = utf8_to_utf16(utf16, s.s, len);
if (len = 0)
{
- if (utf16)
- {
+ if (utf16) {
efree(utf16);
}
-
- smart_str_appendl(buf, \\, 2);
+ if(len 0) {
+ if(!PG(display_errors)) {
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, Invalid UTF-8 sequence in argument);
+ }
+ smart_str_appendl(buf, null, 4);
+ } else {
+ smart_str_appendl(buf, \\, 2);
+ }
return;
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/json/utf8_to_utf16.c?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/json/utf8_to_utf16.c
diff -u php-src/ext/json/utf8_to_utf16.c:1.2
php-src/ext/json/utf8_to_utf16.c:1.3
--- php-src/ext/json/utf8_to_utf16.c:1.2Thu Jul 12 09:55:41 2007
+++ php-src/ext/json/utf8_to_utf16.cWed Jan 30 03:21:30 2008
@@ -39,7 +39,7 @@
for (;;) {
c = utf8_decode_next(utf8);
if (c 0) {
- return UTF8_END ? the_index : UTF8_ERROR;
+ return (c == UTF8_END) ? the_index : UTF8_ERROR;
}
if (c 0x1) {
w[the_index] = (unsigned short)c;
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug43941.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/json/tests/bug43941.phpt
diff -u /dev/null php-src/ext/json/tests/bug43941.phpt:1.2
--- /dev/null Wed Jan 30 03:21:30 2008
+++ php-src/ext/json/tests/bug43941.phptWed Jan 30 03:21:30 2008
@@ -0,0 +1,21 @@
+--TEST--
+Bug #43941 (json_encode() invalid UTF-8)
+--SKIPIF--
+?php if (!extension_loaded(json)) print skip; ?
+--FILE--
+?php
+
+var_dump(json_encode(abc));
+var_dump(json_encode(ab\xE0));
+var_dump(json_encode(ab\xE0c));
+var_dump(json_encode(array(ab\xE0, ab\xE0c, abc)));
+
+echo Done\n;
+?
+--EXPECTF--
+string(5) abc
+string(4) null
+string(4) null
+string(17) [null,null,abc]
+Done
+
--
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/json json.c utf8_to_utf16.c /ext/json/tests bug43941.phpt
stasWed Jan 30 03:17:57 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/json/tests bug43941.phpt
Modified files:
/php-src/ext/json json.c utf8_to_utf16.c
Log:
fix #43941: invalid utf-8 not accepted
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.19.2.4r2=1.9.2.19.2.5diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.9.2.19.2.4
php-src/ext/json/json.c:1.9.2.19.2.5
--- php-src/ext/json/json.c:1.9.2.19.2.4Mon Dec 31 07:17:09 2007
+++ php-src/ext/json/json.c Wed Jan 30 03:17:57 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: json.c,v 1.9.2.19.2.4 2007/12/31 07:17:09 sebastian Exp $ */
+/* $Id: json.c,v 1.9.2.19.2.5 2008/01/30 03:17:57 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -269,8 +269,14 @@
{
efree(utf16);
}
-
-smart_str_appendl(buf, \\, 2);
+ if(len 0) {
+ if(!PG(display_errors)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
Invalid UTF-8 sequence in argument);
+ }
+ smart_str_appendl(buf, null, 4);
+ } else {
+ smart_str_appendl(buf, \\, 2);
+ }
return;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/json/utf8_to_utf16.c?r1=1.1r2=1.1.4.1diff_format=u
Index: php-src/ext/json/utf8_to_utf16.c
diff -u php-src/ext/json/utf8_to_utf16.c:1.1
php-src/ext/json/utf8_to_utf16.c:1.1.4.1
--- php-src/ext/json/utf8_to_utf16.c:1.1Tue Jan 31 08:59:06 2006
+++ php-src/ext/json/utf8_to_utf16.cWed Jan 30 03:17:57 2008
@@ -40,7 +40,7 @@
for (;;) {
c = utf8_decode_next(utf8);
if (c 0) {
-return UTF8_END ? the_index : UTF8_ERROR;
+return (c == UTF8_END) ? the_index : UTF8_ERROR;
}
if (c 0x1) {
w[the_index] = (unsigned short)c;
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug43941.phpt?view=markuprev=1.1
Index: php-src/ext/json/tests/bug43941.phpt
+++ php-src/ext/json/tests/bug43941.phpt
--
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) /ext/json/tests bug41567.phpt
rasmus Wed Jan 30 05:37:24 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/json/tests bug41567.phpt Log: This one depends on the precision setting http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug41567.phpt?r1=1.1.2.4r2=1.1.2.5diff_format=u Index: php-src/ext/json/tests/bug41567.phpt diff -u php-src/ext/json/tests/bug41567.phpt:1.1.2.4 php-src/ext/json/tests/bug41567.phpt:1.1.2.5 --- php-src/ext/json/tests/bug41567.phpt:1.1.2.4Fri Jun 29 14:01:11 2007 +++ php-src/ext/json/tests/bug41567.phptWed Jan 30 05:37:23 2008 @@ -10,6 +10,8 @@ echo Done\n; ? +--INI-- +precision=14 --EXPECT-- float(123456789.12345) Done -- 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) /ext/dom node.c
sebastian Wed Jan 30 06:48:20 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/domnode.c
Log:
MFH: Fix arginfo.
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.37.2.3.2.10r2=1.37.2.3.2.11diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.37.2.3.2.10
php-src/ext/dom/node.c:1.37.2.3.2.11
--- php-src/ext/dom/node.c:1.37.2.3.2.10Tue Jan 29 15:23:25 2008
+++ php-src/ext/dom/node.c Wed Jan 30 06:48:20 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: node.c,v 1.37.2.3.2.10 2008/01/29 15:23:25 sebastian Exp $ */
+/* $Id: node.c,v 1.37.2.3.2.11 2008/01/30 06:48:20 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -29,9 +29,9 @@
/* {{{ arginfo */
static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 1)
ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
- ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 0)
+ ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 1)
ZEND_END_ARG_INFO();
static
@@ -129,8 +129,8 @@
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14N, 0, 0, 0)
ZEND_ARG_INFO(0, exclusive)
ZEND_ARG_INFO(0, with_comments)
- ZEND_ARG_ARRAY_INFO(0, xpath, 0)
- ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ ZEND_ARG_ARRAY_INFO(0, xpath, 1)
+ ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 1)
ZEND_END_ARG_INFO();
static
@@ -138,8 +138,8 @@
ZEND_ARG_INFO(0, uri)
ZEND_ARG_INFO(0, exclusive)
ZEND_ARG_INFO(0, with_comments)
- ZEND_ARG_ARRAY_INFO(0, xpath, 0)
- ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ ZEND_ARG_ARRAY_INFO(0, xpath, 1)
+ ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 1)
ZEND_END_ARG_INFO();
/* }}} */
--
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/dom node.c
sebastian Wed Jan 30 06:48:13 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/domnode.c
Log:
MFH: Fix arginfo.
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.37.2.3.2.8.2.4r2=1.37.2.3.2.8.2.5diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.37.2.3.2.8.2.4
php-src/ext/dom/node.c:1.37.2.3.2.8.2.5
--- php-src/ext/dom/node.c:1.37.2.3.2.8.2.4 Tue Jan 29 15:23:18 2008
+++ php-src/ext/dom/node.c Wed Jan 30 06:48:13 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: node.c,v 1.37.2.3.2.8.2.4 2008/01/29 15:23:18 sebastian Exp $ */
+/* $Id: node.c,v 1.37.2.3.2.8.2.5 2008/01/30 06:48:13 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -29,9 +29,9 @@
/* {{{ arginfo */
static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 1)
ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
- ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 0)
+ ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 1)
ZEND_END_ARG_INFO();
static
@@ -129,8 +129,8 @@
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14N, 0, 0, 0)
ZEND_ARG_INFO(0, exclusive)
ZEND_ARG_INFO(0, with_comments)
- ZEND_ARG_ARRAY_INFO(0, xpath, 0)
- ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ ZEND_ARG_ARRAY_INFO(0, xpath, 1)
+ ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 1)
ZEND_END_ARG_INFO();
static
@@ -138,8 +138,8 @@
ZEND_ARG_INFO(0, uri)
ZEND_ARG_INFO(0, exclusive)
ZEND_ARG_INFO(0, with_comments)
- ZEND_ARG_ARRAY_INFO(0, xpath, 0)
- ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ ZEND_ARG_ARRAY_INFO(0, xpath, 1)
+ ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 1)
ZEND_END_ARG_INFO();
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom node.c
sebastian Wed Jan 30 06:48:02 2008 UTC
Modified files:
/php-src/ext/domnode.c
Log:
Fix arginfo.
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.60r2=1.61diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.60 php-src/ext/dom/node.c:1.61
--- php-src/ext/dom/node.c:1.60 Tue Jan 29 15:23:08 2008
+++ php-src/ext/dom/node.c Wed Jan 30 06:48:02 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: node.c,v 1.60 2008/01/29 15:23:08 sebastian Exp $ */
+/* $Id: node.c,v 1.61 2008/01/30 06:48:02 sebastian Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -29,9 +29,9 @@
/* {{{ arginfo */
static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 1)
ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
- ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 0)
+ ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 1)
ZEND_END_ARG_INFO();
static
@@ -129,8 +129,8 @@
ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14N, 0, 0, 0)
ZEND_ARG_INFO(0, exclusive)
ZEND_ARG_INFO(0, with_comments)
- ZEND_ARG_ARRAY_INFO(0, xpath, 0)
- ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ ZEND_ARG_ARRAY_INFO(0, xpath, 1)
+ ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 1)
ZEND_END_ARG_INFO();
static
@@ -138,8 +138,8 @@
ZEND_ARG_INFO(0, uri)
ZEND_ARG_INFO(0, exclusive)
ZEND_ARG_INFO(0, with_comments)
- ZEND_ARG_ARRAY_INFO(0, xpath, 0)
- ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 0)
+ ZEND_ARG_ARRAY_INFO(0, xpath, 1)
+ ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 1)
ZEND_END_ARG_INFO();
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
