date:20080123

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2008-01-23 Thread changelog

changelog   Thu Jan 24 01:31:34 2008 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2936r2=1.2937diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2936 php-src/ChangeLog:1.2937
--- php-src/ChangeLog:1.2936Wed Jan 23 01:31:35 2008
+++ php-src/ChangeLog   Thu Jan 24 01:31:33 2008
@@ -1,3 +1,135 @@
+2008-01-23  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  EXTENSIONS:
+  
+  Added myself as pdo_mysql  pdo_pgsql maintainer
+
+2008-01-23  Stanislav Malyshev  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ZendEngine2/zend_execute.c
+  win32/build/config.w32:
+  fix build
+
+2008-01-23  Dmitry Stogov  [EMAIL PROTECTED]
+
+* ZendEngine2/zend_execute.c:
+  typo
+
+2008-01-23  Andrey Hristov  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ext/mysqlnd/config.w32
+  ext/mysqlnd/config9.m4
+  ext/mysqlnd/mysqlnd.c
+  ext/mysqlnd/mysqlnd.c
+  ext/mysqlnd/mysqlnd.h
+  ext/mysqlnd/mysqlnd.h
+  ext/mysqlnd/mysqlnd_charset.c
+  ext/mysqlnd/mysqlnd_charset.c
+  ext/mysqlnd/mysqlnd_charset.h
+  ext/mysqlnd/mysqlnd_charset.h
+  ext/mysqlnd/mysqlnd_debug.c
+  ext/mysqlnd/mysqlnd_debug.h
+  ext/mysqlnd/mysqlnd_enum_n_def.h
+  ext/mysqlnd/mysqlnd_libmysql_compat.h
+  ext/mysqlnd/mysqlnd_libmysql_compat.h
+  ext/mysqlnd/mysqlnd_loaddata.c
+  ext/mysqlnd/mysqlnd_loaddata.c
+  ext/mysqlnd/mysqlnd_palloc.c
+  ext/mysqlnd/mysqlnd_palloc.c
+  ext/mysqlnd/mysqlnd_palloc.h
+  ext/mysqlnd/mysqlnd_portability.h
+  ext/mysqlnd/mysqlnd_portability.h
+  ext/mysqlnd/mysqlnd_priv.h
+  ext/mysqlnd/mysqlnd_priv.h
+  ext/mysqlnd/mysqlnd_ps.c
+  ext/mysqlnd/mysqlnd_ps.c
+  ext/mysqlnd/mysqlnd_ps_codec.c
+  ext/mysqlnd/mysqlnd_qcache.c
+  ext/mysqlnd/mysqlnd_result.c
+  ext/mysqlnd/mysqlnd_result.c
+  ext/mysqlnd/mysqlnd_result.h
+  ext/mysqlnd/mysqlnd_result_meta.c
+  ext/mysqlnd/mysqlnd_result_meta.c
+  ext/mysqlnd/mysqlnd_result_meta.h
+  ext/mysqlnd/mysqlnd_statistics.c
+  ext/mysqlnd/mysqlnd_statistics.h
+  ext/mysqlnd/mysqlnd_structs.h
+  ext/mysqlnd/mysqlnd_structs.h
+  ext/mysqlnd/mysqlnd_wireprotocol.c
+  ext/mysqlnd/mysqlnd_wireprotocol.c
+  ext/mysqlnd/mysqlnd_wireprotocol.h
+  ext/mysqlnd/mysqlnd_wireprotocol.h:
+  Merge with internal version
+
+2008-01-23  Dmitry Stogov  [EMAIL PROTECTED]
+
+* ZendEngine2/zend_compile.c
+  ZendEngine2/zend_compile.c
+  ZendEngine2/zend_execute.c
+  ZendEngine2/zend_execute.c
+  ZendEngine2/zend_vm_def.h
+  ZendEngine2/zend_vm_def.h
+  ZendEngine2/zend_vm_execute.h
+  ZendEngine2/zend_vm_execute.h:
+  Additional executor specialization
+
+2008-01-23  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/date/php_date.c:
+  add missing TSRMLS_CC and fix segfaults in ZTS mode
+
+* (PHP_5_3)
+  NEWS:
+  BFN
+
+* (PHP_5_3)
+  ext/standard/array.c
+  ext/standard/tests/array/array_merge_recursive_variation5.phpt:
+  MFH: fix #43559 (array_merge_recursive() doesn't behave as expected with
+  duplicate NULL values)
+  patch by Felipe
+
+* ext/standard/array.c:
+  fix #43559 (array_merge_recursive() doesn't behave as expected with
+  duplicate NULL values)
+  patch by Felipe
+
+* ext/simplexml/simplexml.c
+  ext/simplexml/tests/bug37076_1.phpt:
+  MFH: fix leak appearing when appending data to unnamed attribute
+
+* (PHP_5_3)
+  ext/simplexml/tests/bug37076_1.phpt:
+  use expectF
+
+* (PHP_5_3)
+  ext/simplexml/tests/bug37076_1.phpt
+  ext/standard/tests/array/array_merge_recursive_variation5.phpt:
+  fix test
+
+* (PHP_5_3)
+  ext/simplexml/simplexml.c
+  ext/simplexml/tests/bug37076_1.phpt
+  ext/simplexml/tests/bug37076_1.phpt:
+  fix leak appearing when appending data to unnamed attribute
+
+2008-01-23  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  NEWS
+  ext/interbase/php_ibase_includes.h
+  ext/interbase/php_ibase_includes.h:
+  
+  MFB:Fixed bug #43912 (Interbase column names are truncated to 31
+  characters)
+
+* (PHP_5_3)
+  ext/interbase/php_ibase_includes.h:
+  Fixed bug #43912 (Interbase column names are truncated to 31 characters)
+
 2008-01-22  Marcus Boerger  [EMAIL PROTECTED]
 
 * (PHP_5_3)

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

