[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun Oct 8 01:30:54 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2476r2=1.2477diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2476 php-src/ChangeLog:1.2477 --- php-src/ChangeLog:1.2476Sat Oct 7 01:30:57 2006 +++ php-src/ChangeLog Sun Oct 8 01:30:53 2006 @@ -1,3 +1,124 @@ +2006-10-07 Hannes Magnusson [EMAIL PROTECTED] + +* ext/ctype/tests/001.phpt + ext/ctype/tests/002.phpt: + fix tests + +* ext/bz2/tests/005.phpt: + Update test + +* ext/dba/dba.c + ext/mhash/mhash.c + ext/session/session.c + ext/shmop/shmop.c + ext/standard/basic_functions.c + ext/xmlwriter/php_xmlwriter.c + ext/zip/php_zip.c: + Remove double wrong param count warnings + +* ext/date/php_date.c: + Add wrong param count/expecting parameter .. to be.. warning to + strtotime() + +* ext/shmop/shmop.c: + fix build + +2006-10-07 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/gd/tests/createfromstring.phpt + ext/gd/tests/lines.phpt: + - update tests + +2006-10-07 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/dom/document.c + ext/dom/dom_iterators.c: + MFB: Added missing safety checks (Problem identified by Coverity scan) + +* (PHP_5_2) + ext/dom/document.c + ext/dom/dom_iterators.c: + Added missing safety checks (Problem identified by Coverity scan) + +2006-10-07 Pierre-Alain Joye [EMAIL PROTECTED] + +* unicode-progress.txt: + - forgot one and order the ext lists alpha. + +2006-10-07 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/shmop/shmop.c + ext/shmop/tests/001.phpt: + Initial Unicode support + +2006-10-07 Pierre-Alain Joye [EMAIL PROTECTED] + +* unicode-progress.txt: + - I learned today that telling Andrei about what I'm working on is not +not enough, selber schuld? + +2006-10-07 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/mysqli/mysqli_nonapi.c: + Another build fix + +* ext/gd/gd.c: + Fixed build + +2006-10-07 Sara Golemon [EMAIL PROTECTED] + +* ext/sqlite/config.m4 + ext/sqlite/php_sqlite.h + ext/sqlite/sqlite.c: + Update SQLITE2 (non-PDO parts at least) for PHP6/Unicode + Change default build of bundled libsqlite to utf8 mode + iso-8859 mode is still available using --disable-sqlite-utf8 + +* ext/gd/gd.c: + More PHP6 Updates + +2006-10-07 Andrei Zmievski [EMAIL PROTECTED] + +* ZendEngine2/zend_API.c + ZendEngine2/zend_API.h + ZendEngine2/zend_hash.c + ZendEngine2/zend_hash.h: + Hash functions for UTF-8 keys. + +2006-10-07 Sara Golemon [EMAIL PROTECTED] + +* (PHP_5_2) + ext/gd/gd.c: + MFH(r-1.356) Don't assume the array elements are arrays too + +* ext/gd/gd.c: + Minor refactoring using zpp API + A few meaningful Unicode updates. + A handful of leak plugs, + and a crash fix in a pear tree. + +2006-10-07 Hannes Magnusson [EMAIL PROTECTED] + +* ext/calendar/cal_unix.c: + Avoid portability problems + +2006-10-07 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + BFN + +2006-10-07 Sara Golemon [EMAIL PROTECTED] + +* ext/standard/type.c: + Win32 build gets confused by expansion of U_STRING_DECL macro with + constants + +2006-10-07 Andrei Zmievski [EMAIL PROTECTED] + +* ext/standard/uniqid.c: + Default to ZEND_STR_TYPE. + 2006-10-06 Ilia Alshanetsky [EMAIL PROTECTED] * ext/pdo_pgsql/config.m4
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sun Oct 8 01:30:55 2006 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.997r2=1.998diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.997 ZendEngine2/ChangeLog:1.998 --- ZendEngine2/ChangeLog:1.997 Sat Oct 7 01:30:59 2006 +++ ZendEngine2/ChangeLog Sun Oct 8 01:30:55 2006 @@ -1,3 +1,11 @@ +2006-10-07 Andrei Zmievski [EMAIL PROTECTED] + +* zend_API.c + zend_API.h + zend_hash.c + zend_hash.h: + Hash functions for UTF-8 keys. + 2006-10-06 Andrei Zmievski [EMAIL PROTECTED] * zend_strtol.c: @@ -15489,7 +15497,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.997 2006/10/07 01:30:59 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.998 2006/10/08 01:30:55 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -17213,7 +17221,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.997 2006/10/07 01:30:59 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.998 2006/10/08 01:30:55 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/calendar cal_unix.c
bjori Sat Oct 7 15:14:57 2006 UTC
Modified files:
/php-src/ext/calendar cal_unix.c
Log:
Avoid portability problems
http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/cal_unix.c?r1=1.20r2=1.21diff_format=u
Index: php-src/ext/calendar/cal_unix.c
diff -u php-src/ext/calendar/cal_unix.c:1.20
php-src/ext/calendar/cal_unix.c:1.21
--- php-src/ext/calendar/cal_unix.c:1.20Wed Oct 4 12:50:02 2006
+++ php-src/ext/calendar/cal_unix.c Sat Oct 7 15:14:57 2006
@@ -28,15 +28,21 @@
Convert UNIX timestamp to Julian Day */
PHP_FUNCTION(unixtojd)
{
- time_t timestamp = time(NULL);
- long jdate;
+ time_t timestamp;
+ long jdate, t;
struct tm *ta, tmbuf;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |l, timestamp) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |l, t) == FAILURE) {
return;
}
- if(timestamp 0) {
+ if (ZEND_NUM_ARGS()) {
+timestamp = (time_t) t;
+ } else {
+timestamp = time(NULL);
+ }
+
+ if (timestamp 0) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Sat Oct 7 17:25:27 2006 UTC Modified files: /CVSROOTavail Log: - Give kore access to presentations. http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1190r2=1.1191diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1190 CVSROOT/avail:1.1191 --- CVSROOT/avail:1.1190Tue Oct 3 19:18:18 2006 +++ CVSROOT/avail Sat Oct 7 17:25:27 2006 @@ -53,7 +53,7 @@ # The PHP Presentation Group has access to the presentations on the # conf.php.net site. -avail|toby,sterling,jon,graeme,derick,imajes,wez,iliaa,jmcastagnetto,shiflett,nohn,sebastian,vmarshall,alan_k,lhl,eru,sklar,wenz,zak,gschlossnagle,jacques,pollita,amt,john,hholzgra,pajoye,helly,dbs,vrana|pres,pres2,presentations +avail|toby,sterling,jon,graeme,derick,imajes,wez,iliaa,jmcastagnetto,shiflett,nohn,sebastian,vmarshall,alan_k,lhl,eru,sklar,wenz,zak,gschlossnagle,jacques,pollita,amt,john,hholzgra,pajoye,helly,dbs,vrana,kore|pres,pres2,presentations # The PHP Quality Assurance Team maintains their own website. -- 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
pollita Sat Oct 7 17:41:14 2006 UTC
Modified files:
/php-src/ext/gd gd.c
Log:
More PHP6 Updates
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.356r2=1.357diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.356 php-src/ext/gd/gd.c:1.357
--- php-src/ext/gd/gd.c:1.356 Sat Oct 7 16:38:23 2006
+++ php-src/ext/gd/gd.c Sat Oct 7 17:41:14 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.356 2006/10/07 16:38:23 pollita Exp $ */
+/* $Id: gd.c,v 1.357 2006/10/07 17:41:14 pollita Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -2976,7 +2976,7 @@
}
/* }}} */
-/* {{{ proto int imagecolortransparent(resource im [, int col])
+/* {{{ proto int imagecolortransparent(resource im [, int col]) U
Define a color as transparent */
PHP_FUNCTION(imagecolortransparent)
{
@@ -3205,15 +3205,24 @@
{
zval *IM;
long size, x, y, col;
+ zend_uchar str_type;
char *str;
int str_len, i;
gdImagePtr im;
gdFontPtr font;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rlllsl, IM,
size, x, y, str, str_len, col) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rllltl, IM,
size, x, y, str, str_len, str_type, col) == FAILURE) {
return;
}
+ if (str_type == IS_UNICODE) {
+ str = zend_unicode_to_ascii((UChar*)str, str_len TSRMLS_CC);
+ if (!str) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Binary or
ASCII-Unicode string expected, non-ASCII-Unicode string received. Consider
using the TTF functions for Unicode output);
+ RETURN_FALSE;
+ }
+ }
+
ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd);
font = php_find_gd_font(size TSRMLS_CC);
@@ -3241,11 +3250,15 @@
}
}
+ if (str_type == IS_UNICODE) {
+ efree(str);
+ }
+
RETURN_TRUE;
}
/* }}} */
-/* {{{ proto bool imagechar(resource im, int font, int x, int y, string c, int
col)
+/* {{{ proto bool imagechar(resource im, int font, int x, int y, string c, int
col) U
Draw a character */
PHP_FUNCTION(imagechar)
{
@@ -3253,7 +3266,7 @@
}
/* }}} */
-/* {{{ proto bool imagecharup(resource im, int font, int x, int y, string c,
int col)
+/* {{{ proto bool imagecharup(resource im, int font, int x, int y, string c,
int col) U
Draw a character rotated 90 degrees counter-clockwise */
PHP_FUNCTION(imagecharup)
{
@@ -3261,7 +3274,7 @@
}
/* }}} */
-/* {{{ proto bool imagestring(resource im, int font, int x, int y, string str,
int col)
+/* {{{ proto bool imagestring(resource im, int font, int x, int y, string str,
int col) U
Draw a string horizontally */
PHP_FUNCTION(imagestring)
{
@@ -3269,7 +3282,7 @@
}
/* }}} */
-/* {{{ proto bool imagestringup(resource im, int font, int x, int y, string
str, int col)
+/* {{{ proto bool imagestringup(resource im, int font, int x, int y, string
str, int col) U
Draw a string vertically - rotated 90 degrees counter-clockwise */
PHP_FUNCTION(imagestringup)
{
@@ -3404,7 +3417,7 @@
#ifdef ENABLE_GD_TTF
#if HAVE_LIBFREETYPE HAVE_GD_STRINGFTEX
-/* {{{ proto array imageftbbox(float size, float angle, string font_file,
string text [, array extrainfo])
+/* {{{ proto array imageftbbox(float size, float angle, string font_file,
string text [, array extrainfo]) U
Give the bounding box of a text using fonts via freetype2 */
PHP_FUNCTION(imageftbbox)
{
@@ -3412,7 +3425,7 @@
}
/* }}} */
-/* {{{ proto array imagefttext(resource im, float size, float angle, int x,
int y, int col, string font_file, string text [, array extrainfo])
+/* {{{ proto array imagefttext(resource im, float size, float angle, int x,
int y, int col, string font_file, string text [, array extrainfo]) U
Write text to the image using fonts via freetype2 */
PHP_FUNCTION(imagefttext)
{
@@ -3421,7 +3434,7 @@
/* }}} */
#endif
-/* {{{ proto array imagettfbbox(float size, float angle, string font_file,
string text)
+/* {{{ proto array imagettfbbox(float size, float angle, string font_file,
string text) U
Give the bounding box of a text using TrueType fonts */
PHP_FUNCTION(imagettfbbox)
{
@@ -3429,7 +3442,7 @@
}
/* }}} */
-/* {{{ proto array imagettftext(resource im, float size, float angle, int x,
int y, int col, string font_file, string text)
+/* {{{ proto array imagettftext(resource im, float size, float angle, int x,
int y, int col, string font_file, string text) U
Write text to the image using a TrueType font */
PHP_FUNCTION(imagettftext)
{
@@ -3458,15 +3471,21 @@
#endif
if (mode == TTFTEXT_BBOX) {
+ zval **ppfontname;
+
if (argc 4 || argc ((extended) ? 5 : 4)) {
[PHP-CVS] cvs: php-src /ext/sqlite config.m4 php_sqlite.h sqlite.c
pollita Sat Oct 7 17:49:30 2006 UTC
Modified files:
/php-src/ext/sqlite config.m4 php_sqlite.h sqlite.c
Log:
Update SQLITE2 (non-PDO parts at least) for PHP6/Unicode
Change default build of bundled libsqlite to utf8 mode
iso-8859 mode is still available using --disable-sqlite-utf8
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/config.m4?r1=1.41r2=1.42diff_format=u
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.41 php-src/ext/sqlite/config.m4:1.42
--- php-src/ext/sqlite/config.m4:1.41 Tue Jun 14 01:44:16 2005
+++ php-src/ext/sqlite/config.m4Sat Oct 7 17:49:30 2006
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.41 2005/06/14 01:44:16 sniper Exp $
+dnl $Id: config.m4,v 1.42 2006/10/07 17:49:30 pollita Exp $
dnl config.m4 for extension sqlite
dnl vim:et:ts=2:sw=2
@@ -8,8 +8,8 @@
Sqlite include and library files are located,
if not using bundled library.], yes)
-PHP_ARG_ENABLE(sqlite-utf8, whether to enable UTF-8 support in sqlite
(default: ISO-8859-1),
-[ --enable-sqlite-utf8 SQLite: Enable UTF-8 support for SQLite], no, no)
+PHP_ARG_ENABLE(sqlite-utf8, whether to disable UTF-8 support in libsqlite
(charset changes to ISO-8859-1),
+[ --disable-sqlite-utf8 SQLite: Disable UTF-8 support for SQLite (use
ISO8859)], yes, no)
@@ -126,11 +126,11 @@
dnl use latin 1 for SQLite older than 2.8.9; the utf-8 handling
dnl in funcs.c uses assert(), which is a bit silly and something
dnl we want to avoid. This assert() was removed in SQLite 2.8.9.
-if test $PHP_SQLITE_UTF8 = yes; then
+if test $PHP_SQLITE_UTF8 = no; then
+ SQLITE_ENCODING=ISO8859
+else
SQLITE_ENCODING=UTF8
AC_DEFINE(SQLITE_UTF8, 1, [ ])
-else
- SQLITE_ENCODING=ISO8859
fi
PHP_SUBST(SQLITE_ENCODING)
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/php_sqlite.h?r1=1.34r2=1.35diff_format=u
Index: php-src/ext/sqlite/php_sqlite.h
diff -u php-src/ext/sqlite/php_sqlite.h:1.34
php-src/ext/sqlite/php_sqlite.h:1.35
--- php-src/ext/sqlite/php_sqlite.h:1.34Sun Jan 1 13:09:54 2006
+++ php-src/ext/sqlite/php_sqlite.h Sat Oct 7 17:49:30 2006
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: php_sqlite.h,v 1.34 2006/01/01 13:09:54 sniper Exp $
+ $Id: php_sqlite.h,v 1.35 2006/10/07 17:49:30 pollita Exp $
*/
#ifndef PHP_SQLITE_H
@@ -93,7 +93,10 @@
PHP_FUNCTION(sqlite_fetch_column_types);
ZEND_BEGIN_MODULE_GLOBALS(sqlite)
-long assoc_case;
+ long assoc_case;
+#ifdef SQLITE_ISO8859
+ UConverter *iso8859_conv;
+#endif
ZEND_END_MODULE_GLOBALS(sqlite)
#ifdef ZTS
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.197r2=1.198diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.197 php-src/ext/sqlite/sqlite.c:1.198
--- php-src/ext/sqlite/sqlite.c:1.197 Tue Sep 19 10:38:31 2006
+++ php-src/ext/sqlite/sqlite.c Sat Oct 7 17:49:30 2006
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.197 2006/09/19 10:38:31 dmitry Exp $
+ $Id: sqlite.c,v 1.198 2006/10/07 17:49:30 pollita Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -29,9 +29,12 @@
#include php.h
#include php_ini.h
#include ext/standard/info.h
+#include ext/standard/file.h
+#include ext/standard/php_string.h
#if HAVE_PHP_SESSION !defined(COMPILE_DL_SESSION)
#include ext/session/php_session.h
#endif
+#include sqlite.h
#include php_sqlite.h
#if HAVE_TIME_H
@@ -41,7 +44,12 @@
#include unistd.h
#endif
-#include sqlite.h
+
+#ifdef SQLITE_UTF8
+#define SQLITE2_CONV UG(utf8_conv)
+#else /* ISO 8859 */
+#define SQLITE2_CONV SQLITE_G(iso8859_conv)
+#endif
#include zend_exceptions.h
#include zend_interfaces.h
@@ -95,10 +103,48 @@
}
}
+#ifdef SQLITE_ISO8859
+static ZEND_INI_MH(OnUpdateEncodingISO8859)
+{
+ UConverter **converter;
+#ifndef ZTS
+ char *base = (char *) mh_arg2;
+#else
+ char *base = (char *) ts_resource(*((int *) mh_arg2));
+#endif
+ char encoding[sizeof(iso-8859-999)];
+
+ converter = (UConverter **) (base+(size_t) mh_arg1);
+ if (new_value_length 3) {
+ /* Really, 2 is sufficient, but be generous, the
zend_set_converter_encoding call will find it out */
+ zend_error(E_CORE_ERROR, Unrecognized locale '%s' for iso-8859
encoding used for %s, new_value ? new_value : 1, entry-name);
+ return FAILURE;
+ }
+
+ snprintf(encoding, sizeof(iso-8859-999), iso-8859-%s, new_value ?
new_value : 1);
+
+if (zend_set_converter_encoding(converter, encoding) == FAILURE) {
+zend_error(E_CORE_ERROR, Unrecognized
[PHP-CVS] cvs: php-src /ext/gd gd.c
iliaa Sat Oct 7 18:12:04 2006 UTC
Modified files:
/php-src/ext/gd gd.c
Log:
Fixed build
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.357r2=1.358diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.357 php-src/ext/gd/gd.c:1.358
--- php-src/ext/gd/gd.c:1.357 Sat Oct 7 17:41:14 2006
+++ php-src/ext/gd/gd.c Sat Oct 7 18:12:04 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.357 2006/10/07 17:41:14 pollita Exp $ */
+/* $Id: gd.c,v 1.358 2006/10/07 18:12:04 iliaa Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -3770,7 +3770,7 @@
ZEND_FETCH_RESOURCE(f_ind, int *, fnt, -1, Type 1 font, le_ps_font);
- if (T1_SlantFont(*f_ind, slt) != 0) {
+ if (T1_SlantFont(*f_ind, slant) != 0) {
RETURN_FALSE;
}
@@ -4179,7 +4179,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING,
Unable to open '%s' Not a valid JPEG file, fn_dest);
goto convert_done;
}
-รข break;
+ break;
#endif /* HAVE_GD_JPG */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_nonapi.c
iliaa Sat Oct 7 18:24:51 2006 UTC
Modified files:
/php-src/ext/mysqli mysqli_nonapi.c
Log:
Another build fix
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.65r2=1.66diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.65
php-src/ext/mysqli/mysqli_nonapi.c:1.66
--- php-src/ext/mysqli/mysqli_nonapi.c:1.65 Mon Oct 2 07:42:49 2006
+++ php-src/ext/mysqli/mysqli_nonapi.c Sat Oct 7 18:24:51 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_nonapi.c,v 1.65 2006/10/02 07:42:49 bjori Exp $
+ $Id: mysqli_nonapi.c,v 1.66 2006/10/07 18:24:51 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -93,11 +93,13 @@
RETURN_FALSE;
}
+#ifdef HAVE_MYSQLI_SET_CHARSET
/* when PHP runs in unicode, set default character set to utf8 */
if (UG(unicode)) {
mysql_set_character_set(mysql-mysql, utf8);
mysql-conv = UG(utf8_conv);
}
+#endif
/* clear error */
php_mysqli_set_error(mysql_errno(mysql-mysql), (char *)
mysql_error(mysql-mysql) TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / unicode-progress.txt
pajoye Sat Oct 7 18:29:50 2006 UTC Modified files: /php-srcunicode-progress.txt Log: - I learned today that telling Andrei about what I'm working on is not not enough, selber schuld? http://cvs.php.net/viewvc.cgi/php-src/unicode-progress.txt?r1=1.55r2=1.56diff_format=u Index: php-src/unicode-progress.txt diff -u php-src/unicode-progress.txt:1.55 php-src/unicode-progress.txt:1.56 --- php-src/unicode-progress.txt:1.55 Thu Oct 5 22:40:38 2006 +++ php-src/unicode-progress.txtSat Oct 7 18:29:50 2006 @@ -36,8 +36,23 @@ Upgrade, do wordwrapping on codepoint (or glyph ?) level, maybe use additional whitespace chars instead of just space. +ext/gd + + Status: In Progress + A preliminary version has been commited by Sara. Pierre is working on the + migration of the GD extension for php6. + +ext/zip + + Status: In Progress + (Pierre) - +ext/filter + + Status: To be discussed + The unicode support must be discussed with the filter maintainers + and Andrei (sapi maintainers too?). Please mail them and the list prior + to any work or commits. Completed = -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/shmop shmop.c /ext/shmop/tests 001.phpt
iliaa Sat Oct 7 18:45:44 2006 UTC
Modified files:
/php-src/ext/shmop shmop.c
/php-src/ext/shmop/tests001.phpt
Log:
Initial Unicode support
http://cvs.php.net/viewvc.cgi/php-src/ext/shmop/shmop.c?r1=1.33r2=1.34diff_format=u
Index: php-src/ext/shmop/shmop.c
diff -u php-src/ext/shmop/shmop.c:1.33 php-src/ext/shmop/shmop.c:1.34
--- php-src/ext/shmop/shmop.c:1.33 Sun Jan 1 13:09:53 2006
+++ php-src/ext/shmop/shmop.c Sat Oct 7 18:45:43 2006
@@ -16,7 +16,7 @@
| Ilia Alshanetsky [EMAIL PROTECTED] |
+--+
*/
-/* $Id: shmop.c,v 1.33 2006/01/01 13:09:53 sniper Exp $ */
+/* $Id: shmop.c,v 1.34 2006/10/07 18:45:43 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -109,7 +109,7 @@
}
/* }}} */
-/* {{{ proto int shmop_open (int key, string flags, int mode, int size)
+/* {{{ proto int shmop_open (int key, string flags, int mode, int size) U
gets and attaches a shared memory segment */
PHP_FUNCTION(shmop_open)
{
@@ -119,12 +119,24 @@
int rsid;
char *flags;
int flags_len;
+ zend_uchar flag_type;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, lsll, key,
flags, flags_len, mode, size) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ltll, key,
flags, flags_len, flag_type, mode, size) == FAILURE) {
WRONG_PARAM_COUNT;
}
+ if (flag_type == IS_UNICODE) {
+ flags = zend_unicode_to_ascii((UChar*)flags, flags_len);
+ if (!flags) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Binary or
ASCII-Unicode string expected, non-ASCII-Unicode string received);
+ RETURN_FALSE;
+ }
+ }
+
if (flags_len != 1) {
+ if (flag_type == IS_UNICODE) {
+ efree(flags);
+ }
php_error_docref(NULL TSRMLS_CC, E_WARNING, %s is not a valid
flag, flags);
RETURN_FALSE;
}
@@ -179,14 +191,20 @@
shmop-size = shm.shm_segsz;
rsid = zend_list_insert(shmop, shm_type);
+ if (flag_type == IS_UNICODE) {
+ efree(flags);
+ }
RETURN_LONG(rsid);
err:
+ if (flag_type == IS_UNICODE) {
+ efree(flags);
+ }
efree(shmop);
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto string shmop_read (int shmid, int start, int count)
+/* {{{ proto string shmop_read (int shmid, int start, int count) U
reads from a shm segment */
PHP_FUNCTION(shmop_read)
{
@@ -229,7 +247,7 @@
}
/* }}} */
-/* {{{ proto void shmop_close (int shmid)
+/* {{{ proto void shmop_close (int shmid) U
closes a shared memory segment */
PHP_FUNCTION(shmop_close)
{
@@ -252,7 +270,7 @@
}
/* }}} */
-/* {{{ proto int shmop_size (int shmid)
+/* {{{ proto int shmop_size (int shmid) U
returns the shm size */
PHP_FUNCTION(shmop_size)
{
@@ -275,18 +293,18 @@
}
/* }}} */
-/* {{{ proto int shmop_write (int shmid, string data, int offset)
+/* {{{ proto int shmop_write (int shmid, string data, int offset) U
writes to a shared memory segment */
PHP_FUNCTION(shmop_write)
{
struct php_shmop *shmop;
int type;
int writesize;
- long shmid, offset;
+ long shmid, offset=0;
char *data;
int data_len;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, lsl, shmid,
data, data_len, offset) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, lS|l, shmid,
data, data_len, offset) == FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -314,7 +332,7 @@
}
/* }}} */
-/* {{{ proto bool shmop_delete (int shmid)
+/* {{{ proto bool shmop_delete (int shmid) U
mark segment for deletion */
PHP_FUNCTION(shmop_delete)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/shmop/tests/001.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/shmop/tests/001.phpt
diff -u php-src/ext/shmop/tests/001.phpt:1.2
php-src/ext/shmop/tests/001.phpt:1.3
--- php-src/ext/shmop/tests/001.phpt:1.2Thu Dec 16 12:34:31 2004
+++ php-src/ext/shmop/tests/001.phptSat Oct 7 18:45:44 2006
@@ -9,8 +9,8 @@
--FILE--
?php
$hex_shm_id = 0xff3;
- $write_d1 = test #1 of the shmop() extension;
- $write_d2 = test #2 append data to shared memory segment;
+ $write_d1 = btest #1 of the shmop() extension;
+ $write_d2 = btest #2 append data to shared memory segment;
echo shm open for create: ;
$shm_id = shmop_open($hex_shm_id, n, 0644, 1024);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / unicode-progress.txt
pajoye Sat Oct 7 18:47:44 2006 UTC Modified files: /php-srcunicode-progress.txt Log: - forgot one and order the ext lists alpha. http://cvs.php.net/viewvc.cgi/php-src/unicode-progress.txt?r1=1.56r2=1.57diff_format=u Index: php-src/unicode-progress.txt diff -u php-src/unicode-progress.txt:1.56 php-src/unicode-progress.txt:1.57 --- php-src/unicode-progress.txt:1.56 Sat Oct 7 18:29:50 2006 +++ php-src/unicode-progress.txtSat Oct 7 18:47:44 2006 @@ -36,23 +36,30 @@ Upgrade, do wordwrapping on codepoint (or glyph ?) level, maybe use additional whitespace chars instead of just space. + +ext/filter + + Status: To be discussed + The unicode support must be discussed with the filter maintainers + and Andrei (sapi maintainers too?). Please mail them and the list prior + to any work or commits. + ext/gd Status: In Progress A preliminary version has been commited by Sara. Pierre is working on the migration of the GD extension for php6. - -ext/zip + +ext/openssl Status: In Progress (Pierre) -ext/filter +ext/zip - Status: To be discussed - The unicode support must be discussed with the filter maintainers - and Andrei (sapi maintainers too?). Please mail them and the list prior - to any work or commits. + Status: In Progress + (Pierre) + Completed = -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom document.c
iliaa Sat Oct 7 19:40:59 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/domdocument.c
Log:
Added missing safety checks (Problem identified by Coverity scan)
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/document.c?r1=1.68.2.3.2.3r2=1.68.2.3.2.4diff_format=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.68.2.3.2.3
php-src/ext/dom/document.c:1.68.2.3.2.4
--- php-src/ext/dom/document.c:1.68.2.3.2.3 Sat Sep 16 19:07:35 2006
+++ php-src/ext/dom/document.c Sat Oct 7 19:40:58 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: document.c,v 1.68.2.3.2.3 2006/09/16 19:07:35 iliaa Exp $ */
+/* $Id: document.c,v 1.68.2.3.2.4 2006/10/07 19:40:58 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1355,7 +1355,9 @@
}
}
intern-document = NULL;
- php_libxml_increment_doc_ref((php_libxml_node_object *)intern,
docp TSRMLS_CC);
+ if (php_libxml_increment_doc_ref((php_libxml_node_object
*)intern, docp TSRMLS_CC) == -1) {
+ RETURN_FALSE;
+ }
php_libxml_increment_node_ptr((php_libxml_node_object *)intern,
(xmlNodePtr)docp, (void *)intern TSRMLS_CC);
}
}
@@ -1568,7 +1570,9 @@
}
}
intern-document = NULL;
- php_libxml_increment_doc_ref((php_libxml_node_object
*)intern, newdoc TSRMLS_CC);
+ if
(php_libxml_increment_doc_ref((php_libxml_node_object *)intern, newdoc
TSRMLS_CC) == -1) {
+ RETURN_FALSE;
+ }
intern-document-doc_props = doc_prop;
}
@@ -2069,7 +2073,9 @@
}
}
intern-document = NULL;
- php_libxml_increment_doc_ref((php_libxml_node_object
*)intern, newdoc TSRMLS_CC);
+ if
(php_libxml_increment_doc_ref((php_libxml_node_object *)intern, newdoc
TSRMLS_CC) == -1) {
+ RETURN_FALSE;
+ }
intern-document-doc_props = doc_prop;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom document.c
iliaa Sat Oct 7 19:41:10 2006 UTC
Modified files:
/php-src/ext/domdocument.c
Log:
MFB: Added missing safety checks (Problem identified by Coverity scan)
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/document.c?r1=1.81r2=1.82diff_format=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.81 php-src/ext/dom/document.c:1.82
--- php-src/ext/dom/document.c:1.81 Thu Oct 5 11:59:42 2006
+++ php-src/ext/dom/document.c Sat Oct 7 19:41:10 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: document.c,v 1.81 2006/10/05 11:59:42 rrichards Exp $ */
+/* $Id: document.c,v 1.82 2006/10/07 19:41:10 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1355,7 +1355,9 @@
}
}
intern-document = NULL;
- php_libxml_increment_doc_ref((php_libxml_node_object *)intern,
docp TSRMLS_CC);
+ if (php_libxml_increment_doc_ref((php_libxml_node_object
*)intern, docp TSRMLS_CC) == -1) {
+ RETURN_FALSE;
+ }
php_libxml_increment_node_ptr((php_libxml_node_object *)intern,
(xmlNodePtr)docp, (void *)intern TSRMLS_CC);
}
}
@@ -1585,7 +1587,9 @@
}
}
intern-document = NULL;
- php_libxml_increment_doc_ref((php_libxml_node_object
*)intern, newdoc TSRMLS_CC);
+ if
(php_libxml_increment_doc_ref((php_libxml_node_object *)intern, newdoc
TSRMLS_CC) == -1) {
+ RETURN_FALSE;
+ }
intern-document-doc_props = doc_prop;
}
@@ -2154,7 +2158,9 @@
}
}
intern-document = NULL;
- php_libxml_increment_doc_ref((php_libxml_node_object
*)intern, newdoc TSRMLS_CC);
+ if
(php_libxml_increment_doc_ref((php_libxml_node_object *)intern, newdoc
TSRMLS_CC) == -1) {
+ RETURN_FALSE;
+ }
intern-document-doc_props = doc_prop;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/tests createfromstring.phpt lines.phpt
pajoye Sat Oct 7 19:57:15 2006 UTC
Modified files:
/php-src/ext/gd/tests lines.phpt createfromstring.phpt
Log:
- update tests
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/lines.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/gd/tests/lines.phpt
diff -u php-src/ext/gd/tests/lines.phpt:1.3 php-src/ext/gd/tests/lines.phpt:1.4
--- php-src/ext/gd/tests/lines.phpt:1.3 Wed Aug 23 12:00:05 2006
+++ php-src/ext/gd/tests/lines.phpt Sat Oct 7 19:57:15 2006
@@ -106,7 +106,7 @@
?
--EXPECTF--
-Warning: Wrong parameter count for imageline() in %s on line %d
+Warning: imageline() expects exactly %d parameters, %d given in %s on line %d
Horizontal: ok
Vertical: ok
Diagonal: ok
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/createfromstring.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/gd/tests/createfromstring.phpt
diff -u php-src/ext/gd/tests/createfromstring.phpt:1.1
php-src/ext/gd/tests/createfromstring.phpt:1.2
--- php-src/ext/gd/tests/createfromstring.phpt:1.1 Fri Dec 16 19:02:07 2005
+++ php-src/ext/gd/tests/createfromstring.phpt Sat Oct 7 19:57:15 2006
@@ -50,9 +50,9 @@
//empty string
-$im = imagecreatefromstring('');
+$im = imagecreatefromstring(b'');
//random string 8
-$im = imagecreatefromstring(' asdf jklp');
+$im = imagecreatefromstring(b' asdf jklp');
?
--EXPECTF--
createfromstring truecolor png: 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_2) /ext/dom dom_iterators.c
iliaa Sat Oct 7 19:59:19 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/domdom_iterators.c
Log:
Added missing safety checks (Problem identified by Coverity scan)
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/dom_iterators.c?r1=1.9.2.3.2.3r2=1.9.2.3.2.4diff_format=u
Index: php-src/ext/dom/dom_iterators.c
diff -u php-src/ext/dom/dom_iterators.c:1.9.2.3.2.3
php-src/ext/dom/dom_iterators.c:1.9.2.3.2.4
--- php-src/ext/dom/dom_iterators.c:1.9.2.3.2.3 Wed May 17 16:35:50 2006
+++ php-src/ext/dom/dom_iterators.c Sat Oct 7 19:59:19 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dom_iterators.c,v 1.9.2.3.2.3 2006/05/17 16:35:50 rrichards Exp $ */
+/* $Id: dom_iterators.c,v 1.9.2.3.2.4 2006/10/07 19:59:19 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -170,6 +170,8 @@
intern = (dom_object *)zend_object_store_get_object(curobj
TSRMLS_CC);
if (intern != NULL intern-ptr != NULL) {
curnode = (xmlNodePtr)((php_libxml_node_ptr
*)intern-ptr)-node;
+ } else {
+ return HASH_KEY_NON_EXISTANT;
}
namelen = xmlStrlen(curnode-name);
@@ -220,8 +222,10 @@
if (basenode (basenode-type ==
XML_DOCUMENT_NODE ||
basenode-type ==
XML_HTML_DOCUMENT_NODE)) {
basenode =
xmlDocGetRootElement((xmlDoc *) basenode);
- } else {
+ } else if (basenode) {
basenode = basenode-children;
+ } else {
+ goto err;
}
curnode =
dom_get_elements_by_tag_name_ns_raw(basenode, objmap-ns, objmap-local,
previndex, iter-index);
}
@@ -234,7 +238,7 @@
}
}
}
-
+err:
zval_ptr_dtor((zval**)curobj);
if (curnode) {
MAKE_STD_ZVAL(curattr);
@@ -287,6 +291,9 @@
}
} else {
nodep = (xmlNode
*)dom_object_get_node(objmap-baseobj);
+ if (!nodep) {
+ goto err;
+ }
if (objmap-nodetype == XML_ATTRIBUTE_NODE ||
objmap-nodetype == XML_ELEMENT_NODE) {
if (objmap-nodetype ==
XML_ATTRIBUTE_NODE) {
curnode = (xmlNodePtr)
nodep-properties;
@@ -310,7 +317,7 @@
}
}
}
-
+err:
if (curnode) {
MAKE_STD_ZVAL(curattr);
curattr = php_dom_create_object(curnode, ret, NULL, curattr,
objmap-baseobj TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom dom_iterators.c
iliaa Sat Oct 7 19:59:30 2006 UTC
Modified files:
/php-src/ext/domdom_iterators.c
Log:
MFB: Added missing safety checks (Problem identified by Coverity scan)
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/dom_iterators.c?r1=1.17r2=1.18diff_format=u
Index: php-src/ext/dom/dom_iterators.c
diff -u php-src/ext/dom/dom_iterators.c:1.17
php-src/ext/dom/dom_iterators.c:1.18
--- php-src/ext/dom/dom_iterators.c:1.17Fri Mar 3 20:13:12 2006
+++ php-src/ext/dom/dom_iterators.c Sat Oct 7 19:59:29 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dom_iterators.c,v 1.17 2006/03/03 20:13:12 rrichards Exp $ */
+/* $Id: dom_iterators.c,v 1.18 2006/10/07 19:59:29 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -170,6 +170,8 @@
intern = (dom_object *)zend_object_store_get_object(curobj
TSRMLS_CC);
if (intern != NULL intern-ptr != NULL) {
curnode = (xmlNodePtr)((php_libxml_node_ptr
*)intern-ptr)-node;
+ } else {
+ return HASH_KEY_NON_EXISTANT;
}
namelen = xmlStrlen(curnode-name);
@@ -220,8 +222,10 @@
if (basenode (basenode-type ==
XML_DOCUMENT_NODE ||
basenode-type ==
XML_HTML_DOCUMENT_NODE)) {
basenode =
xmlDocGetRootElement((xmlDoc *) basenode);
- } else {
+ } else if (basenode) {
basenode = basenode-children;
+ } else {
+ goto err;
}
curnode =
dom_get_elements_by_tag_name_ns_raw(basenode, objmap-ns, objmap-local,
previndex, iter-index);
}
@@ -234,7 +238,7 @@
}
}
}
-
+err:
zval_ptr_dtor((zval**)curobj);
if (curnode) {
MAKE_STD_ZVAL(curattr);
@@ -288,6 +292,9 @@
}
} else {
nodep = (xmlNode
*)dom_object_get_node(objmap-baseobj);
+ if (!nodep) {
+ goto err;
+ }
if (objmap-nodetype == XML_ATTRIBUTE_NODE ||
objmap-nodetype == XML_ELEMENT_NODE) {
if (objmap-nodetype ==
XML_ATTRIBUTE_NODE) {
curnode = (xmlNodePtr)
nodep-properties;
@@ -311,7 +318,7 @@
}
}
}
-
+err:
if (curnode) {
MAKE_STD_ZVAL(curattr);
curattr = php_dom_create_object(curnode, ret, NULL, curattr,
objmap-baseobj TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/shmop shmop.c
bjori Sat Oct 7 21:12:09 2006 UTC
Modified files:
/php-src/ext/shmop shmop.c
Log:
fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/shmop/shmop.c?r1=1.34r2=1.35diff_format=u
Index: php-src/ext/shmop/shmop.c
diff -u php-src/ext/shmop/shmop.c:1.34 php-src/ext/shmop/shmop.c:1.35
--- php-src/ext/shmop/shmop.c:1.34 Sat Oct 7 18:45:43 2006
+++ php-src/ext/shmop/shmop.c Sat Oct 7 21:12:09 2006
@@ -16,7 +16,7 @@
| Ilia Alshanetsky [EMAIL PROTECTED] |
+--+
*/
-/* $Id: shmop.c,v 1.34 2006/10/07 18:45:43 iliaa Exp $ */
+/* $Id: shmop.c,v 1.35 2006/10/07 21:12:09 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -126,7 +126,7 @@
}
if (flag_type == IS_UNICODE) {
- flags = zend_unicode_to_ascii((UChar*)flags, flags_len);
+ flags = zend_unicode_to_ascii((UChar*)flags, flags_len
TSRMLS_CC);
if (!flags) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Binary or
ASCII-Unicode string expected, non-ASCII-Unicode string received);
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/date php_date.c
bjori Sat Oct 7 22:31:53 2006 UTC
Modified files:
/php-src/ext/date php_date.c
Log:
Add wrong param count/expecting parameter .. to be.. warning to
strtotime()
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.121r2=1.122diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.121 php-src/ext/date/php_date.c:1.122
--- php-src/ext/date/php_date.c:1.121 Tue Oct 3 14:55:42 2006
+++ php-src/ext/date/php_date.c Sat Oct 7 22:31:52 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.121 2006/10/03 14:55:42 bjori Exp $ */
+/* $Id: php_date.c,v 1.122 2006/10/07 22:31:52 bjori Exp $ */
#include php.h
#include php_streams.h
@@ -1204,7 +1204,7 @@
timelib_unixtime2local(now, t-sse);
timelib_time_dtor(t);
efree(initial_ts);
- } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
ZEND_NUM_ARGS() TSRMLS_CC, s, times, time_len) != FAILURE) {
+ } else if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|l,
times, time_len, preset_ts) != FAILURE) {
/* We have no initial timestamp */
now = timelib_time_ctor();
now-tz_info = tzi;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dba dba.c /ext/mhash mhash.c /ext/session session.c /ext/shmop shmop.c /ext/standard basic_functions.c /ext/xmlwriter php_xmlwriter.c /ext/zip php_zip.c
bjori Sat Oct 7 22:55:19 2006 UTC
Modified files:
/php-src/ext/sessionsession.c
/php-src/ext/mhash mhash.c
/php-src/ext/dbadba.c
/php-src/ext/shmop shmop.c
/php-src/ext/standard basic_functions.c
/php-src/ext/xmlwriter php_xmlwriter.c
/php-src/ext/zipphp_zip.c
Log:
Remove double wrong param count warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.453r2=1.454diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.453 php-src/ext/session/session.c:1.454
--- php-src/ext/session/session.c:1.453 Fri Oct 6 21:11:57 2006
+++ php-src/ext/session/session.c Sat Oct 7 22:55:18 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.453 2006/10/06 21:11:57 iliaa Exp $ */
+/* $Id: session.c,v 1.454 2006/10/07 22:55:18 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1416,7 +1416,7 @@
zend_bool del_ses = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |b, del_ses) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ return;
}
if (SG(headers_sent)) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mhash/mhash.c?r1=1.51r2=1.52diff_format=u
Index: php-src/ext/mhash/mhash.c
diff -u php-src/ext/mhash/mhash.c:1.51 php-src/ext/mhash/mhash.c:1.52
--- php-src/ext/mhash/mhash.c:1.51 Mon Apr 3 09:14:50 2006
+++ php-src/ext/mhash/mhash.c Sat Oct 7 22:55:18 2006
@@ -16,7 +16,7 @@
| Nikos Mavroyanopoulos [EMAIL PROTECTED] (HMAC, KEYGEN) |
+--+
*/
-/* $Id: mhash.c,v 1.51 2006/04/03 09:14:50 tony2001 Exp $ */
+/* $Id: mhash.c,v 1.52 2006/10/07 22:55:18 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -111,7 +111,7 @@
long hash;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l, hash) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ return;
}
RETURN_LONG(mhash_get_block_size(hash));
@@ -127,7 +127,7 @@
long hash;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l, hash) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ return;
}
name = mhash_get_hash_name(hash);
@@ -153,7 +153,7 @@
char *data, *key=NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ls|s, hash,
data, data_len, key, key_len) == FAILURE) {
- WRONG_PARAM_COUNT;
+ return;
}
bsize = mhash_get_block_size(hash);
@@ -202,7 +202,7 @@
int password_len, salt_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, lssl, hash,
password, password_len, in_salt, salt_len, bytes) == FAILURE) {
- WRONG_PARAM_COUNT;
+ return;
}
if (bytes = 0){
php_error_docref(NULL TSRMLS_CC, E_WARNING, the byte parameter
must be greater than 0);
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/dba.c?r1=1.121r2=1.122diff_format=u
Index: php-src/ext/dba/dba.c
diff -u php-src/ext/dba/dba.c:1.121 php-src/ext/dba/dba.c:1.122
--- php-src/ext/dba/dba.c:1.121 Thu Jul 6 23:13:41 2006
+++ php-src/ext/dba/dba.c Sat Oct 7 22:55:18 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dba.c,v 1.121 2006/07/06 23:13:41 iliaa Exp $ */
+/* $Id: dba.c,v 1.122 2006/10/07 22:55:18 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1160,7 +1160,6 @@
zend_bool full_info = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |b, full_info)
== FAILURE) {
- ZEND_WRONG_PARAM_COUNT();
RETURN_FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/shmop/shmop.c?r1=1.35r2=1.36diff_format=u
Index: php-src/ext/shmop/shmop.c
diff -u php-src/ext/shmop/shmop.c:1.35 php-src/ext/shmop/shmop.c:1.36
--- php-src/ext/shmop/shmop.c:1.35 Sat Oct 7 21:12:09 2006
+++ php-src/ext/shmop/shmop.c Sat Oct 7 22:55:18 2006
@@ -16,7 +16,7 @@
| Ilia Alshanetsky [EMAIL PROTECTED] |
+--+
*/
-/* $Id: shmop.c,v 1.35 2006/10/07 21:12:09 bjori Exp $ */
+/* $Id: shmop.c,v 1.36 2006/10/07 22:55:18 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -122,7 +122,7 @@
zend_uchar flag_type;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ltll, key,
flags, flags_len, flag_type, mode, size) == FAILURE) {
- WRONG_PARAM_COUNT;
+ return;
}
if (flag_type == IS_UNICODE) {
@@ -216,7 +216,7 @@
char *return_string;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, lll, shmid,
start, count) == FAILURE) {
-
[PHP-CVS] cvs: php-src /ext/bz2/tests 005.phpt
bjori Sat Oct 7 23:42:43 2006 UTC Modified files: /php-src/ext/bz2/tests 005.phpt Log: Update test http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/005.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/bz2/tests/005.phpt diff -u php-src/ext/bz2/tests/005.phpt:1.3 php-src/ext/bz2/tests/005.phpt:1.4 --- php-src/ext/bz2/tests/005.phpt:1.3 Thu Oct 5 21:28:19 2006 +++ php-src/ext/bz2/tests/005.phpt Sat Oct 7 23:42:43 2006 @@ -70,3 +70,35 @@ Getting lost within myself Nothing matters no one else Done +--UEXPECTF-- +Warning: bzcompress() expects at least 1 parameter, 0 given in %s on line %d +NULL +unicode(%d) BZ%s +int(-2) +int(-2) +int(-2) +int(-2) + +Warning: bzdecompress() expects at least 1 parameter, 0 given in %s on line %d +bool(false) + +Warning: bzdecompress() expects at most 2 parameters, 3 given in %s on line %d +bool(false) +int(-5) +int(-5) +int(-5) +bool(false) +string(110) Life it seems, will fade away +Drifting further everyday +Getting lost within myself +Nothing matters no one else +bool(false) +string(110) Life it seems, will fade away +Drifting further everyday +Getting lost within myself +Nothing matters no one else +string(110) Life it seems, will fade away +Drifting further everyday +Getting lost within myself +Nothing matters no one else +Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ctype/tests 001.phpt 002.phpt
bjori Sat Oct 7 23:50:54 2006 UTC Modified files: /php-src/ext/ctype/tests001.phpt 002.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/001.phpt?r1=1.4r2=1.5diff_format=u Index: php-src/ext/ctype/tests/001.phpt diff -u php-src/ext/ctype/tests/001.phpt:1.4 php-src/ext/ctype/tests/001.phpt:1.5 --- php-src/ext/ctype/tests/001.phpt:1.4Wed May 19 08:56:50 2004 +++ php-src/ext/ctype/tests/001.phptSat Oct 7 23:50:54 2006 @@ -37,3 +37,16 @@ ctype_punct 32 ctype_space 6 ctype_xdigit 22 +--UEXPECTF-- +Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s001.php on line %d +ctype_lower 26 +ctype_upper 26 +ctype_alpha 52 +ctype_digit 10 +ctype_alnum 62 +ctype_cntrl 33 +ctype_graph 94 +ctype_print 95 +ctype_punct 32 +ctype_space 6 +ctype_xdigit 22 http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/tests/002.phpt?r1=1.6r2=1.7diff_format=u Index: php-src/ext/ctype/tests/002.phpt diff -u php-src/ext/ctype/tests/002.phpt:1.6 php-src/ext/ctype/tests/002.phpt:1.7 --- php-src/ext/ctype/tests/002.phpt:1.6Wed May 19 08:56:50 2004 +++ php-src/ext/ctype/tests/002.phptSat Oct 7 23:50:54 2006 @@ -46,3 +46,19 @@ ctype_punct 32 32 0 ctype_space 6 6 0 ctype_xdigit 22 22 0 +--UEXPECTF-- +Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s002.php on line %d + +Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s002.php on line %d +LOCALE is '%s' +ctype_lower 26 26 0 +ctype_upper 26 26 0 +ctype_alpha 52 52 0 +ctype_digit 10 10 0 +ctype_alnum 62 62 0 +ctype_cntrl 33 33 0 +ctype_graph 94 94 94 +ctype_print 95 95 95 +ctype_punct 32 32 0 +ctype_space 6 6 0 +ctype_xdigit 22 22 0 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/bz2 bz2.c php_bz2.h /ext/ctype ctype.c php_ctype.h /ext/pspell php_pspell.h pspell.c
bjori Sun Oct 8 00:05:17 2006 UTC
Modified files:
/php-src/ext/bz2bz2.c php_bz2.h
/php-src/ext/ctype ctype.c php_ctype.h
/php-src/ext/pspell php_pspell.h pspell.c
Log:
MFB (move static keywording from .h to .c)
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2.c?r1=1.27r2=1.28diff_format=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.27 php-src/ext/bz2/bz2.c:1.28
--- php-src/ext/bz2/bz2.c:1.27 Thu Oct 5 21:28:18 2006
+++ php-src/ext/bz2/bz2.c Sun Oct 8 00:05:17 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bz2.c,v 1.27 2006/10/05 21:28:18 pollita Exp $ */
+/* $Id: bz2.c,v 1.28 2006/10/08 00:05:17 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -40,6 +40,17 @@
#define PHP_BZ_ERRSTR 1
#define PHP_BZ_ERRBOTH 2
+static PHP_MINIT_FUNCTION(bz2);
+static PHP_MSHUTDOWN_FUNCTION(bz2);
+static PHP_MINFO_FUNCTION(bz2);
+static PHP_FUNCTION(bzopen);
+static PHP_FUNCTION(bzread);
+static PHP_FUNCTION(bzerrno);
+static PHP_FUNCTION(bzerrstr);
+static PHP_FUNCTION(bzerror);
+static PHP_FUNCTION(bzcompress);
+static PHP_FUNCTION(bzdecompress);
+
/* {{{ arginfo */
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_bzread, 0, 0, 1)
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/php_bz2.h?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/bz2/php_bz2.h
diff -u php-src/ext/bz2/php_bz2.h:1.9 php-src/ext/bz2/php_bz2.h:1.10
--- php-src/ext/bz2/php_bz2.h:1.9 Mon Aug 14 14:54:19 2006
+++ php-src/ext/bz2/php_bz2.h Sun Oct 8 00:05:17 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_bz2.h,v 1.9 2006/08/14 14:54:19 nlopess Exp $ */
+/* $Id: php_bz2.h,v 1.10 2006/10/08 00:05:17 bjori Exp $ */
#ifndef PHP_BZ2_H
#define PHP_BZ2_H
@@ -29,17 +29,6 @@
/* Bzip2 includes */
#include bzlib.h
-static PHP_MINIT_FUNCTION(bz2);
-static PHP_MSHUTDOWN_FUNCTION(bz2);
-static PHP_MINFO_FUNCTION(bz2);
-static PHP_FUNCTION(bzopen);
-static PHP_FUNCTION(bzread);
-static PHP_FUNCTION(bzerrno);
-static PHP_FUNCTION(bzerrstr);
-static PHP_FUNCTION(bzerror);
-static PHP_FUNCTION(bzcompress);
-static PHP_FUNCTION(bzdecompress);
-
#else
#define phpext_bz2_ptr NULL
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/ctype.c?r1=1.41r2=1.42diff_format=u
Index: php-src/ext/ctype/ctype.c
diff -u php-src/ext/ctype/ctype.c:1.41 php-src/ext/ctype/ctype.c:1.42
--- php-src/ext/ctype/ctype.c:1.41 Mon Aug 14 14:54:19 2006
+++ php-src/ext/ctype/ctype.c Sun Oct 8 00:05:17 2006
@@ -40,6 +40,20 @@
/* True global resources - no need for thread safety here */
/* static int le_ctype; */
+static PHP_MINFO_FUNCTION(ctype);
+
+static PHP_FUNCTION(ctype_alnum);
+static PHP_FUNCTION(ctype_alpha);
+static PHP_FUNCTION(ctype_cntrl);
+static PHP_FUNCTION(ctype_digit);
+static PHP_FUNCTION(ctype_lower);
+static PHP_FUNCTION(ctype_graph);
+static PHP_FUNCTION(ctype_print);
+static PHP_FUNCTION(ctype_punct);
+static PHP_FUNCTION(ctype_space);
+static PHP_FUNCTION(ctype_upper);
+static PHP_FUNCTION(ctype_xdigit);
+
/* {{{ arginfo */
static
ZEND_BEGIN_ARG_INFO(arginfo_ctype_alnum, 0)
http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/php_ctype.h?r1=1.14r2=1.15diff_format=u
Index: php-src/ext/ctype/php_ctype.h
diff -u php-src/ext/ctype/php_ctype.h:1.14 php-src/ext/ctype/php_ctype.h:1.15
--- php-src/ext/ctype/php_ctype.h:1.14 Mon Aug 14 14:54:19 2006
+++ php-src/ext/ctype/php_ctype.h Sun Oct 8 00:05:17 2006
@@ -33,24 +33,6 @@
#define PHP_CTYPE_API
#endif
-static PHP_MINIT_FUNCTION(ctype);
-static PHP_MSHUTDOWN_FUNCTION(ctype);
-static PHP_RINIT_FUNCTION(ctype);
-static PHP_RSHUTDOWN_FUNCTION(ctype);
-static PHP_MINFO_FUNCTION(ctype);
-
-static PHP_FUNCTION(ctype_alnum);
-static PHP_FUNCTION(ctype_alpha);
-static PHP_FUNCTION(ctype_cntrl);
-static PHP_FUNCTION(ctype_digit);
-static PHP_FUNCTION(ctype_lower);
-static PHP_FUNCTION(ctype_graph);
-static PHP_FUNCTION(ctype_print);
-static PHP_FUNCTION(ctype_punct);
-static PHP_FUNCTION(ctype_space);
-static PHP_FUNCTION(ctype_upper);
-static PHP_FUNCTION(ctype_xdigit);
-
/*
Declare any global variables you may need between the BEGIN
and END macros here:
http://cvs.php.net/viewvc.cgi/php-src/ext/pspell/php_pspell.h?r1=1.17r2=1.18diff_format=u
Index: php-src/ext/pspell/php_pspell.h
diff -u php-src/ext/pspell/php_pspell.h:1.17
php-src/ext/pspell/php_pspell.h:1.18
--- php-src/ext/pspell/php_pspell.h:1.17Mon Aug 14 14:54:19 2006
+++ php-src/ext/pspell/php_pspell.h Sun Oct 8 00:05:17 2006
@@ -16,35 +16,13 @@
+--+
*/
-/* $Id: php_pspell.h,v 1.17 2006/08/14 14:54:19 nlopess Exp $ */
+/* $Id: php_pspell.h,v 1.18 2006/10/08 00:05:17 bjori Exp $ */
#ifndef _PSPELL_H
#define _PSPELL_H
#if HAVE_PSPELL
extern zend_module_entry pspell_module_entry;
#define pspell_module_ptr
