[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/pdo_mysql mysql_statement.c
iliaa Wed Aug 31 21:57:02 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_mysql mysql_statement.c
/php-srcNEWS
Log:
MFH: Fixed bug #34001 (pdo_mysql truncates numberic fields at 4 chars)
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_statement.c?r1=1.48&r2=1.48.2.1&ty=u
Index: php-src/ext/pdo_mysql/mysql_statement.c
diff -u php-src/ext/pdo_mysql/mysql_statement.c:1.48
php-src/ext/pdo_mysql/mysql_statement.c:1.48.2.1
--- php-src/ext/pdo_mysql/mysql_statement.c:1.48Wed Jul 20 00:30:14 2005
+++ php-src/ext/pdo_mysql/mysql_statement.c Wed Aug 31 21:57:01 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mysql_statement.c,v 1.48 2005/07/20 04:30:14 iliaa Exp $ */
+/* $Id: mysql_statement.c,v 1.48.2.1 2005/09/01 01:57:01 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -121,9 +121,27 @@
mysql_stmt_attr_set(S->stmt,
STMT_ATTR_UPDATE_MAX_LENGTH, &on);
calc_max_length = 0;
}
- S->bound_result[i].buffer_length =
- S->fields[i].max_length?
S->fields[i].max_length:
- S->fields[i].length;
+ switch (S->fields[i].type) {
+ case FIELD_TYPE_INT24:
+
S->bound_result[i].buffer_length = MAX_MEDIUMINT_WIDTH;
+ break;
+ case FIELD_TYPE_LONG:
+
S->bound_result[i].buffer_length = MAX_INT_WIDTH;
+ break;
+ case FIELD_TYPE_LONGLONG:
+
S->bound_result[i].buffer_length = MAX_BIGINT_WIDTH;
+ break;
+ case FIELD_TYPE_TINY:
+
S->bound_result[i].buffer_length = MAX_TINYINT_WIDTH;
+ break;
+ case FIELD_TYPE_SHORT:
+
S->bound_result[i].buffer_length = MAX_SMALLINT_WIDTH;
+ break;
+ default:
+
S->bound_result[i].buffer_length =
+
S->fields[i].max_length? S->fields[i].max_length:
+
S->fields[i].length;
+ }
S->bound_result[i].buffer =
emalloc(S->bound_result[i].buffer_length);
S->bound_result[i].is_null =
&S->out_null[i];
S->bound_result[i].length =
&S->out_length[i];
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.36&r2=1.2027.2.37&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.36 php-src/NEWS:1.2027.2.37
--- php-src/NEWS:1.2027.2.36Wed Aug 31 10:58:22 2005
+++ php-src/NEWSWed Aug 31 21:57:01 2005
@@ -39,6 +39,7 @@
- Fixed bug #34062 (Crash in catch block when many arguments are used).
(Dmitry)
- Fixed bug #34045 (Buffer overflow with serialized object). (Dmitry)
+- Fixed bug #34001 (pdo_mysql truncates numberic fields at 4 chars). (Ilia)
- Fixed bug #33999 (object remains object when cast to int). (Dmitry)
- Fixed bug #33996 (No information given for fatal error on passing invalid
value to typed argument). (Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_statement.c
iliaa Wed Aug 31 21:56:37 2005 EDT
Modified files:
/php-src/ext/pdo_mysql mysql_statement.c
Log:
Fixed bug #34001 (pdo_mysql truncates numberic fields at 4 chars)
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_statement.c?r1=1.48&r2=1.49&ty=u
Index: php-src/ext/pdo_mysql/mysql_statement.c
diff -u php-src/ext/pdo_mysql/mysql_statement.c:1.48
php-src/ext/pdo_mysql/mysql_statement.c:1.49
--- php-src/ext/pdo_mysql/mysql_statement.c:1.48Wed Jul 20 00:30:14 2005
+++ php-src/ext/pdo_mysql/mysql_statement.c Wed Aug 31 21:56:36 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mysql_statement.c,v 1.48 2005/07/20 04:30:14 iliaa Exp $ */
+/* $Id: mysql_statement.c,v 1.49 2005/09/01 01:56:36 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -121,9 +121,27 @@
mysql_stmt_attr_set(S->stmt,
STMT_ATTR_UPDATE_MAX_LENGTH, &on);
calc_max_length = 0;
}
- S->bound_result[i].buffer_length =
- S->fields[i].max_length?
S->fields[i].max_length:
- S->fields[i].length;
+ switch (S->fields[i].type) {
+ case FIELD_TYPE_INT24:
+
S->bound_result[i].buffer_length = MAX_MEDIUMINT_WIDTH;
+ break;
+ case FIELD_TYPE_LONG:
+
S->bound_result[i].buffer_length = MAX_INT_WIDTH;
+ break;
+ case FIELD_TYPE_LONGLONG:
+
S->bound_result[i].buffer_length = MAX_BIGINT_WIDTH;
+ break;
+ case FIELD_TYPE_TINY:
+
S->bound_result[i].buffer_length = MAX_TINYINT_WIDTH;
+ break;
+ case FIELD_TYPE_SHORT:
+
S->bound_result[i].buffer_length = MAX_SMALLINT_WIDTH;
+ break;
+ default:
+
S->bound_result[i].buffer_length =
+
S->fields[i].max_length? S->fields[i].max_length:
+
S->fields[i].length;
+ }
S->bound_result[i].buffer =
emalloc(S->bound_result[i].buffer_length);
S->bound_result[i].is_null =
&S->out_null[i];
S->bound_result[i].length =
&S->out_length[i];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/sybase config.m4
sniper Wed Aug 31 18:29:44 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/ext/sybase config.m4 Log: Fixed bug #34323 http://cvs.php.net/diff.php/php-src/ext/sybase/config.m4?r1=1.10&r2=1.10.18.1&ty=u Index: php-src/ext/sybase/config.m4 diff -u php-src/ext/sybase/config.m4:1.10 php-src/ext/sybase/config.m4:1.10.18.1 --- php-src/ext/sybase/config.m4:1.10 Tue Mar 12 11:36:10 2002 +++ php-src/ext/sybase/config.m4Wed Aug 31 18:29:44 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.10 2002/03/12 16:36:10 sas Exp $ +dnl $Id: config.m4,v 1.10.18.1 2005/08/31 22:29:44 sniper Exp $ dnl PHP_ARG_WITH(sybase,for Sybase support, @@ -27,4 +27,6 @@ [ AC_DEFINE(PHP_SYBASE_DBOPEN,tdsdbopen,[ ]) AC_DEFINE(DBMFIX,1,[ ]) ], [ AC_DEFINE(PHP_SYBASE_DBOPEN,dbopen,[ ]) ]) + + PHP_SUBST(SYBASE_SHARED_LIBADD) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sybase config.m4
sniper Wed Aug 31 18:29:22 2005 EDT Modified files: /php-src/ext/sybase config.m4 Log: Fixed bug #34323 http://cvs.php.net/diff.php/php-src/ext/sybase/config.m4?r1=1.11&r2=1.12&ty=u Index: php-src/ext/sybase/config.m4 diff -u php-src/ext/sybase/config.m4:1.11 php-src/ext/sybase/config.m4:1.12 --- php-src/ext/sybase/config.m4:1.11 Sun May 29 19:16:44 2005 +++ php-src/ext/sybase/config.m4Wed Aug 31 18:29:22 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.11 2005/05/29 23:16:44 sniper Exp $ +dnl $Id: config.m4,v 1.12 2005/08/31 22:29:22 sniper Exp $ dnl PHP_ARG_WITH(sybase,for Sybase support, @@ -26,4 +26,6 @@ [ AC_DEFINE(PHP_SYBASE_DBOPEN,tdsdbopen,[ ]) AC_DEFINE(DBMFIX,1,[ ]) ], [ AC_DEFINE(PHP_SYBASE_DBOPEN,dbopen,[ ]) ]) + + PHP_SUBST(SYBASE_SHARED_LIBADD) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/sybase config.m4
sniper Wed Aug 31 18:28:46 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/sybase config.m4 Log: Fixed bug #34323 http://cvs.php.net/diff.php/php-src/ext/sybase/config.m4?r1=1.11&r2=1.11.2.1&ty=u Index: php-src/ext/sybase/config.m4 diff -u php-src/ext/sybase/config.m4:1.11 php-src/ext/sybase/config.m4:1.11.2.1 --- php-src/ext/sybase/config.m4:1.11 Sun May 29 19:16:44 2005 +++ php-src/ext/sybase/config.m4Wed Aug 31 18:28:46 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.11 2005/05/29 23:16:44 sniper Exp $ +dnl $Id: config.m4,v 1.11.2.1 2005/08/31 22:28:46 sniper Exp $ dnl PHP_ARG_WITH(sybase,for Sybase support, @@ -26,4 +26,6 @@ [ AC_DEFINE(PHP_SYBASE_DBOPEN,tdsdbopen,[ ]) AC_DEFINE(DBMFIX,1,[ ]) ], [ AC_DEFINE(PHP_SYBASE_DBOPEN,dbopen,[ ]) ]) + + PHP_SUBST(SYBASE_SHARED_LIBADD) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main rfc1867.c
andrei Wed Aug 31 16:42:18 2005 EDT
Modified files:
/php-src/main rfc1867.c
Log:
Further work on Unicode support in file uploads.
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.174&r2=1.175&ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.174 php-src/main/rfc1867.c:1.175
--- php-src/main/rfc1867.c:1.174Thu Aug 11 19:36:05 2005
+++ php-src/main/rfc1867.c Wed Aug 31 16:42:14 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: rfc1867.c,v 1.174 2005/08/11 23:36:05 andrei Exp $ */
+/* $Id: rfc1867.c,v 1.175 2005/08/31 20:42:14 andrei Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -273,6 +273,15 @@
}
+static void add_u_protected_variable(UChar *varname TSRMLS_DC)
+{
+ int dummy=1;
+
+ normalize_u_protected_variable(varname TSRMLS_CC);
+ zend_u_hash_add(&PG(rfc1867_protected_variables), IS_UNICODE, varname,
u_strlen(varname)+1, &dummy, sizeof(int), NULL);
+}
+
+
static zend_bool is_protected_variable(char *varname TSRMLS_DC)
{
normalize_protected_variable(varname TSRMLS_CC);
@@ -311,6 +320,14 @@
}
+static void safe_u_php_register_variable_ex(UChar *var, zval *val, zval
*track_vars_array, zend_bool override_protection TSRMLS_DC)
+{
+ if (override_protection || !is_u_protected_variable(var TSRMLS_CC)) {
+ php_u_register_variable_ex(var, val, track_vars_array
TSRMLS_CC);
+ }
+}
+
+
static void register_http_post_files_variable(char *strvar, char *val, zval
*http_post_files, zend_bool override_protection TSRMLS_DC)
{
int register_globals = PG(register_globals);
@@ -321,6 +338,16 @@
}
+static void register_u_http_post_files_variable(UChar *strvar, UChar *val,
int32_t val_len, zval *http_post_files, zend_bool override_protection TSRMLS_DC)
+{
+ int register_globals = PG(register_globals);
+
+ PG(register_globals) = 0;
+ safe_u_php_register_variable(strvar, val, val_len, http_post_files,
override_protection TSRMLS_CC);
+ PG(register_globals) = register_globals;
+}
+
+
static void register_http_post_files_variable_ex(char *var, zval *val, zval
*http_post_files, zend_bool override_protection TSRMLS_DC)
{
int register_globals = PG(register_globals);
@@ -331,6 +358,16 @@
}
+static void register_u_http_post_files_variable_ex(UChar *var, zval *val, zval
*http_post_files, zend_bool override_protection TSRMLS_DC)
+{
+ int register_globals = PG(register_globals);
+
+ PG(register_globals) = 0;
+ safe_u_php_register_variable_ex(var, val, http_post_files,
override_protection TSRMLS_CC);
+ PG(register_globals) = register_globals;
+}
+
+
static int unlink_filename(char **filename TSRMLS_DC)
{
VCWD_UNLINK(*filename);
@@ -991,15 +1028,13 @@
static SAPI_POST_HANDLER_FUNC(rfc1867_post_handler_unicode)
{
- char *boundary, *s=NULL, *boundary_end = NULL, *start_arr=NULL,
*array_index=NULL;
- char *temp_filename=NULL, *lbuf=NULL, *abuf=NULL;
+ char *boundary, *boundary_end = NULL;
+ UChar *temp_filename=NULL, *array_index = NULL, *lbuf = NULL, *abuf =
NULL;
+ UChar *start_arr = NULL, *s = NULL;
+ char *ascii_temp_filename = NULL;
int boundary_len=0, total_bytes=0, cancel_upload=0, is_arr_upload=0,
array_len=0;
int max_file_size=0, skip_upload=0, anonindex=0, is_anonymous;
zval *http_post_files=NULL; HashTable *uploaded_files=NULL;
-#if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING)
- int str_len = 0, num_vars = 0, num_vars_max = 2*10, *len_list = NULL;
- char **val_list = NULL;
-#endif
zend_bool magic_quotes_gpc;
multipart_buffer *mbuff;
zval *array_ptr = (zval *) arg;
@@ -1060,12 +1095,6 @@
INIT_PZVAL(http_post_files);
PG(http_globals)[TRACK_VARS_FILES] = http_post_files;
-#if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING)
- if (php_mb_encoding_translation(TSRMLS_C)) {
- val_list = (char **)ecalloc(num_vars_max+2, sizeof(char *));
- len_list = (int *)ecalloc(num_vars_max+2, sizeof(int));
- }
-#endif
zend_llist_init(&header, sizeof(mime_header_entry), (llist_dtor_func_t)
php_free_hdr_entry, 0);
if (!did_string_init) {
@@ -1082,9 +,9 @@
while (!multipart_buffer_eof(mbuff TSRMLS_CC))
{
char buff[FILLUNIT];
- char *cd=NULL, *tmp=NULL;
+ char *cd=NULL;
int blen=0, wlen=0;
- UChar *param = NULL, *filename = NULL;
+ UChar *param = NULL, *filename = NULL, *tmp = NULL;
int32_t param_len;
zend_llist_clean(&header);
@@ -1096,19 +1125,20 @@
if ((cd = php_mime_get_hdr_value(header,
"Content-Disposition"))) {
UChar *pair = NULL;
UC
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/simplexml simplexml.c
rrichards Wed Aug 31 13:00:46 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/simplexml simplexml.c
Log:
MFH: make sxe_properties_get respect namespace scope
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.151.2.1&r2=1.151.2.2&ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.1
php-src/ext/simplexml/simplexml.c:1.151.2.2
--- php-src/ext/simplexml/simplexml.c:1.151.2.1 Thu Aug 18 09:34:40 2005
+++ php-src/ext/simplexml/simplexml.c Wed Aug 31 13:00:46 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.1 2005/08/18 13:34:40 sniper Exp $ */
+/* $Id: simplexml.c,v 1.151.2.2 2005/08/31 17:00:46 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -633,7 +633,7 @@
/* {{{ _get_base_node_value()
*/
static void
-_get_base_node_value(php_sxe_object *sxe_ref, xmlNodePtr node, zval **value
TSRMLS_DC)
+_get_base_node_value(php_sxe_object *sxe_ref, xmlNodePtr node, zval **value,
char *prefix TSRMLS_DC)
{
php_sxe_object *subnode;
xmlChar*contents;
@@ -650,8 +650,10 @@
subnode = php_sxe_object_new(sxe_ref->zo.ce TSRMLS_CC);
subnode->document = sxe_ref->document;
subnode->document->refcount++;
+ if (prefix) {
+ subnode->iter.nsprefix = xmlStrdup(prefix);
+ }
php_libxml_increment_node_ptr((php_libxml_node_object
*)subnode, node, NULL TSRMLS_CC);
-
(*value)->type = IS_OBJECT;
(*value)->value.obj = php_sxe_register_object(subnode
TSRMLS_CC);
/*zval_add_ref(value);*/
@@ -703,6 +705,10 @@
}
}
+ if (node->type == XML_ELEMENT_NODE && (! match_ns(sxe,
node, sxe->iter.nsprefix))) {
+ goto next_iter;
+ }
+
name = (char *) node->name;
if (!name) {
goto next_iter;
@@ -710,7 +716,7 @@
namelen = xmlStrlen(node->name) + 1;
}
- _get_base_node_value(sxe, node, &value TSRMLS_CC);
+ _get_base_node_value(sxe, node, &value,
sxe->iter.nsprefix TSRMLS_CC);
h = zend_hash_func(name, namelen);
if (zend_hash_quick_find(rv, name, namelen, h, (void
**) &data_ptr) == SUCCESS) {
@@ -1736,7 +1742,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.1 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.2 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
--
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
rrichards Wed Aug 31 13:00:25 2005 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
make sxe_properties_get respect namespace scope
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.158&r2=1.159&ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.158
php-src/ext/simplexml/simplexml.c:1.159
--- php-src/ext/simplexml/simplexml.c:1.158 Tue Aug 23 05:33:44 2005
+++ php-src/ext/simplexml/simplexml.c Wed Aug 31 13:00:22 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.158 2005/08/23 09:33:44 dmitry Exp $ */
+/* $Id: simplexml.c,v 1.159 2005/08/31 17:00:22 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -642,7 +642,7 @@
/* {{{ _get_base_node_value()
*/
static void
-_get_base_node_value(php_sxe_object *sxe_ref, xmlNodePtr node, zval **value
TSRMLS_DC)
+_get_base_node_value(php_sxe_object *sxe_ref, xmlNodePtr node, zval **value,
char *prefix TSRMLS_DC)
{
php_sxe_object *subnode;
xmlChar*contents;
@@ -659,6 +659,9 @@
subnode = php_sxe_object_new(sxe_ref->zo.ce TSRMLS_CC);
subnode->document = sxe_ref->document;
subnode->document->refcount++;
+ if (prefix) {
+ subnode->iter.nsprefix = xmlStrdup(prefix);
+ }
php_libxml_increment_node_ptr((php_libxml_node_object
*)subnode, node, NULL TSRMLS_CC);
(*value)->type = IS_OBJECT;
@@ -712,6 +715,10 @@
}
}
+ if (node->type == XML_ELEMENT_NODE && (! match_ns(sxe,
node, sxe->iter.nsprefix))) {
+ goto next_iter;
+ }
+
name = (char *) node->name;
if (!name) {
goto next_iter;
@@ -719,7 +726,7 @@
namelen = xmlStrlen(node->name) + 1;
}
- _get_base_node_value(sxe, node, &value TSRMLS_CC);
+ _get_base_node_value(sxe, node, &value,
sxe->iter.nsprefix TSRMLS_CC);
h = zend_hash_func(name, namelen);
if (zend_hash_quick_find(rv, name, namelen, h, (void
**) &data_ptr) == SUCCESS) {
@@ -1760,7 +1767,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.158 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.159 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard credits_ext.h
sniper Wed Aug 31 11:01:14 2005 EDT
Modified files:
/php-src/ext/standard credits_ext.h
Log:
Update credits
http://cvs.php.net/diff.php/php-src/ext/standard/credits_ext.h?r1=1.30&r2=1.31&ty=u
Index: php-src/ext/standard/credits_ext.h
diff -u php-src/ext/standard/credits_ext.h:1.30
php-src/ext/standard/credits_ext.h:1.31
--- php-src/ext/standard/credits_ext.h:1.30 Wed Aug 3 09:47:34 2005
+++ php-src/ext/standard/credits_ext.h Wed Aug 31 11:01:13 2005
@@ -18,9 +18,9 @@
CREDIT_LINE("ctype", "Hartmut Holzgraefe");
CREDIT_LINE("cURL", "Sterling Hughes");
CREDIT_LINE("Date/Time Support", "Derick Rethans");
+CREDIT_LINE("DB-LIB (MS SQL, Sybase)", "Wez Furlong, Frank M. Kromann");
CREDIT_LINE("DBA", "Sascha Schumann, Marcus Boerger");
CREDIT_LINE("dBase", "Jim Winstead");
-CREDIT_LINE("DB-LIB (MS SQL, Sybase)", "Wez Furlong, Frank M. Kromann");
CREDIT_LINE("DOM", "Christian Stocker, Rob Richards, Marcus Boerger");
CREDIT_LINE("EXIF", "Rasmus Lerdorf, Marcus Boerger");
CREDIT_LINE("FBSQL", "Frank M. Kromann");
@@ -43,21 +43,19 @@
CREDIT_LINE("mhash", "Sascha Schumann");
CREDIT_LINE("mime_magic", "Hartmut Holzgraefe");
CREDIT_LINE("MING", "Dave Hayden, Frank M. Kromann");
-CREDIT_LINE("mono", "Sterling Hughes");
+CREDIT_LINE("MS SQL", "Frank M. Kromann");
CREDIT_LINE("msession", "Mark L. Woodward");
CREDIT_LINE("mSQL", "Zeev Suraski");
-CREDIT_LINE("MS SQL", "Frank M. Kromann");
CREDIT_LINE("Multibyte String Functions", "Tsukada Takuya, Rui Hirokawa");
CREDIT_LINE("mySQL 3.x driver for PDO", "George Schlossnagle");
-CREDIT_LINE("MySQLi", "Zak Greant, Georg Richter");
CREDIT_LINE("MySQL", "Zeev Suraski, Zak Greant, Georg Richter");
+CREDIT_LINE("MySQLi", "Zak Greant, Georg Richter");
CREDIT_LINE("ncurses", "Ilia Alshanetsky, Wez Furlong, Hartmut Holzgraefe,
Georg Richter");
CREDIT_LINE("OCI8", "Stig Bakken, Thies C. Arntzen, Andy Sautins, David
Benson, Maxim Maletsky, Harald Radi, Antony Dovgal");
CREDIT_LINE("ODBC driver for PDO", "Wez Furlong");
CREDIT_LINE("ODBC", "Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel
R. Kalowsky");
CREDIT_LINE("OpenSSL", "Stig Venaas, Wez Furlong, Sascha Kettler");
CREDIT_LINE("Oracle (OCI) driver for PDO", "Wez Furlong");
-CREDIT_LINE("Oracle", "Stig Bakken, Mitch Golden, Rasmus Lerdorf, Andreas
Karajannis, Thies C. Arntzen");
CREDIT_LINE("Ovrimos", "Nikos Mavroyanopoulos");
CREDIT_LINE("pcntl", "Jason Greene");
CREDIT_LINE("Perl Compatible Regexps", "Andrei Zmievski");
@@ -84,10 +82,11 @@
CREDIT_LINE("System V Shared Memory", "Christian Cartus");
CREDIT_LINE("tidy", "John Coggeshall, Ilia Alshanetsky");
CREDIT_LINE("tokenizer", "Andrei Zmievski");
+CREDIT_LINE("unicode", "Andrei Zmievski");
CREDIT_LINE("Verisign Payflow Pro", "John Donagher, David Croft");
CREDIT_LINE("WDDX", "Andrei Zmievski");
+CREDIT_LINE("XML", "Stig Bakken, Thies C. Arntzen, Sterling Hughes");
CREDIT_LINE("XMLReader", "Rob Richards");
CREDIT_LINE("xmlrpc", "Dan Libby");
-CREDIT_LINE("XML", "Stig Bakken, Thies C. Arntzen, Sterling Hughes");
CREDIT_LINE("XSL", "Christian Stocker, Rob Richards");
CREDIT_LINE("Zlib", "Rasmus Lerdorf, Stefan Roehrich, Zeev Suraski, Jade
Nicoletti");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/standard credits_ext.h
sniper Wed Aug 31 10:59:21 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard credits_ext.h
Log:
Update credits
http://cvs.php.net/diff.php/php-src/ext/standard/credits_ext.h?r1=1.30.2.1&r2=1.30.2.2&ty=u
Index: php-src/ext/standard/credits_ext.h
diff -u php-src/ext/standard/credits_ext.h:1.30.2.1
php-src/ext/standard/credits_ext.h:1.30.2.2
--- php-src/ext/standard/credits_ext.h:1.30.2.1 Thu Aug 11 18:36:47 2005
+++ php-src/ext/standard/credits_ext.h Wed Aug 31 10:59:20 2005
@@ -43,7 +43,6 @@
CREDIT_LINE("mhash", "Sascha Schumann");
CREDIT_LINE("mime_magic", "Hartmut Holzgraefe");
CREDIT_LINE("MING", "Dave Hayden, Frank M. Kromann");
-CREDIT_LINE("mono", "Sterling Hughes");
CREDIT_LINE("MS SQL", "Frank M. Kromann");
CREDIT_LINE("msession", "Mark L. Woodward");
CREDIT_LINE("mSQL", "Zeev Suraski");
@@ -57,7 +56,6 @@
CREDIT_LINE("ODBC", "Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel
R. Kalowsky");
CREDIT_LINE("OpenSSL", "Stig Venaas, Wez Furlong, Sascha Kettler");
CREDIT_LINE("Oracle (OCI) driver for PDO", "Wez Furlong");
-CREDIT_LINE("Oracle", "Stig Bakken, Mitch Golden, Rasmus Lerdorf, Andreas
Karajannis, Thies C. Arntzen");
CREDIT_LINE("Ovrimos", "Nikos Mavroyanopoulos");
CREDIT_LINE("pcntl", "Jason Greene");
CREDIT_LINE("Perl Compatible Regexps", "Andrei Zmievski");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/oracle .cvsignore CREDITS config.m4 config.w32 oracle.c oracle.dsp package.xml php_oracle.h
sniper Wed Aug 31 10:58:29 2005 EDT Removed files: (Branch: PHP_5_1) /php-src/ext/oracle .cvsignore CREDITS config.m4 config.w32 oracle.c oracle.dsp package.xml php_oracle.h Modified files: /php-srcNEWS Log: - Moved ext/oracle to PECL http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.35&r2=1.2027.2.36&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.35 php-src/NEWS:1.2027.2.36 --- php-src/NEWS:1.2027.2.35Wed Aug 31 10:31:43 2005 +++ php-src/NEWSWed Aug 31 10:58:22 2005 @@ -9,6 +9,8 @@ . openssl 0.9.8 . ming 0.3b . libpq (PostgreSQL) 8.0.1 +- Moved extensions to PECL: + . ext/oracle (Jani, Derick) - Fixed a bug where stream_get_meta_data() did not return the "uri" element for files opened with tmpname(). (Derick) - Fixed "make test" to work for phpized extensions. (Hartmut, Jani) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Wed Aug 31 10:56:35 2005 EDT Modified files: /CVSROOTavail Log: new pear accounts http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1012&r2=1.1013&ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1012 CVSROOT/avail:1.1013 --- CVSROOT/avail:1.1012Sun Aug 21 12:37:14 2005 +++ CVSROOT/avail Wed Aug 31 10:56:33 2005 @@ -58,7 +58,7 @@ # The PEAR Team has access to the full PEAR tree, the PEAR portion of # the PHP tree, the PEAR website, and the PEAR documentation. -avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,datenpunk,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,darknoise,tarjei,toby,danielc,ieure,metz,gurugeek,rich_y,asnagy,muesli,hcebay,khassani,zamana,aidan,dufuz,sergiosgc,kouber,enemerson,iridium,ortega,guillaume,koyama,scottmattocks,eric,wenz,goetsch,tacker,aph,bolk,cweiske,amt,jinxidoru,cbleek,nosey,abaker,jayeshsh,fredericpoeydome,sean,toggg,navin,pfischer,davidc,markus,cross,crafics,roychri,kore|pear,peardoc +avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,datenpunk,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,darknoise,tarjei,toby,danielc,ieure,metz,gurugeek,rich_y,asnagy,muesli,hcebay,khassani,zamana,aidan,dufuz,sergiosgc,kouber,enemerson,iridium,ortega,guillaume,koyama,scottmattocks,eric,wenz,goetsch,tacker,aph,bolk,cweiske,amt,jinxidoru,cbleek,nosey,abaker,jayeshsh,fredericpoeydome,sean,toggg,navin,pfischer,davidc,markus,cross,crafics,roychri,kore,troehr,sfrausch,bdunlap,drewish|pear,peardoc # PEAR bits in the main php-src module avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog,pajoye|php-src/pear,pear-core -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oracle .cvsignore CREDITS config.m4 config.w32 oracle.c oracle.dsp package.xml php_oracle.h
sniper Wed Aug 31 10:55:16 2005 EDT Removed files: /php-src/ext/oracle .cvsignore CREDITS config.m4 config.w32 oracle.c oracle.dsp package.xml php_oracle.h Log: Moved to PECL -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /main php_ini.c
sniper Wed Aug 31 10:34:49 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/main php_ini.c Log: Fixed bug #32318 http://cvs.php.net/diff.php/php-src/main/php_ini.c?r1=1.106.2.15&r2=1.106.2.15.2.1&ty=u Index: php-src/main/php_ini.c diff -u php-src/main/php_ini.c:1.106.2.15 php-src/main/php_ini.c:1.106.2.15.2.1 --- php-src/main/php_ini.c:1.106.2.15 Thu Sep 16 22:49:48 2004 +++ php-src/main/php_ini.c Wed Aug 31 10:34:46 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_ini.c,v 1.106.2.15 2004/09/17 02:49:48 iliaa Exp $ */ +/* $Id: php_ini.c,v 1.106.2.15.2.1 2005/08/31 14:34:46 sniper Exp $ */ /* Check CWD for php.ini */ #define INI_CHECK_CWD @@ -31,7 +31,9 @@ #include "SAPI.h" #include "php_main.h" #include "php_scandir.h" +#ifdef PHP_WIN32 #include "win32/php_registry.h" +#endif #if HAVE_SCANDIR && HAVE_ALPHASORT && HAVE_DIRENT_H #include -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/date/lib dow.c /ext/date/tests bug33957.phpt
derick Wed Aug 31 10:31:46 2005 EDT
Modified files:
/php-srcNEWS
/php-src/ext/date/lib dow.c
/php-src/ext/date/tests bug33957.phpt
Log:
- Fixed bug #33957 (gmdate('W')/date('W') sometimes returns wrong week
number).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2050&r2=1.2051&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2050 php-src/NEWS:1.2051
--- php-src/NEWS:1.2050 Tue Aug 30 21:19:40 2005
+++ php-src/NEWSWed Aug 31 10:31:44 2005
@@ -19,3 +19,5 @@
files opened with tmpname(). (Derick)
- Fixed bug #34302 (date('W') do not return leading zeros for week 1 to 9).
(Derick)
+- Fixed bug #33957 (gmdate('W')/date('W') sometimes returns wrong week number).
+ (Derick)
http://cvs.php.net/diff.php/php-src/ext/date/lib/dow.c?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/date/lib/dow.c
diff -u php-src/ext/date/lib/dow.c:1.8 php-src/ext/date/lib/dow.c:1.9
--- php-src/ext/date/lib/dow.c:1.8 Wed Aug 3 10:06:46 2005
+++ php-src/ext/date/lib/dow.c Wed Aug 31 10:31:45 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dow.c,v 1.8 2005/08/03 14:06:46 sniper Exp $ */
+/* $Id: dow.c,v 1.9 2005/08/31 14:31:45 derick Exp $ */
#include "timelib.h"
@@ -91,7 +91,7 @@
int i;
i = y_leap ? 366 : 365;
- if ((i - doy) < (4 - weekday)) {
+ if ((i - (doy - y_leap)) < (4 - weekday)) {
*iy = y + 1;
*iw = 1;
return;
http://cvs.php.net/diff.php/php-src/ext/date/tests/bug33957.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/date/tests/bug33957.phpt
diff -u /dev/null php-src/ext/date/tests/bug33957.phpt:1.2
--- /dev/null Wed Aug 31 10:31:46 2005
+++ php-src/ext/date/tests/bug33957.phptWed Aug 31 10:31:45 2005
@@ -0,0 +1,103 @@
+--TEST--
+Bug #33957 (gmdate('W')/date('W') sometimes returns wrong week number)
+--FILE--
+
+--EXPECT--
+1992-12-14 51
+1992-12-15 51
+1992-12-16 51
+1992-12-17 51
+1992-12-18 51
+1992-12-19 51
+1992-12-20 51
+1992-12-21 52
+1992-12-22 52
+1992-12-23 52
+1992-12-24 52
+1992-12-25 52
+1992-12-26 52
+1992-12-27 52
+1992-12-28 53
+1992-12-29 53
+1992-12-30 53
+1992-12-31 53
+1993-01-1 53
+1993-01-2 53
+1993-01-3 53
+1993-01-4 1
+1993-01-5 1
+1993-01-6 1
+1993-01-7 1
+1993-01-8 1
+
+ 1992 1993 1994 1995 1996 1997 1998
1999 2000 2001 2002 2003 2004 2005 2006 2007
2008 2009 2010 2011 2012 2013 2014 2015 2016
2017 2018 2019
+ (12-14) 51-1992 50-1993 50-1994 50-1995 50-1996 50-1997 51-1998
50-1999 50-2000 50-2001 50-2002 50-2003 51-2004 50-2005 50-2006 50-2007
50-2008 51-2009 50-2010 50-2011 50-2012 50-2013 50-2014 51-2015
50-2016 50-2017 50-2018 50-2019
+ (12-15) 51-1992 50-1993 50-1994 50-1995 50-1996 51-1997 51-1998
50-1999 50-2000 50-2001 50-2002 51-2003 51-2004 50-2005 50-2006 50-2007
51-2008 51-2009 50-2010 50-2011 50-2012 50-2013 51-2014 51-2015
50-2016 50-2017 50-2018 50-2019
+ (12-16) 51-1992 50-1993 50-1994 50-1995 51-1996 51-1997 51-1998
50-1999 50-2000 50-2001 51-2002 51-2003 51-2004 50-2005 50-2006 50-2007
51-2008 51-2009 50-2010 50-2011 50-2012 51-2013 51-2014 51-2015
50-2016 50-2017 50-2018 51-2019
+ (12-17) 51-1992 50-1993 50-1994 50-1995 51-1996 51-1997 51-1998
50-1999 50-2000 51-2001 51-2002 51-2003 51-2004 50-2005 50-2006 51-2007
51-2008 51-2009 50-2010 50-2011 51-2012 51-2013 51-2014 51-2015
50-2016 50-2017 51-2018 51-2019
+ (12-18) 51-1992 50-1993 50-1994 51-1995 51-1996 51-1997 51-1998
50-1999 51-2000 51-2001 51-2002 51-2003 51-2004 50-2005 51-2006 51-2007
51-2008 51-2009 50-2010 50-2011 51-2012 51-2013 51-2014 51-2015
50-2016 51-2017 51-2018 51-2019
+ (12-19) 51-1992 50-1993 51-1994 51-1995 51-1996 51-1997 51-1998
50-1999 51-2000 51-2001 51-2002 51-2003 51-2004 51-2005 51-2006 51-2007
51-2008 51-2009 50-2010 51-2011 51-2012 51-2013 51-2014 51-2015
51-2016 51-2017 51-2018 51-2019
+ (12-20) 51-1992 51-1993 51-1994 51-1995 51-1996 51-1997 51-1998
51-1999 51-2000 51-2001 51-2002 51-2003 52-2004 51-2005 51-2006 51-2007
51-2008 51-2009 51-2010 51-2011 51-2012 51-2013 51-2014 51-2015
51-2016 51-2017 51-2018 51-2019
+ (12-21) 52-1992 51-1993 51-1994 51-1995 51-1996 51-1997 52-1998
51-1999 51-2000 51-2001 51-2002 51-2003 52-2004 51-2005 51-2006 51-2007
51-2008 52-2009 51-2010 51-2011 51-2012 51-2013 51-2014 52-2015
51-2016 51-2017 51-2018 51-2019
+ (12-22) 52-1992 51-1993 51-1994 51-1995 51-1996 52-1997 52-1998
51-1999 51-2000 51-2001 51-2002 52-2003 52-2004 51-2005 51-2006 51-2007
52
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/wddx wddx.c /ext/wddx/tests bug34306.phpt
sniper Wed Aug 31 10:31:44 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/wddx/tests bug34306.phpt
Modified files:
/php-srcNEWS
/php-src/ext/wddx wddx.c
Log:
MFH:- Fixed bug #34306 (wddx_serialize_value() crashes with long array keys)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.34&r2=1.2027.2.35&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.34 php-src/NEWS:1.2027.2.35
--- php-src/NEWS:1.2027.2.34Wed Aug 31 10:29:18 2005
+++ php-src/NEWSWed Aug 31 10:31:43 2005
@@ -14,6 +14,7 @@
- Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
- Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
(Andrey)
+- Fixed bug #34306 (wddx_serialize_value() crashes with long array keys).
(Jani)
- Fixed bug #34302 (date('W') do not return leading zeros for week 1 to 9).
(Derick)
- Fixed bug #34299 (ReflectionClass::isInstantiable() returns true for abstract
http://cvs.php.net/diff.php/php-src/ext/wddx/wddx.c?r1=1.119.2.1&r2=1.119.2.2&ty=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.119.2.1 php-src/ext/wddx/wddx.c:1.119.2.2
--- php-src/ext/wddx/wddx.c:1.119.2.1 Wed Aug 10 18:45:31 2005
+++ php-src/ext/wddx/wddx.c Wed Aug 31 10:31:44 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: wddx.c,v 1.119.2.1 2005/08/10 22:45:31 iliaa Exp $ */
+/* $Id: wddx.c,v 1.119.2.2 2005/08/31 14:31:44 sniper Exp $ */
#include "php.h"
@@ -422,7 +422,7 @@
tmp = *var;
zval_copy_ctor(&tmp);
convert_to_string(&tmp);
- sprintf(tmp_buf, WDDX_NUMBER, Z_STRVAL(tmp));
+ snprintf(tmp_buf, Z_STRLEN(tmp), WDDX_NUMBER, Z_STRVAL(tmp));
zval_dtor(&tmp);
php_wddx_add_chunk(packet, tmp_buf);
@@ -617,15 +617,17 @@
*/
void php_wddx_serialize_var(wddx_packet *packet, zval *var, char *name, int
name_len TSRMLS_DC)
{
- char tmp_buf[WDDX_BUF_LEN];
+ char *tmp_buf;
char *name_esc;
int name_esc_len;
HashTable *ht;
if (name) {
name_esc = php_escape_html_entities(name, name_len,
&name_esc_len, 0, ENT_QUOTES, NULL TSRMLS_CC);
- sprintf(tmp_buf, WDDX_VAR_S, name_esc);
+ tmp_buf = emalloc(name_esc_len + 1);
+ snprintf(tmp_buf, name_esc_len, WDDX_VAR_S, name_esc);
php_wddx_add_chunk(packet, tmp_buf);
+ efree(tmp_buf);
efree(name_esc);
}
http://cvs.php.net/co.php/php-src/ext/wddx/tests/bug34306.phpt?r=1.1&p=1
Index: php-src/ext/wddx/tests/bug34306.phpt
+++ php-src/ext/wddx/tests/bug34306.phpt
--TEST--
#34306 (wddx_serialize_value() crashes with long array keys)
--FILE--
1);
$buf = wddx_serialize_value($var, 'name');
echo "OK\n";
?>
--EXPECT--
OK
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/wddx wddx.c /ext/wddx/tests bug34306.phpt
sniper Wed Aug 31 10:30:47 2005 EDT
Added files:
/php-src/ext/wddx/tests bug34306.phpt
Modified files:
/php-src/ext/wddx wddx.c
Log:
- Fixed bug #34306 (wddx_serialize_value() crashes with long array keys)
http://cvs.php.net/diff.php/php-src/ext/wddx/wddx.c?r1=1.122&r2=1.123&ty=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.122 php-src/ext/wddx/wddx.c:1.123
--- php-src/ext/wddx/wddx.c:1.122 Sun Aug 14 16:24:34 2005
+++ php-src/ext/wddx/wddx.c Wed Aug 31 10:30:46 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: wddx.c,v 1.122 2005/08/14 20:24:34 iliaa Exp $ */
+/* $Id: wddx.c,v 1.123 2005/08/31 14:30:46 sniper Exp $ */
#include "php.h"
@@ -423,7 +423,7 @@
tmp = *var;
zval_copy_ctor(&tmp);
convert_to_string(&tmp);
- sprintf(tmp_buf, WDDX_NUMBER, Z_STRVAL(tmp));
+ snprintf(tmp_buf, Z_STRLEN(tmp), WDDX_NUMBER, Z_STRVAL(tmp));
zval_dtor(&tmp);
php_wddx_add_chunk(packet, tmp_buf);
@@ -618,15 +618,17 @@
*/
void php_wddx_serialize_var(wddx_packet *packet, zval *var, char *name, int
name_len TSRMLS_DC)
{
- char tmp_buf[WDDX_BUF_LEN];
+ char *tmp_buf;
char *name_esc;
int name_esc_len;
HashTable *ht;
if (name) {
name_esc = php_escape_html_entities(name, name_len,
&name_esc_len, 0, ENT_QUOTES, NULL TSRMLS_CC);
- sprintf(tmp_buf, WDDX_VAR_S, name_esc);
+ tmp_buf = emalloc(name_esc_len + 1);
+ snprintf(tmp_buf, name_esc_len, WDDX_VAR_S, name_esc);
php_wddx_add_chunk(packet, tmp_buf);
+ efree(tmp_buf);
efree(name_esc);
}
http://cvs.php.net/co.php/php-src/ext/wddx/tests/bug34306.phpt?r=1.1&p=1
Index: php-src/ext/wddx/tests/bug34306.phpt
+++ php-src/ext/wddx/tests/bug34306.phpt
--TEST--
#34306 (wddx_serialize_value() crashes with long array keys)
--FILE--
1);
$buf = wddx_serialize_value($var, 'name');
echo "OK\n";
?>
--EXPECT--
OK
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/date/lib dow.c /ext/date/tests bug33957.phpt
derick Wed Aug 31 10:29:24 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/date/tests bug33957.phpt
Modified files:
/php-srcNEWS
/php-src/ext/date/lib dow.c
Log:
- Fixed bug #33957 (gmdate('W')/date('W') sometimes returns wrong week
number).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.33&r2=1.2027.2.34&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.33 php-src/NEWS:1.2027.2.34
--- php-src/NEWS:1.2027.2.33Tue Aug 30 18:03:29 2005
+++ php-src/NEWSWed Aug 31 10:29:18 2005
@@ -46,6 +46,8 @@
(Jani)
- Fixed bug #33958 (duplicate cookies and magic_quotes=off may cause a crash).
(Ilia)
+- Fixed bug #33957 (gmdate('W')/date('W') sometimes returns wrong week number).
+ (Derick)
- Fixed bug #33940 (array_map() fails to pass by reference when called
recursively). (Dmitry)
- Fixed bug #33917 (number_format() output with > 1 char separators). (Jani)
http://cvs.php.net/diff.php/php-src/ext/date/lib/dow.c?r1=1.8&r2=1.8.2.1&ty=u
Index: php-src/ext/date/lib/dow.c
diff -u php-src/ext/date/lib/dow.c:1.8 php-src/ext/date/lib/dow.c:1.8.2.1
--- php-src/ext/date/lib/dow.c:1.8 Wed Aug 3 10:06:46 2005
+++ php-src/ext/date/lib/dow.c Wed Aug 31 10:29:23 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dow.c,v 1.8 2005/08/03 14:06:46 sniper Exp $ */
+/* $Id: dow.c,v 1.8.2.1 2005/08/31 14:29:23 derick Exp $ */
#include "timelib.h"
@@ -91,7 +91,7 @@
int i;
i = y_leap ? 366 : 365;
- if ((i - doy) < (4 - weekday)) {
+ if ((i - (doy - y_leap)) < (4 - weekday)) {
*iy = y + 1;
*iw = 1;
return;
http://cvs.php.net/co.php/php-src/ext/date/tests/bug33957.phpt?r=1.1&p=1
Index: php-src/ext/date/tests/bug33957.phpt
+++ php-src/ext/date/tests/bug33957.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / run-tests-config.php server-tests-config.php server-tests.php
Hello Jani,
yep, more reason to rename it to server-tests-config.php so one knows it
belongs to server-tests.php :-)
marcus
Wednesday, August 31, 2005, 9:13:41 AM, you wrote:
> Due the lack of documentation, I had no idea the file was not needed. :-p
> --Jani
> On Wed, 31 Aug 2005, Marcus Boerger wrote:
>> Hello Jani,
>>
>> sorry, i didn't saw that you put the unneeded file into
>> scripts/Makefile.frag.
>>
>> regards
>> marcus
>>
>> Wednesday, August 31, 2005, 8:02:15 AM, you wrote:
>>
>>
>>> Test before commit? (make install fails now..)
>>
>>> --Jani
>>
>>
>>> On Tue, 30 Aug 2005, Marcus Boerger wrote:
>>
helly Tue Aug 30 14:41:44 2005 EDT
Added files:
/php-src server-tests-config.php
Removed files:
/php-src run-tests-config.php
Modified files:
/php-src server-tests.php
Log:
- run-tests2.php was renamed into server-tests.php (missing part)
http://cvs.php.net/diff.php/php-src/server-tests.php?r1=1.3&r2=1.4&ty=u
Index: php-src/server-tests.php
diff -u php-src/server-tests.php:1.3 php-src/server-tests.php:1.4
--- php-src/server-tests.php:1.3 Mon Aug 15 18:30:39 2005
+++ php-src/server-tests.php Tue Aug 30 14:41:42 2005
@@ -420,7 +420,7 @@
public $cwd;
public $xargs = array(
#arg env varvaluedefault
description
- 'c' => array('','file' ,NULL
,'configuration file, see run-tests-config.php for example'),
+ 'c' => array('','file' ,NULL
,'configuration file, see server-tests-config.php for example'),
'd' => array('TEST_PATHS' ,'paths'
,NULL ,'colon seperate path list'),
'e' => array('TEST_PHP_ERROR_STYLE','EMACS|MSVC' ,'EMACS'
,'editor error style'),
'h' => array('','' ,NULL
,'this help'),
http://cvs.php.net/co.php/php-src/server-tests-config.php?r=1.1&p=1
Index: php-src/server-tests-config.php
+++ php-src/server-tests-config.php
>>> /* this file may be duplicated to provide testing for
multiple php binaries or configurations. It is used
with the -c option on server_tests.php. All these
settings will also go into the environment for tests
that are directly executed, so you can also set things
like PHPRC here to force an executable to use a
specific php.ini file. */
$conf = array(
/* path to the php source tree */
'TEST_PHP_SRCDIR' =>NULL,
/* executable that will be tested. Not used for
web based tests */
'TEST_PHP_EXECUTABLE' =>NULL,
/* php.ini to use when executing php */
'PHPRC'=>NULL,
/* log format */
'TEST_PHP_LOG_FORMAT' =>'LEODC',
/* debugging detail in output. */
'TEST_PHP_DETAILED'=>0,
/* error style for editors or IDE's */
'TEST_PHP_ERROR_STYLE' =>'EMACS',
'REPORT_EXIT_STATUS' =>0,
'NO_PHPTEST_SUMMARY' =>0,
/* don't ask, and don't send results to QA if true */
'NO_INTERACTION' =>true,
/* base url prefixed to any requests */
'TEST_WEB_BASE_URL'=>NULL,
/* if set, copy phpt files into this directory,
which should be accessable via an http server. The
TEST_WEB_BASE_URL setting should be the base url
to access this path. If this is not used,
TEST_WEB_BASE_URL should be the base url pointing
to TEST_PHP_SRCDIR, which should then be accessable via
an http server.
An example would be:
TEST_WEB_BASE_URL=http://localhost/test
TEST_BASE_PATH=/path/to/htdocs/test
*/
'TEST_BASE_PATH' =>NULL,
/* file extension of pages requested via http
this allows for php to be configured to parse
extensions other than php, usefull for multiple
configurations under a single webserver */
'TEST_WEB_EXT' =>'php',
/* if true doesn't run tests, just outputs executable info */
'TEST_CONTEXT_INFO'=>false,
/* : or ; seperated list of paths */
'TEST_PATHS' =>NULL
/* additional configuration items that may be set
to provide proxy support for testes:
timeout
proxy_host
proxy_port
proxy_user
proxy_pass
*/
);
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / run-tests-config.php server-tests-config.php server-tests.php
Due the lack of documentation, I had no idea the file was not needed. :-p
--Jani
On Wed, 31 Aug 2005, Marcus Boerger wrote:
Hello Jani,
sorry, i didn't saw that you put the unneeded file into
scripts/Makefile.frag.
regards
marcus
Wednesday, August 31, 2005, 8:02:15 AM, you wrote:
Test before commit? (make install fails now..)
--Jani
On Tue, 30 Aug 2005, Marcus Boerger wrote:
helly Tue Aug 30 14:41:44 2005 EDT
Added files:
/php-src server-tests-config.php
Removed files:
/php-src run-tests-config.php
Modified files:
/php-src server-tests.php
Log:
- run-tests2.php was renamed into server-tests.php (missing part)
http://cvs.php.net/diff.php/php-src/server-tests.php?r1=1.3&r2=1.4&ty=u
Index: php-src/server-tests.php
diff -u php-src/server-tests.php:1.3 php-src/server-tests.php:1.4
--- php-src/server-tests.php:1.3 Mon Aug 15 18:30:39 2005
+++ php-src/server-tests.php Tue Aug 30 14:41:42 2005
@@ -420,7 +420,7 @@
public $cwd;
public $xargs = array(
#arg env varvaluedefault
description
- 'c' => array('','file' ,NULL
,'configuration file, see run-tests-config.php for example'),
+ 'c' => array('','file' ,NULL
,'configuration file, see server-tests-config.php for example'),
'd' => array('TEST_PATHS' ,'paths' ,NULL ,'colon
seperate path list'),
'e' => array('TEST_PHP_ERROR_STYLE','EMACS|MSVC' ,'EMACS'
,'editor error style'),
'h' => array('','' ,NULL ,'this
help'),
http://cvs.php.net/co.php/php-src/server-tests-config.php?r=1.1&p=1
Index: php-src/server-tests-config.php
+++ php-src/server-tests-config.php
NULL,
/* executable that will be tested. Not used for
web based tests */
'TEST_PHP_EXECUTABLE' =>NULL,
/* php.ini to use when executing php */
'PHPRC'=>NULL,
/* log format */
'TEST_PHP_LOG_FORMAT' =>'LEODC',
/* debugging detail in output. */
'TEST_PHP_DETAILED'=>0,
/* error style for editors or IDE's */
'TEST_PHP_ERROR_STYLE' =>'EMACS',
'REPORT_EXIT_STATUS' =>0,
'NO_PHPTEST_SUMMARY' =>0,
/* don't ask, and don't send results to QA if true */
'NO_INTERACTION' =>true,
/* base url prefixed to any requests */
'TEST_WEB_BASE_URL'=>NULL,
/* if set, copy phpt files into this directory,
which should be accessable via an http server. The
TEST_WEB_BASE_URL setting should be the base url
to access this path. If this is not used,
TEST_WEB_BASE_URL should be the base url pointing
to TEST_PHP_SRCDIR, which should then be accessable via
an http server.
An example would be:
TEST_WEB_BASE_URL=http://localhost/test
TEST_BASE_PATH=/path/to/htdocs/test
*/
'TEST_BASE_PATH' =>NULL,
/* file extension of pages requested via http
this allows for php to be configured to parse
extensions other than php, usefull for multiple
configurations under a single webserver */
'TEST_WEB_EXT' =>'php',
/* if true doesn't run tests, just outputs executable info */
'TEST_CONTEXT_INFO'=>false,
/* : or ; seperated list of paths */
'TEST_PATHS' =>NULL
/* additional configuration items that may be set
to provide proxy support for testes:
timeout
proxy_host
proxy_port
proxy_user
proxy_pass
*/
);
?>
Best regards,
Marcus
--
Donate @ http://pecl.php.net/wishlist.php/sniper
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / run-tests-config.php server-tests-config.php server-tests.php
Hello Jani,
sorry, i didn't saw that you put the unneeded file into
scripts/Makefile.frag.
regards
marcus
Wednesday, August 31, 2005, 8:02:15 AM, you wrote:
> Test before commit? (make install fails now..)
> --Jani
> On Tue, 30 Aug 2005, Marcus Boerger wrote:
>> helly Tue Aug 30 14:41:44 2005 EDT
>>
>> Added files:
>>/php-src server-tests-config.php
>>
>> Removed files:
>>/php-src run-tests-config.php
>>
>> Modified files:
>>/php-src server-tests.php
>> Log:
>> - run-tests2.php was renamed into server-tests.php (missing part)
>>
>>
>> http://cvs.php.net/diff.php/php-src/server-tests.php?r1=1.3&r2=1.4&ty=u
>> Index: php-src/server-tests.php
>> diff -u php-src/server-tests.php:1.3 php-src/server-tests.php:1.4
>> --- php-src/server-tests.php:1.3 Mon Aug 15 18:30:39 2005
>> +++ php-src/server-tests.php Tue Aug 30 14:41:42 2005
>> @@ -420,7 +420,7 @@
>> public $cwd;
>> public $xargs = array(
>> #arg env varvaluedefault
>> description
>> - 'c' => array('','file' ,NULL
>> ,'configuration file, see run-tests-config.php for example'),
>> + 'c' => array('','file' ,NULL
>> ,'configuration file, see server-tests-config.php for example'),
>> 'd' => array('TEST_PATHS' ,'paths' ,NULL
>> ,'colon seperate path list'),
>> 'e' => array('TEST_PHP_ERROR_STYLE','EMACS|MSVC' ,'EMACS'
>> ,'editor error style'),
>> 'h' => array('','' ,NULL ,'this
>> help'),
>>
>> http://cvs.php.net/co.php/php-src/server-tests-config.php?r=1.1&p=1
>> Index: php-src/server-tests-config.php
>> +++ php-src/server-tests-config.php
>> > /* this file may be duplicated to provide testing for
>> multiple php binaries or configurations. It is used
>> with the -c option on server_tests.php. All these
>> settings will also go into the environment for tests
>> that are directly executed, so you can also set things
>> like PHPRC here to force an executable to use a
>> specific php.ini file. */
>>
>> $conf = array(
>> /* path to the php source tree */
>> 'TEST_PHP_SRCDIR' =>NULL,
>>
>> /* executable that will be tested. Not used for
>> web based tests */
>> 'TEST_PHP_EXECUTABLE' =>NULL,
>>
>> /* php.ini to use when executing php */
>> 'PHPRC'=>NULL,
>>
>> /* log format */
>> 'TEST_PHP_LOG_FORMAT' =>'LEODC',
>>
>> /* debugging detail in output. */
>> 'TEST_PHP_DETAILED'=>0,
>>
>> /* error style for editors or IDE's */
>> 'TEST_PHP_ERROR_STYLE' =>'EMACS',
>>
>> 'REPORT_EXIT_STATUS' =>0,
>> 'NO_PHPTEST_SUMMARY' =>0,
>>
>> /* don't ask, and don't send results to QA if true */
>> 'NO_INTERACTION' =>true,
>>
>> /* base url prefixed to any requests */
>> 'TEST_WEB_BASE_URL'=>NULL,
>>
>> /* if set, copy phpt files into this directory,
>> which should be accessable via an http server. The
>> TEST_WEB_BASE_URL setting should be the base url
>> to access this path. If this is not used,
>> TEST_WEB_BASE_URL should be the base url pointing
>> to TEST_PHP_SRCDIR, which should then be accessable via
>> an http server.
>>
>> An example would be:
>> TEST_WEB_BASE_URL=http://localhost/test
>> TEST_BASE_PATH=/path/to/htdocs/test
>> */
>> 'TEST_BASE_PATH' =>NULL,
>>
>> /* file extension of pages requested via http
>> this allows for php to be configured to parse
>> extensions other than php, usefull for multiple
>> configurations under a single webserver */
>> 'TEST_WEB_EXT' =>'php',
>>
>> /* if true doesn't run tests, just outputs executable info */
>> 'TEST_CONTEXT_INFO'=>false,
>>
>> /* : or ; seperated list of paths */
>> 'TEST_PATHS' =>NULL
>> /* additional configuration items that may be set
>> to provide proxy support for testes:
>> timeout
>> proxy_host
>> proxy_port
>> proxy_user
>> proxy_pass
>> */
>> );
>>
>> ?>
>>
>>
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_1) /scripts Makefile.frag
helly Wed Aug 31 03:00:22 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/scriptsMakefile.frag Log: - MFH run-tests-config.php was never used and now renamed http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.24&r2=1.24.2.1&ty=u Index: php-src/scripts/Makefile.frag diff -u php-src/scripts/Makefile.frag:1.24 php-src/scripts/Makefile.frag:1.24.2.1 --- php-src/scripts/Makefile.frag:1.24 Mon Aug 8 12:06:48 2005 +++ php-src/scripts/Makefile.frag Wed Aug 31 03:00:22 2005 @@ -14,8 +14,7 @@ Makefile.global \ acinclude.m4 \ ltmain.sh \ - run-tests.php \ - run-tests-config.php + run-tests.php BUILD_FILES_EXEC = \ build/shtool \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
