[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/mysqli mysqli_api.c /ext/mysqli/tests bug35517.phpt
georg Thu Dec 29 09:49:20 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/mysqli/tests bug35517.phpt
Modified files:
/php-srcNEWS
/php-src/ext/mysqli mysqli_api.c
Log:
Fix for bug #35517:
added missing unsigned flag for result buffer
fixed returncode in mysql_stmt_fetch for data truncation
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.330r2=1.2027.2.331diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.330 php-src/NEWS:1.2027.2.331
--- php-src/NEWS:1.2027.2.330 Wed Dec 28 20:55:13 2005
+++ php-src/NEWSThu Dec 29 09:49:19 2005
@@ -14,6 +14,7 @@
- Fixed bug #35781 (stream_filter_append() can cause segfault). (Tony)
- Fixed bug #35759 (mysqli_stmt_bind_result() makes huge allocation when
column empty). (Andrey)
+- Fixed bug #35517 (mysql_stmt_fetch returns NULL on data truncation). (Georg)
- Fixed bug #29955 (mb_strtoupper() / lower() broken with Turkish encoding).
(Rui)
- Fixed bug #28899 (mb_substr() and substr() behave differently when
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.13r2=1.118.2.14diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.13
php-src/ext/mysqli/mysqli_api.c:1.118.2.14
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.13 Fri Dec 23 22:22:41 2005
+++ php-src/ext/mysqli/mysqli_api.c Thu Dec 29 09:49:19 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.118.2.13 2005/12/23 22:22:41 andrey Exp $
+ $Id: mysqli_api.c,v 1.118.2.14 2005/12/29 09:49:19 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -299,6 +299,7 @@
bind[ofs].buffer_type = MYSQL_TYPE_LONG;
bind[ofs].buffer = stmt-result.buf[ofs].val;
bind[ofs].is_null = stmt-result.is_null[ofs];
+ bind[ofs].is_unsigned =
(stmt-stmt-fields[ofs].flags UNSIGNED_FLAG) ? 1 : 0;
break;
case MYSQL_TYPE_LONGLONG:
@@ -309,6 +310,7 @@
bind[ofs].buffer = stmt-result.buf[ofs].val;
bind[ofs].is_null = stmt-result.is_null[ofs];
bind[ofs].buffer_length =
stmt-result.buf[ofs].buflen;
+ bind[ofs].is_unsigned =
(stmt-stmt-fields[ofs].flags UNSIGNED_FLAG) ? 1 : 0;
break;
case MYSQL_TYPE_DATE:
@@ -721,6 +723,13 @@
switch (ret) {
case 0:
+#ifdef MYSQL_DATA_TRUNCATED
+ /* according to SQL standard truncation (e.g. loss of precision
is
+ not an error) - for detecting possible truncation you have
to
+ check mysqli_stmt_warning
+ */
+ case MYSQL_DATA_TRUNCATED:
+#endif
RETURN_TRUE;
break;
case 1:
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/tests/bug35517.phpt?view=markuprev=1.1
Index: php-src/ext/mysqli/tests/bug35517.phpt
+++ php-src/ext/mysqli/tests/bug35517.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_1) / NEWS /ext/date php_date.c
derick Thu Dec 29 10:54:07 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/date php_date.c
Log:
- Fixed bug #35751 (using date with a timestamp makes httpd segfault).
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.331r2=1.2027.2.332diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.331 php-src/NEWS:1.2027.2.332
--- php-src/NEWS:1.2027.2.331 Thu Dec 29 09:49:19 2005
+++ php-src/NEWSThu Dec 29 10:54:07 2005
@@ -14,6 +14,7 @@
- Fixed bug #35781 (stream_filter_append() can cause segfault). (Tony)
- Fixed bug #35759 (mysqli_stmt_bind_result() makes huge allocation when
column empty). (Andrey)
+- Fixed bug #35751 (using date with a timestamp makes httpd segfault). (Derick)
- Fixed bug #35517 (mysql_stmt_fetch returns NULL on data truncation). (Georg)
- Fixed bug #29955 (mb_strtoupper() / lower() broken with Turkish encoding).
(Rui)
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.c?r1=1.43.2.34r2=1.43.2.35diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.34
php-src/ext/date/php_date.c:1.43.2.35
--- php-src/ext/date/php_date.c:1.43.2.34 Tue Dec 20 19:58:44 2005
+++ php-src/ext/date/php_date.c Thu Dec 29 10:54:07 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.34 2005/12/20 19:58:44 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.35 2005/12/29 10:54:07 derick Exp $ */
#include php.h
#include php_streams.h
@@ -561,7 +561,7 @@
{
char *format;
int format_len;
- time_t ts;
+ longts;
char *string;
if (ZEND_NUM_ARGS() == 1) {
@@ -721,7 +721,7 @@
{
char *format;
int format_len;
- time_t ts;
+ longts;
int ret;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|l, format,
format_len, ts) == FAILURE) {
--
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 Thu Dec 29 10:56:17 2005 EDT
Modified files:
/php-src/ext/date php_date.c
Log:
- MFH: Fixed bug #35751 (using date with a timestamp makes httpd segfault).
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.c?r1=1.79r2=1.80diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.79 php-src/ext/date/php_date.c:1.80
--- php-src/ext/date/php_date.c:1.79Tue Dec 20 19:59:47 2005
+++ php-src/ext/date/php_date.c Thu Dec 29 10:56:17 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.79 2005/12/20 19:59:47 derick Exp $ */
+/* $Id: php_date.c,v 1.80 2005/12/29 10:56:17 derick Exp $ */
#include php.h
#include php_streams.h
@@ -674,7 +674,7 @@
{
char *format;
int format_len;
- time_t ts;
+ longts;
char *string;
if (ZEND_NUM_ARGS() == 1) {
@@ -839,7 +839,7 @@
{
char *format;
int format_len;
- time_t ts;
+ longts;
int ret;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|l, format,
format_len, ts) == FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi config9.m4
tony2001Thu Dec 29 14:12:34 2005 EDT Modified files: /php-src/sapi/cgi config9.m4 Log: fix CGI build (patch by Pierangelo Masarati) http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/config9.m4?r1=1.19r2=1.20diff_format=u Index: php-src/sapi/cgi/config9.m4 diff -u php-src/sapi/cgi/config9.m4:1.19 php-src/sapi/cgi/config9.m4:1.20 --- php-src/sapi/cgi/config9.m4:1.19Sun Dec 25 12:45:01 2005 +++ php-src/sapi/cgi/config9.m4 Thu Dec 29 14:12:34 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config9.m4,v 1.19 2005/12/25 12:45:01 zeev Exp $ +dnl $Id: config9.m4,v 1.20 2005/12/29 14:12:34 tony2001 Exp $ dnl AC_ARG_ENABLE(cgi, @@ -85,7 +85,7 @@ PHP_TEST_WRITE_STDOUT INSTALL_IT=@echo \Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT) -PHP_SELECT_SAPI(cgi, program, fastcgi.c cgi_main.c getopt.c, '', '$(SAPI_CGI_PATH)') +PHP_SELECT_SAPI(cgi, program, fastcgi.c cgi_main.c getopt.c, , '$(SAPI_CGI_PATH)') case $host_alias in *aix*) -- 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/gd gd.c
iliaa Thu Dec 29 21:59:39 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/gd gd.c
Log:
Not a fatal error.
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.c?r1=1.312.2.10r2=1.312.2.11diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.10 php-src/ext/gd/gd.c:1.312.2.11
--- php-src/ext/gd/gd.c:1.312.2.10 Sun Dec 25 20:33:05 2005
+++ php-src/ext/gd/gd.c Thu Dec 29 21:59:39 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.312.2.10 2005/12/25 20:33:05 pajoye Exp $ */
+/* $Id: gd.c,v 1.312.2.11 2005/12/29 21:59:39 iliaa Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -3402,7 +3402,7 @@
T1_DeleteAllSizes(*f_ind);
if (Z_DVAL_PP(ext) = 0) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Second parameter %f
out of range (must be 0), Z_DVAL_PP(ext));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Second parameter
%f out of range (must be 0), Z_DVAL_PP(ext));
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd gd.c
iliaa Thu Dec 29 22:00:09 2005 EDT
Modified files:
/php-src/ext/gd gd.c
Log:
MFB51: Not a fatal error.
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.c?r1=1.336r2=1.337diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.336 php-src/ext/gd/gd.c:1.337
--- php-src/ext/gd/gd.c:1.336 Tue Dec 27 00:16:05 2005
+++ php-src/ext/gd/gd.c Thu Dec 29 22:00:09 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.336 2005/12/27 00:16:05 pajoye Exp $ */
+/* $Id: gd.c,v 1.337 2005/12/29 22:00:09 iliaa Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -3165,7 +3165,7 @@
T1_DeleteAllSizes(*f_ind);
if (Z_DVAL_PP(ext) = 0) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Second parameter %f
out of range (must be 0), Z_DVAL_PP(ext));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Second parameter
%f out of range (must be 0), Z_DVAL_PP(ext));
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c
hirokawaThu Dec 29 23:52:59 2005 EDT
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
added Turkish language definition (related to bug #29955)
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.233r2=1.234diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.233
php-src/ext/mbstring/mbstring.c:1.234
--- php-src/ext/mbstring/mbstring.c:1.233 Sun Dec 25 15:21:54 2005
+++ php-src/ext/mbstring/mbstring.c Thu Dec 29 23:52:59 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.233 2005/12/25 15:21:54 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.234 2005/12/29 23:52:59 hirokawa Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -134,6 +134,12 @@
mbfl_no_encoding_armscii8
};
+static const enum mbfl_no_encoding php_mb_default_identify_list_tr[] = {
+ mbfl_no_encoding_ascii,
+ mbfl_no_encoding_utf8,
+ mbfl_no_encoding_8859_9
+};
+
static const enum mbfl_no_encoding php_mb_default_identify_list_neut[] = {
mbfl_no_encoding_ascii,
mbfl_no_encoding_utf8
@@ -147,6 +153,7 @@
{ mbfl_no_language_simplified_chinese, php_mb_default_identify_list_cn,
sizeof(php_mb_default_identify_list_cn) /
sizeof(php_mb_default_identify_list_cn[0]) },
{ mbfl_no_language_russian, php_mb_default_identify_list_ru,
sizeof(php_mb_default_identify_list_ru) /
sizeof(php_mb_default_identify_list_ru[0]) },
{ mbfl_no_language_armenian, php_mb_default_identify_list_hy,
sizeof(php_mb_default_identify_list_hy) /
sizeof(php_mb_default_identify_list_hy[0]) },
+ { mbfl_no_language_turkish, php_mb_default_identify_list_tr,
sizeof(php_mb_default_identify_list_tr) /
sizeof(php_mb_default_identify_list_tr[0]) },
{ mbfl_no_language_neutral, php_mb_default_identify_list_neut,
sizeof(php_mb_default_identify_list_neut) /
sizeof(php_mb_default_identify_list_neut[0]) }
};
@@ -891,6 +898,9 @@
case mbfl_no_language_armenian:
default_enc = ArmSCII-8;
break;
+ case mbfl_no_language_turkish:
+ default_enc = ISO-8859-9;
+ break;
case mbfl_no_language_english:
default:
default_enc = ISO-8859-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_1) /ext/mbstring mbstring.c
hirokawaFri Dec 30 00:49:24 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/mbstring mbstring.c
Log:
MFH:added Turkish language definition (related to bug #29955)
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.10r2=1.224.2.11diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.10
php-src/ext/mbstring/mbstring.c:1.224.2.11
--- php-src/ext/mbstring/mbstring.c:1.224.2.10 Sun Dec 25 15:23:55 2005
+++ php-src/ext/mbstring/mbstring.c Fri Dec 30 00:49:24 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.224.2.10 2005/12/25 15:23:55 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.224.2.11 2005/12/30 00:49:24 hirokawa Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -135,6 +135,12 @@
mbfl_no_encoding_armscii8
};
+static const enum mbfl_no_encoding php_mb_default_identify_list_tr[] = {
+ mbfl_no_encoding_ascii,
+ mbfl_no_encoding_utf8,
+ mbfl_no_encoding_8859_9
+};
+
static const enum mbfl_no_encoding php_mb_default_identify_list_neut[] = {
mbfl_no_encoding_ascii,
mbfl_no_encoding_utf8
@@ -148,6 +154,7 @@
{ mbfl_no_language_simplified_chinese, php_mb_default_identify_list_cn,
sizeof(php_mb_default_identify_list_cn) /
sizeof(php_mb_default_identify_list_cn[0]) },
{ mbfl_no_language_russian, php_mb_default_identify_list_ru,
sizeof(php_mb_default_identify_list_ru) /
sizeof(php_mb_default_identify_list_ru[0]) },
{ mbfl_no_language_armenian, php_mb_default_identify_list_hy,
sizeof(php_mb_default_identify_list_hy) /
sizeof(php_mb_default_identify_list_hy[0]) },
+ { mbfl_no_language_turkish, php_mb_default_identify_list_tr,
sizeof(php_mb_default_identify_list_tr) /
sizeof(php_mb_default_identify_list_tr[0]) },
{ mbfl_no_language_neutral, php_mb_default_identify_list_neut,
sizeof(php_mb_default_identify_list_neut) /
sizeof(php_mb_default_identify_list_neut[0]) }
};
@@ -892,6 +899,9 @@
case mbfl_no_language_armenian:
default_enc = ArmSCII-8;
break;
+ case mbfl_no_language_turkish:
+ default_enc = ISO-8859-9;
+ break;
case mbfl_no_language_english:
default:
default_enc = ISO-8859-1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gd.c
pajoye Fri Dec 30 01:19:33 2005 EDT
Modified files:
/php-src/ext/gd/libgd gd.c
Log:
- add some basic optimisations, usefull when you draw many horizontal or
vertical lines like in charts
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/libgd/gd.c?r1=1.91r2=1.92diff_format=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.91 php-src/ext/gd/libgd/gd.c:1.92
--- php-src/ext/gd/libgd/gd.c:1.91 Fri Sep 30 20:58:41 2005
+++ php-src/ext/gd/libgd/gd.c Fri Dec 30 01:19:32 2005
@@ -1029,6 +1029,22 @@
return;
}
+ /* Vertical */
+ if (x1==x2) {
+ for (;y1 = y2; y1++) {
+ gdImageSetPixel(im, x1,y1, color);
+ }
+ return;
+ }
+
+ /* Horizontal */
+ if (y1==y2) {
+ for (;x1 = x2; x1++) {
+ gdImageSetPixel(im, x1,y1, color);
+ }
+ return;
+ }
+
/* gdAntiAliased passed as color: set anti-aliased line (AAL) global
vars. */
if (color == gdAntiAliased) {
im-AAL_x1 = x1;
--
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/mbstring config.m4 mbstring.c /ext/mbstring/libmbfl libmbfl.dsp mbfl.rc /ext/mbstring/libmbfl/filters Makefile.am Makefile.bcc32 mbfilter_armscii8.c mbfilter_arm
hirokawaFri Dec 30 05:25:54 2005 EDT
Added files: (Branch: PHP_4_4)
/php-src/ext/mbstring/libmbfl/filters mbfilter_armscii8.c
mbfilter_armscii8.h
unicode_table_armscii8.h
/php-src/ext/mbstring/libmbfl/nls nls_hy.c nls_hy.h nls_tr.c
nls_tr.h
Modified files:
/php-src/ext/mbstring config.m4 mbstring.c
/php-src/ext/mbstring/libmbfl libmbfl.dsp mbfl.rc
/php-src/ext/mbstring/libmbfl/filters Makefile.am Makefile.bcc32
mk_sb_tbl.awk
/php-src/ext/mbstring/libmbfl/mbfl .cvsignore mbfilter.c mbfilter.h
mbfl_consts.h mbfl_convert.c
mbfl_encoding.c mbfl_encoding.h
mbfl_ident.c mbfl_language.c
mbfl_language.h mk_eaw_tbl.awk
/php-src/ext/mbstring/libmbfl/nls Makefile.am Makefile.bcc32
Log:
MFH: update libmbfl for the newest version.
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/config.m4?r1=1.28.2.12r2=1.28.2.12.2.1diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.28.2.12
php-src/ext/mbstring/config.m4:1.28.2.12.2.1
--- php-src/ext/mbstring/config.m4:1.28.2.12Mon Feb 21 07:10:13 2005
+++ php-src/ext/mbstring/config.m4 Fri Dec 30 05:25:54 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.28.2.12 2005/02/21 07:10:13 moriyoshi Exp $
+dnl $Id: config.m4,v 1.28.2.12.2.1 2005/12/30 05:25:54 hirokawa Exp $
dnl
AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -118,6 +118,7 @@
libmbfl/filters/mbfilter_jis.c
libmbfl/filters/mbfilter_koi8r.c
libmbfl/filters/mbfilter_qprint.c
+ libmbfl/filters/mbfilter_armscii8.c
libmbfl/filters/mbfilter_sjis.c
libmbfl/filters/mbfilter_ucs2.c
libmbfl/filters/mbfilter_ucs4.c
@@ -148,6 +149,8 @@
libmbfl/nls/nls_ru.c
libmbfl/nls/nls_uni.c
libmbfl/nls/nls_zh.c
+ libmbfl/nls/nls_hy.c
+ libmbfl/nls/nls_tr.c
])
PHP_MBSTRING_ADD_CFLAG([-DHAVE_CONFIG_H])
else
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.142.2.47.2.6r2=1.142.2.47.2.7diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.47.2.6
php-src/ext/mbstring/mbstring.c:1.142.2.47.2.7
--- php-src/ext/mbstring/mbstring.c:1.142.2.47.2.6 Thu Dec 15 03:37:22 2005
+++ php-src/ext/mbstring/mbstring.c Fri Dec 30 05:25:54 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.47.2.6 2005/12/15 03:37:22 iliaa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.47.2.7 2005/12/30 05:25:54 hirokawa Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -1555,7 +1555,7 @@
from_encoding = mbfl_no_encoding_invalid;
identd = mbfl_encoding_detector_new(
(enum mbfl_no_encoding *)info-from_encodings,
- info-num_from_encodings);
+ info-num_from_encodings, 0);
if (identd) {
n = 0;
while (n num) {
@@ -1902,7 +1902,7 @@
} else {
/* auto detect */
from_encoding = mbfl_no_encoding_invalid;
- identd = mbfl_encoding_detector_new(elist, elistsz);
+ identd = mbfl_encoding_detector_new(elist, elistsz, 0);
if (identd != NULL) {
n = 0;
while (n num) {
@@ -2404,6 +2404,11 @@
}
}
+ if (((MBSTRG(func_overload) MB_OVERLOAD_STRING) == MB_OVERLOAD_STRING)
+(from = mbfl_strlen(string))) {
+ RETURN_FALSE;
+ }
+
ret = mbfl_substr(string, result, from, len);
if (ret != NULL) {
RETVAL_STRINGL((char *)ret-val, ret-len, 0); /* the
string is already strdup()'ed */
@@ -2663,7 +2668,7 @@
string.no_encoding = from_encoding;
} else if (size 1) {
/* auto detect */
- from_encoding = mbfl_identify_encoding_no(string,
list, size);
+ from_encoding = mbfl_identify_encoding_no(string,
list, size, 0);
if (from_encoding != mbfl_no_encoding_invalid) {
string.no_encoding = from_encoding;
} else {
@@ -3209,7 +3214,7 @@
stack = (pval ***)safe_emalloc(stack_max, sizeof(pval **), 0);
if (stack != NULL) {
stack_level = 0;
- identd = mbfl_encoding_detector_new(elist, elistsz);
+
[PHP-CVS] cvs: php-src /main SAPI.c
sniper Fri Dec 30 05:39:38 2005 EDT Modified files: /php-src/main SAPI.c Log: fix typo http://cvs.php.net/viewcvs.cgi/php-src/main/SAPI.c?r1=1.208r2=1.209diff_format=u Index: php-src/main/SAPI.c diff -u php-src/main/SAPI.c:1.208 php-src/main/SAPI.c:1.209 --- php-src/main/SAPI.c:1.208 Tue Dec 6 03:39:26 2005 +++ php-src/main/SAPI.c Fri Dec 30 05:39:38 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: SAPI.c,v 1.208 2005/12/06 03:39:26 iliaa Exp $ */ +/* $Id: SAPI.c,v 1.209 2005/12/30 05:39:38 sniper Exp $ */ #include ctype.h #include sys/stat.h @@ -597,7 +597,7 @@ continue; } efree(header_line); - sapi_module.sapi_error(E_WARNING, Header may not contain more then a single header, new line detected.); + sapi_module.sapi_error(E_WARNING, Header may not contain more than a single header, new line detected.); return FAILURE; } } -- 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) /main SAPI.c
sniper Fri Dec 30 05:40:43 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/main SAPI.c Log: MFH: typofix http://cvs.php.net/viewcvs.cgi/php-src/main/SAPI.c?r1=1.202.2.5r2=1.202.2.6diff_format=u Index: php-src/main/SAPI.c diff -u php-src/main/SAPI.c:1.202.2.5 php-src/main/SAPI.c:1.202.2.6 --- php-src/main/SAPI.c:1.202.2.5 Tue Dec 6 03:39:45 2005 +++ php-src/main/SAPI.c Fri Dec 30 05:40:43 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: SAPI.c,v 1.202.2.5 2005/12/06 03:39:45 iliaa Exp $ */ +/* $Id: SAPI.c,v 1.202.2.6 2005/12/30 05:40:43 sniper Exp $ */ #include ctype.h #include sys/stat.h @@ -575,7 +575,7 @@ continue; } efree(header_line); - sapi_module.sapi_error(E_WARNING, Header may not contain more then a single header, new line detected.); + sapi_module.sapi_error(E_WARNING, Header may not contain more than a single header, new line detected.); return FAILURE; } } -- 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 SAPI.c
sniper Fri Dec 30 05:41:18 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/main SAPI.c Log: MFH: typofix http://cvs.php.net/viewcvs.cgi/php-src/main/SAPI.c?r1=1.155.2.24.2.3r2=1.155.2.24.2.4diff_format=u Index: php-src/main/SAPI.c diff -u php-src/main/SAPI.c:1.155.2.24.2.3 php-src/main/SAPI.c:1.155.2.24.2.4 --- php-src/main/SAPI.c:1.155.2.24.2.3 Tue Dec 6 03:40:09 2005 +++ php-src/main/SAPI.c Fri Dec 30 05:41:18 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: SAPI.c,v 1.155.2.24.2.3 2005/12/06 03:40:09 iliaa Exp $ */ +/* $Id: SAPI.c,v 1.155.2.24.2.4 2005/12/30 05:41:18 sniper Exp $ */ #include ctype.h #include sys/stat.h @@ -555,7 +555,7 @@ continue; } efree(header_line); - sapi_module.sapi_error(E_WARNING, Header may not contain more then a single header, new line detected.); + sapi_module.sapi_error(E_WARNING, Header may not contain more than a single header, new line detected.); return FAILURE; } } -- 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_1) / NEWS /ext/mysqli mysqli_api.c /ext/mysqli/tests bug35517.phpt
You didn't commit this to HEAD? Is the fix already there or what?
--Jani
On Thu, 29 Dec 2005, Georg Richter wrote:
georg Thu Dec 29 09:49:20 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/mysqli/testsbug35517.phpt
Modified files:
/php-src NEWS
/php-src/ext/mysqli mysqli_api.c
Log:
Fix for bug #35517:
added missing unsigned flag for result buffer
fixed returncode in mysql_stmt_fetch for data truncation
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.330r2=1.2027.2.331diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.330 php-src/NEWS:1.2027.2.331
--- php-src/NEWS:1.2027.2.330 Wed Dec 28 20:55:13 2005
+++ php-src/NEWSThu Dec 29 09:49:19 2005
@@ -14,6 +14,7 @@
- Fixed bug #35781 (stream_filter_append() can cause segfault). (Tony)
- Fixed bug #35759 (mysqli_stmt_bind_result() makes huge allocation when
column empty). (Andrey)
+- Fixed bug #35517 (mysql_stmt_fetch returns NULL on data truncation). (Georg)
- Fixed bug #29955 (mb_strtoupper() / lower() broken with Turkish encoding).
(Rui)
- Fixed bug #28899 (mb_substr() and substr() behave differently when
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.13r2=1.118.2.14diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.13
php-src/ext/mysqli/mysqli_api.c:1.118.2.14
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.13 Fri Dec 23 22:22:41 2005
+++ php-src/ext/mysqli/mysqli_api.c Thu Dec 29 09:49:19 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.118.2.13 2005/12/23 22:22:41 andrey Exp $
+ $Id: mysqli_api.c,v 1.118.2.14 2005/12/29 09:49:19 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -299,6 +299,7 @@
bind[ofs].buffer_type = MYSQL_TYPE_LONG;
bind[ofs].buffer = stmt-result.buf[ofs].val;
bind[ofs].is_null = stmt-result.is_null[ofs];
+ bind[ofs].is_unsigned =
(stmt-stmt-fields[ofs].flags UNSIGNED_FLAG) ? 1 : 0;
break;
case MYSQL_TYPE_LONGLONG:
@@ -309,6 +310,7 @@
bind[ofs].buffer = stmt-result.buf[ofs].val;
bind[ofs].is_null = stmt-result.is_null[ofs];
bind[ofs].buffer_length =
stmt-result.buf[ofs].buflen;
+ bind[ofs].is_unsigned =
(stmt-stmt-fields[ofs].flags UNSIGNED_FLAG) ? 1 : 0;
break;
case MYSQL_TYPE_DATE:
@@ -721,6 +723,13 @@
switch (ret) {
case 0:
+#ifdef MYSQL_DATA_TRUNCATED
+ /* according to SQL standard truncation (e.g. loss of precision
is
+ not an error) - for detecting possible truncation you have to
+ check mysqli_stmt_warning
+ */
+ case MYSQL_DATA_TRUNCATED:
+#endif
RETURN_TRUE;
break;
case 1:
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/tests/bug35517.phpt?view=markuprev=1.1
Index: php-src/ext/mysqli/tests/bug35517.phpt
+++ php-src/ext/mysqli/tests/bug35517.phpt
--
Give me your money at @ http://pecl.php.net/wishlist.php/sniper
Donating money may make me happier and friendlier for a limited period!
Death to all 4 letter abbreviations starting with P!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