2008-01-23 Thread changelog

changelog   Thu Jan 24 01:31:36 2008 UTC

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1225r2=1.1226diff_format=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.1225 ZendEngine2/ChangeLog:1.1226
--- ZendEngine2/ChangeLog:1.1225Wed Jan 23 01:31:38 2008
+++ ZendEngine2/ChangeLog   Thu Jan 24 01:31:35 2008
@@ -1,3 +1,24 @@
+2008-01-23  Stanislav Malyshev  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  zend_execute.c:
+  fix build
+
+2008-01-23  Dmitry Stogov  [EMAIL PROTECTED]
+
+* zend_execute.c:
+  typo
+
+* zend_compile.c
+  zend_compile.c
+  zend_execute.c
+  zend_execute.c
+  zend_vm_def.h
+  zend_vm_def.h
+  zend_vm_execute.h
+  zend_vm_execute.h:
+  Additional executor specialization
+
 2008-01-22  Dmitry Stogov  [EMAIL PROTECTED]
 
 * zend.c
@@ -20868,7 +20889,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.1225 2008/01/23 01:31:38 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.1226 2008/01/24 01:31:35 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -22592,7 +22613,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.1225 2008/01/23 01:31:38 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.1226 2008/01/24 01:31:35 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml simplexml.c /ext/simplexml/tests bug37076_1.phpt

2008-01-23 Thread Antony Dovgal

tony2001Wed Jan 23 09:52:57 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/simplexml/testsbug37076_1.phpt 

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
  Log:
  fix leak appearing when appending data to unnamed attribute
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.7r2=1.151.2.22.2.35.2.8diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.7 
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.7   Tue Jan 22 
20:42:21 2008
+++ php-src/ext/simplexml/simplexml.c   Wed Jan 23 09:52:57 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.151.2.22.2.35.2.7 2008/01/22 20:42:21 helly Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.35.2.8 2008/01/23 09:52:57 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -458,7 +458,7 @@
 
 /* {{{ sxe_property_write()
  */
-static void sxe_prop_dim_write(zval *object, zval *member, zval *value, 
zend_bool elements, zend_bool attribs, xmlNodePtr *pnewnode TSRMLS_DC)
+static int sxe_prop_dim_write(zval *object, zval *member, zval *value, 
zend_bool elements, zend_bool attribs, xmlNodePtr *pnewnode TSRMLS_DC)
 {
php_sxe_object *sxe;
xmlNodePtr  node;
@@ -472,6 +472,7 @@
int test = 0;
int new_value = 0;
longcnt = 0;
+   int retval = SUCCESS;
zvaltmp_zv, trim_zv, value_copy;
 
sxe = php_sxe_fetch_object(object TSRMLS_CC);
@@ -486,7 +487,7 @@
 * and this is during runtime.
 */
php_error_docref(NULL TSRMLS_CC, E_ERROR, Cannot 
create unnamed attribute);
-   return;
+   return FAILURE;
}
} else {
if (Z_TYPE_P(member) != IS_STRING) {
@@ -503,7 +504,7 @@
if (member == tmp_zv) {
zval_dtor(tmp_zv);
}
-   return;
+   return FAILURE;
}
}
 
@@ -527,7 +528,7 @@
 * and this is during runtime.
 */
php_error_docref(NULL TSRMLS_CC, E_ERROR, Cannot 
create unnamed attribute);
-   return;
+   return FAILURE;
}
if (attribs  !node  sxe-iter.type == SXE_ITER_ELEMENT) {
node = xmlNewChild(mynode, mynode-ns, sxe-iter.name, 
NULL);
@@ -565,7 +566,7 @@
zval_dtor(tmp_zv);
}
zend_error(E_WARNING, It is not yet possible 
to assign complex types to %s, attribs ? attributes : properties);
-   return;
+   return FAILURE;
}
}
 
@@ -600,7 +601,7 @@
if (!member || Z_TYPE_P(member) == IS_LONG) {
if (node-type == XML_ATTRIBUTE_NODE) {
php_error_docref(NULL TSRMLS_CC, 
E_ERROR, Cannot create duplicate attribute);
-   return;
+   return FAILURE;
}
 
if (sxe-iter.type == SXE_ITER_NONE) {
@@ -608,6 +609,7 @@
++counter;
if (member  Z_LVAL_P(member)  0) {
php_error_docref(NULL 
TSRMLS_CC, E_WARNING, Cannot add element %s number %ld when only 0 such 
elements exist, mynode-name, Z_LVAL_P(member));
+   retval = FAILURE;
}
} else if (member) {
newnode = 
sxe_get_element_by_offset(sxe, Z_LVAL_P(member), node, cnt);
@@ -644,6 +646,7 @@
}
} else if (counter  1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot 
assign to an array of nodes (duplicate subnodes or attr detected));
+   retval = FAILURE;
} else if (elements) {
if (!node) {
if (!member || Z_TYPE_P(member) == IS_LONG) {
@@ -654,12 +657,14 @@
} else if (!member || Z_TYPE_P(member) == IS_LONG) {
if (member  cnt  Z_LVAL_P(member)) {
php_error_docref(NULL TSRMLS_CC, 
E_WARNING, Cannot add

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml/tests bug37076_1.phpt

2008-01-23 Thread Antony Dovgal

tony2001Wed Jan 23 09:54:38 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/simplexml/testsbug37076_1.phpt 
  Log:
  fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug37076_1.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/simplexml/tests/bug37076_1.phpt
diff -u php-src/ext/simplexml/tests/bug37076_1.phpt:1.1.2.1 
php-src/ext/simplexml/tests/bug37076_1.phpt:1.1.2.2
--- php-src/ext/simplexml/tests/bug37076_1.phpt:1.1.2.1 Wed Jan 23 09:52:57 2008
+++ php-src/ext/simplexml/tests/bug37076_1.phpt Wed Jan 23 09:54:38 2008
@@ -8,6 +8,9 @@
 ?
 ===DONE===
 --EXPECT--
+Warning: main(): Cannot write or create unnamed element in %s on line %d
+
+Warning: main(): Cannot write or create unnamed element in %s on line %d
 ?xml version=1.0?
 rootfoo//root
 ===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/tests bug37076_1.phpt

2008-01-23 Thread Antony Dovgal

tony2001Wed Jan 23 09:55:54 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/simplexml/testsbug37076_1.phpt 
  Log:
  use expectF
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug37076_1.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/simplexml/tests/bug37076_1.phpt
diff -u php-src/ext/simplexml/tests/bug37076_1.phpt:1.1.2.2 
php-src/ext/simplexml/tests/bug37076_1.phpt:1.1.2.3
--- php-src/ext/simplexml/tests/bug37076_1.phpt:1.1.2.2 Wed Jan 23 09:54:38 2008
+++ php-src/ext/simplexml/tests/bug37076_1.phpt Wed Jan 23 09:55:53 2008
@@ -7,7 +7,7 @@
 print $xml-asXML();
 ?
 ===DONE===
---EXPECT--
+--EXPECTF--
 Warning: main(): Cannot write or create unnamed element in %s on line %d
 
 Warning: main(): Cannot write or create unnamed element in %s on line %d

-- 
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 /ext/simplexml/tests bug37076_1.phpt

2008-01-23 Thread Antony Dovgal

tony2001Wed Jan 23 09:59:42 2008 UTC

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
/php-src/ext/simplexml/testsbug37076_1.phpt 
  Log:
  MFH: fix leak appearing when appending data to unnamed attribute
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.249r2=1.250diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.249 
php-src/ext/simplexml/simplexml.c:1.250
--- php-src/ext/simplexml/simplexml.c:1.249 Tue Jan 22 20:40:30 2008
+++ php-src/ext/simplexml/simplexml.c   Wed Jan 23 09:59:42 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.249 2008/01/22 20:40:30 helly Exp $ */
+/* $Id: simplexml.c,v 1.250 2008/01/23 09:59:42 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -461,7 +461,7 @@
 
 /* {{{ sxe_property_write()
  */
-static void sxe_prop_dim_write(zval *object, zval *member, zval *value, 
zend_bool elements, zend_bool attribs, xmlNodePtr *pnewnode TSRMLS_DC)
+static int sxe_prop_dim_write(zval *object, zval *member, zval *value, 
zend_bool elements, zend_bool attribs, xmlNodePtr *pnewnode TSRMLS_DC)
 {
php_sxe_object *sxe;
xmlNodePtr  node;
@@ -475,6 +475,7 @@
int test = 0;
int new_value = 0;
longcnt = 0;
+   int retval = SUCCESS;
zvaltmp_zv, trim_zv, value_copy;
 
sxe = php_sxe_fetch_object(object TSRMLS_CC);
@@ -489,7 +490,7 @@
 * and this is during runtime.
 */
php_error_docref(NULL TSRMLS_CC, E_ERROR, Cannot 
create unnamed attribute);
-   return;
+   return FAILURE;
}
} else {
if (Z_TYPE_P(member) != IS_STRING) {
@@ -506,7 +507,7 @@
if (member == tmp_zv) {
zval_dtor(tmp_zv);
}
-   return;
+   return FAILURE;
}
}
 
@@ -530,7 +531,7 @@
 * and this is during runtime.
 */
php_error_docref(NULL TSRMLS_CC, E_ERROR, Cannot 
create unnamed attribute);
-   return;
+   return FAILURE;
}
if (attribs  !node  sxe-iter.type == SXE_ITER_ELEMENT) {
node = xmlNewChild(mynode, mynode-ns, sxe-iter.name, 
NULL);
@@ -572,7 +573,7 @@
zval_dtor(tmp_zv);
}
zend_error(E_WARNING, It is not yet possible 
to assign complex types to %s, attribs ? attributes : properties);
-   return;
+   return FAILURE;
}
}
 
@@ -607,7 +608,7 @@
if (!member || Z_TYPE_P(member) == IS_LONG) {
if (node-type == XML_ATTRIBUTE_NODE) {
php_error_docref(NULL TSRMLS_CC, 
E_ERROR, Cannot create duplicate attribute);
-   return;
+   return FAILURE;
}
 
if (sxe-iter.type == SXE_ITER_NONE) {
@@ -615,6 +616,7 @@
++counter;
if (member  Z_LVAL_P(member)  0) {
php_error_docref(NULL 
TSRMLS_CC, E_WARNING, Cannot add element %s number %ld when only 0 such 
elements exist, mynode-name, Z_LVAL_P(member));
+   retval = FAILURE;
}
} else if (member) {
newnode = 
sxe_get_element_by_offset(sxe, Z_LVAL_P(member), node, cnt);
@@ -651,6 +653,7 @@
}
} else if (counter  1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot 
assign to an array of nodes (duplicate subnodes or attr detected));
+   retval = FAILURE;
} else if (elements) {
if (!node) {
if (!member || Z_TYPE_P(member) == IS_LONG) {
@@ -661,12 +664,14 @@
} else if (!member || Z_TYPE_P(member) == IS_LONG) {
if (member  cnt  Z_LVAL_P(member)) {
php_error_docref(NULL TSRMLS_CC, 
E_WARNING, Cannot add element %s number %ld when only %ld such elements 
exist, mynode-name, Z_LVAL_P(member), cnt);
+   retval =

[PHP-CVS] cvs: php-src /ext/standard array.c

2008-01-23 Thread Antony Dovgal

tony2001Wed Jan 23 11:20:00 2008 UTC

  Modified files:  
/php-src/ext/standard   array.c 
  Log:
  fix #43559 (array_merge_recursive() doesn't behave as expected with duplicate 
NULL values)
  patch by Felipe
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.435r2=1.436diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.435 php-src/ext/standard/array.c:1.436
--- php-src/ext/standard/array.c:1.435  Mon Jan 14 22:08:00 2008
+++ php-src/ext/standard/array.cWed Jan 23 11:20:00 2008
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.435 2008/01/14 22:08:00 shire Exp $ */
+/* $Id: array.c,v 1.436 2008/01/23 11:20:00 tony2001 Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -2397,8 +2397,18 @@
SEPARATE_ZVAL(dest_entry);
SEPARATE_ZVAL(src_entry);
 
-   convert_to_array_ex(dest_entry);
-   convert_to_array_ex(src_entry);
+   if (Z_TYPE_PP(dest_entry) == IS_NULL) {
+   convert_to_array_ex(dest_entry);
+   
add_next_index_null(*dest_entry);
+   } else {
+   convert_to_array_ex(dest_entry);
+   }
+   if (Z_TYPE_PP(src_entry) == IS_NULL) {
+   convert_to_array_ex(src_entry);
+   add_next_index_null(*src_entry);
+   } else {
+   convert_to_array_ex(src_entry);
+   }
if (thash) {
thash-nApplyCount++;
}

-- 
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

2008-01-23 Thread Antony Dovgal

tony2001Wed Jan 23 15:14:18 2008 UTC

  Modified files:  
/php-src/ext/date   php_date.c 
  Log:
  add missing TSRMLS_CC and fix segfaults in ZTS mode
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.156r2=1.157diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.156 php-src/ext/date/php_date.c:1.157
--- php-src/ext/date/php_date.c:1.156   Thu Jan 17 20:34:17 2008
+++ php-src/ext/date/php_date.c Wed Jan 23 15:14:18 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.156 2008/01/17 20:34:17 derick Exp $ */
+/* $Id: php_date.c,v 1.157 2008/01/23 15:14:18 tony2001 Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -940,17 +940,17 @@
  break;
case 'T': length = date_spprintf(buffer, 32 TSRMLS_CC, 
%s, localtime ? offset-abbr : GMT); break;
case 'e': if (!localtime) {
- length = date_spprintf(buffer, 
32, %s, UTC);
+ length = date_spprintf(buffer, 
32 TSRMLS_CC, %s, UTC);
  } else {
  switch (t-zone_type) {
  case 
TIMELIB_ZONETYPE_ID:
- length = 
date_spprintf(buffer, 32, %s, t-tz_info-name);
+ length = 
date_spprintf(buffer, 32 TSRMLS_CC, %s, t-tz_info-name);
  break;
  case 
TIMELIB_ZONETYPE_ABBR:
- length = 
date_spprintf(buffer, 32, %s, offset-abbr);
+ length = 
date_spprintf(buffer, 32 TSRMLS_CC, %s, offset-abbr);
  break;
  case 
TIMELIB_ZONETYPE_OFFSET:
- length = 
date_spprintf(buffer, 32, %c%02d:%02d,
+ length = 
date_spprintf(buffer, 32 TSRMLS_CC, %c%02d:%02d,

((offset-offset  0) ? '-' : '+'),

abs(offset-offset / 3600),

abs((offset-offset % 3600) / 60)

-- 
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.h mysqlnd_charset.c mysqlnd_charset.h mysqlnd_libmysql_compat.h mysqlnd_loaddata.c mysqlnd_palloc.c mysqlnd_portability.h mysqlnd_priv.h mysqlnd_p

2008-01-23 Thread Andrey Hristov

andrey  Wed Jan 23 19:09:33 2008 UTC

  Modified files:  
/php-src/ext/mysqlndmysqlnd.c mysqlnd.h mysqlnd_charset.c 
mysqlnd_charset.h mysqlnd_libmysql_compat.h 
mysqlnd_loaddata.c mysqlnd_palloc.c 
mysqlnd_portability.h mysqlnd_priv.h 
mysqlnd_ps.c mysqlnd_result.c 
mysqlnd_result_meta.c mysqlnd_structs.h 
mysqlnd_wireprotocol.c mysqlnd_wireprotocol.h 
  Log:
  Merge with internal version
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.10r2=1.11diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.10 php-src/ext/mysqlnd/mysqlnd.c:1.11
--- php-src/ext/mysqlnd/mysqlnd.c:1.10  Tue Jan  8 13:13:39 2008
+++ php-src/ext/mysqlnd/mysqlnd.c   Wed Jan 23 19:09:33 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysqlnd.c,v 1.10 2008/01/08 13:13:39 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.11 2008/01/23 19:09:33 andrey Exp $ */
 #include php.h
 #include mysqlnd.h
 #include mysqlnd_wireprotocol.h
@@ -67,7 +67,7 @@
 static zend_bool mysqlnd_library_initted = FALSE;
 
 
-enum_func_status mysqlnd_send_close(MYSQLND * conn TSRMLS_DC);
+static enum_func_status mysqlnd_send_close(MYSQLND * conn TSRMLS_DC);
 
 /* {{{ mysqlnd_library_init */
 static
@@ -454,11 +454,11 @@
 
 /* {{{ mysqlnd_connect */
 PHPAPI MYSQLND *mysqlnd_connect(MYSQLND *conn,
-char *host, char *user,
-char *passwd, unsigned int 
passwd_len,
-char *db, unsigned int db_len,
+const char *host, const char 
*user,
+const char *passwd, unsigned 
int passwd_len,
+const char *db, unsigned int 
db_len,
 unsigned int port,
-char *socket,
+const char *socket,
 unsigned int mysql_flags,
 MYSQLND_THD_ZVAL_PCACHE 
*zval_cache
 TSRMLS_DC)
@@ -949,7 +949,7 @@
 
 
 /* {{{ mysqlnd_old_escape_string */
-PHPAPI ulong mysqlnd_old_escape_string(char *newstr, const char *escapestr, 
int escapestr_len TSRMLS_DC)
+PHPAPI ulong mysqlnd_old_escape_string(char *newstr, const char *escapestr, 
size_t escapestr_len TSRMLS_DC)
 {
DBG_ENTER(mysqlnd_old_escape_string);

DBG_RETURN(mysqlnd_cset_escape_slashes(mysqlnd_find_charset_name(latin1),
@@ -961,7 +961,7 @@
 /* {{{ mysqlnd_conn::escape_string */
 static ulong
 MYSQLND_METHOD(mysqlnd_conn, escape_string)(const MYSQLND * const conn, char 
*newstr,
-   
const char *escapestr, int escapestr_len TSRMLS_DC)
+   
const char *escapestr, size_t escapestr_len TSRMLS_DC)
 {
DBG_ENTER(mysqlnd_conn::escape_string);
DBG_INF_FMT(conn=%llu, conn-thread_id);
@@ -1088,7 +1088,7 @@
 /* }}} */
 
 
-/* {{{ _mysqlnd_conn::set_charset */
+/* {{{ mysqlnd_conn::set_charset */
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_conn, set_charset)(MYSQLND * const conn, const char * 
const csname TSRMLS_DC)
 {
@@ -1696,8 +1696,8 @@
 /* }}} */
 
 
-/* {{{ _mysqlnd_conn::use_result */
-MYSQLND_RES *
+/* {{{ mysqlnd_conn::use_result */
+static MYSQLND_RES *
 MYSQLND_METHOD(mysqlnd_conn, use_result)(MYSQLND * const conn TSRMLS_DC)
 {
MYSQLND_RES *result;
@@ -1729,8 +1729,8 @@
 /* }}} */
 
 
-/* {{{ _mysqlnd_conn::store_result */
-MYSQLND_RES *
+/* {{{ mysqlnd_conn::store_result */
+static MYSQLND_RES *
 MYSQLND_METHOD(mysqlnd_conn, store_result)(MYSQLND * const conn TSRMLS_DC)
 {
MYSQLND_RES *result;
@@ -1762,7 +1762,7 @@
 
 
 /* {{{ mysqlnd_conn::get_connection_stats */
-void
+static void
 MYSQLND_METHOD(mysqlnd_conn, get_connection_stats)(const MYSQLND * const conn,

   zval *return_value

   TSRMLS_DC ZEND_FILE_LINE_DC)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.h?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.h
diff -u php-src/ext/mysqlnd/mysqlnd.h:1.6 php-src/ext/mysqlnd/mysqlnd.h:1.7
--- php-src/ext/mysqlnd/mysqlnd.h:1.6   Tue Jan  8 13:13:39 2008
+++ php-src/ext/mysqlnd/mysqlnd.h   Wed Jan 23 19:09:33 2008
@@ -18,12

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd config.w32 config9.m4 mysqlnd.c mysqlnd.h mysqlnd_charset.c mysqlnd_charset.h mysqlnd_debug.c mysqlnd_debug.h mysqlnd_enum_n_def.h mysqlnd_libmysql_compat.

2008-01-23 Thread Andrey Hristov

andrey  Wed Jan 23 19:11:29 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndconfig.w32 config9.m4 mysqlnd.c mysqlnd.h 
mysqlnd_charset.c mysqlnd_charset.h 
mysqlnd_debug.c mysqlnd_debug.h 
mysqlnd_enum_n_def.h mysqlnd_libmysql_compat.h 
mysqlnd_loaddata.c mysqlnd_palloc.c 
mysqlnd_palloc.h mysqlnd_portability.h 
mysqlnd_priv.h mysqlnd_ps.c mysqlnd_ps_codec.c 
mysqlnd_qcache.c mysqlnd_result.c 
mysqlnd_result.h mysqlnd_result_meta.c 
mysqlnd_result_meta.h mysqlnd_statistics.c 
mysqlnd_statistics.h mysqlnd_structs.h 
mysqlnd_wireprotocol.c mysqlnd_wireprotocol.h 
  Log:
  Merge with internal version
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config.w32?r1=1.4.2.2r2=1.4.2.3diff_format=u
Index: php-src/ext/mysqlnd/config.w32
diff -u php-src/ext/mysqlnd/config.w32:1.4.2.2 
php-src/ext/mysqlnd/config.w32:1.4.2.3
--- php-src/ext/mysqlnd/config.w32:1.4.2.2  Fri Oct  5 21:23:56 2007
+++ php-src/ext/mysqlnd/config.w32  Wed Jan 23 19:11:28 2008
@@ -1,6 +1,9 @@
-// $Id: config.w32,v 1.4.2.2 2007/10/05 21:23:56 andrey Exp $
+// $Id: config.w32,v 1.4.2.3 2008/01/23 19:11:28 andrey Exp $
 // vim:ft=javascript
 
+ARG_WITH(mysqlnd, MySQL-nd support, no);
+
+if (PHP_MYSQLND != no) {
 mysqld_source = ;
 if (CHECK_LIB(ws2_32.lib, mysqlnd)) {
mysqlnd_source = 
@@ -18,3 +21,4 @@
mysqlnd_wireprotocol.c;
EXTENSION(mysqlnd, mysqlnd_source, false);
 }
+}
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config9.m4?r1=1.3.2.2r2=1.3.2.3diff_format=u
Index: php-src/ext/mysqlnd/config9.m4
diff -u php-src/ext/mysqlnd/config9.m4:1.3.2.2 
php-src/ext/mysqlnd/config9.m4:1.3.2.3
--- php-src/ext/mysqlnd/config9.m4:1.3.2.2  Fri Oct  5 21:23:56 2007
+++ php-src/ext/mysqlnd/config9.m4  Wed Jan 23 19:11:28 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config9.m4,v 1.3.2.2 2007/10/05 21:23:56 andrey Exp $
+dnl $Id: config9.m4,v 1.3.2.3 2008/01/23 19:11:28 andrey Exp $
 dnl config.m4 for mysqlnd driver
 
 dnl If some extension uses mysqlnd it will get compiled in PHP core
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.5.2.7r2=1.5.2.8diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.5.2.7 
php-src/ext/mysqlnd/mysqlnd.c:1.5.2.8
--- php-src/ext/mysqlnd/mysqlnd.c:1.5.2.7   Tue Jan  8 13:11:55 2008
+++ php-src/ext/mysqlnd/mysqlnd.c   Wed Jan 23 19:11:28 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysqlnd.c,v 1.5.2.7 2008/01/08 13:11:55 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.5.2.8 2008/01/23 19:11:28 andrey Exp $ */
 #include php.h
 #include mysqlnd.h
 #include mysqlnd_wireprotocol.h
@@ -67,7 +67,7 @@
 static zend_bool mysqlnd_library_initted = FALSE;
 
 
-enum_func_status mysqlnd_send_close(MYSQLND * conn TSRMLS_DC);
+static enum_func_status mysqlnd_send_close(MYSQLND * conn TSRMLS_DC);
 
 /* {{{ mysqlnd_library_init */
 static
@@ -454,11 +454,11 @@
 
 /* {{{ mysqlnd_connect */
 PHPAPI MYSQLND *mysqlnd_connect(MYSQLND *conn,
-char *host, char *user,
-char *passwd, unsigned int 
passwd_len,
-char *db, unsigned int db_len,
+const char *host, const char 
*user,
+const char *passwd, unsigned 
int passwd_len,
+const char *db, unsigned int 
db_len,
 unsigned int port,
-char *socket,
+const char *socket,
 unsigned int mysql_flags,
 MYSQLND_THD_ZVAL_PCACHE 
*zval_cache
 TSRMLS_DC)
@@ -949,7 +949,7 @@
 
 
 /* {{{ mysqlnd_old_escape_string */
-PHPAPI ulong mysqlnd_old_escape_string(char *newstr, const char *escapestr, 
int escapestr_len TSRMLS_DC)
+PHPAPI ulong mysqlnd_old_escape_string(char *newstr, const char *escapestr, 
size_t escapestr_len TSRMLS_DC)
 {
DBG_ENTER(mysqlnd_old_escape_string);

DBG_RETURN(mysqlnd_cset_escape_slashes(mysqlnd_find_charset_name(latin1),
@@ -961,7 +961,7 @@
 /* {{{ mysqlnd_conn::escape_string */
 static ulong
 MYSQLND_METHOD(mysqlnd_conn, escape_string)(const MYSQLND * const conn, char 
*newstr,
-

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build config.w32

2008-01-23 Thread Stanislav Malyshev

stasWed Jan 23 19:55:38 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfig.w32 
  Log:
  fix build
  
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.3r2=1.40.2.8.2.10.2.4diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.3 
php-src/win32/build/config.w32:1.40.2.8.2.10.2.4
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.3Wed Nov  7 19:47:38 2007
+++ php-src/win32/build/config.w32  Wed Jan 23 19:55:37 2008
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.3 2007/11/07 19:47:38 stas Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.4 2008/01/23 19:55:37 stas Exp $
 // Master config file; think of it as a configure.in
 // equivalent.
 
@@ -299,7 +299,7 @@
zend_sprintf.c zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c \
zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \
zend_object_handlers.c zend_objects_API.c \
-   zend_default_classes.c zend_execute.c zend_strtod.c);
+   zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c);
 
 ADD_SOURCES(main, main.c snprintf.c spprintf.c safe_mode.c getopt.c 
fopen_wrappers.c \
php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \

-- 
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

2008-01-23 Thread Ilia Alshanetsky

iliaa   Wed Jan 23 23:08:27 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcEXTENSIONS 
  Log:
  
  Added myself as pdo_mysql  pdo_pgsql maintainer
  
http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.72.2.4.2.4.2.1r2=1.72.2.4.2.4.2.2diff_format=u
Index: php-src/EXTENSIONS
diff -u php-src/EXTENSIONS:1.72.2.4.2.4.2.1 php-src/EXTENSIONS:1.72.2.4.2.4.2.2
--- php-src/EXTENSIONS:1.72.2.4.2.4.2.1 Wed Nov 14 22:37:01 2007
+++ php-src/EXTENSIONS  Wed Jan 23 23:08:27 2008
@@ -188,7 +188,7 @@
 SINCE:   5.1
 ---
 EXTENSION:   pdo_mysql
-PRIMARY MAINTAINER:  Unknown
+PRIMARY MAINTAINER:  Ilia Alshanetsky [EMAIL PROTECTED]
 MAINTENANCE: Odd fixes
 STATUS:  Working
 SINCE:   5.1
@@ -206,7 +206,7 @@
 SINCE:   5.1
 ---
 EXTENSION:   pdo_pgsql
-PRIMARY MAINTAINER:  Unknown
+PRIMARY MAINTAINER:  Ilia Alshanetsky [EMAIL PROTECTED]
 MAINTENANCE: Odd fixes
 STATUS:  Working
 SINCE:   5.1

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml simplexml.c /ext/simplexml/tests bug37076_1.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml/tests bug37076_1.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml/tests bug37076_1.phpt

[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c /ext/simplexml/tests bug37076_1.phpt

[PHP-CVS] cvs: php-src /ext/standard array.c

[PHP-CVS] cvs: php-src /ext/date php_date.c

[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd.c mysqlnd.h mysqlnd_charset.c mysqlnd_charset.h mysqlnd_libmysql_compat.h mysqlnd_loaddata.c mysqlnd_palloc.c mysqlnd_portability.h mysqlnd_priv.h mysqlnd_p

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd config.w32 config9.m4 mysqlnd.c mysqlnd.h mysqlnd_charset.c mysqlnd_charset.h mysqlnd_debug.c mysqlnd_debug.h mysqlnd_enum_n_def.h mysqlnd_libmysql_compat.

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build config.w32

[PHP-CVS] cvs: php-src(PHP_5_3) / EXTENSIONS

12 matches

Site Navigation

Mail list logo

Footer information