[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu May 21 01:32:46 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3409r2=1.3410diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3409 php-src/ChangeLog:1.3410 --- php-src/ChangeLog:1.3409Wed May 20 01:32:40 2009 +++ php-src/ChangeLog Thu May 21 01:32:45 2009 @@ -1,3 +1,113 @@ +2009-05-20 Ilia Alshanetsky i...@prohost.org + +* ext/pdo_sqlite/sqlite_statement.c + ext/pdo_sqlite/sqlite_statement.c: + + MFB: Re-introduce the Matteo's patch and combine default text handling + since they appear to be the same irregardless on notes inside sqlite3.h + +* (PHP_5_2) + ext/pdo_sqlite/sqlite_statement.c: + Re-introduce the Matteo's patch and combine default text handling since + they appear to be the same irregardless on notes inside sqlite3.h + +* (PHP_5_3) + ext/mysqli/mysqli_api.c: + Fixed build + +2009-05-20 Jani Taskinen jani.taski...@sci.fi + +* (PHP_5_3) + ext/standard/dns.c: + - Sync with HEAD (thanks Hannes :) + +* ext/standard/dns.c: + - Fix non-windows builds too + +* (PHP_5_2) + ext/standard/basic_functions.c + ext/standard/dns.c + ext/standard/dns.h: + - Fix win32 build + +2009-05-20 Kalle Sommer Nielsen kalle@gmail.com + +* ext/pdo_dblib/pdo_dblib.c: + Fixed shared build + +2009-05-20 Arnaud Le Blanc arnaud...@gmail.com + +* ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt + ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt + ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt + sapi/cli/tests/006.phpt: + Fix skipif + +2009-05-20 Antony Dovgal t...@daylessday.org + +* (PHP_5_2) + ext/curl/interface.c + ext/curl/interface.c: + sync with HEAD + +* ext/curl/interface.c: + fix segfault + +2009-05-20 Arnaud Le Blanc arnaud...@gmail.com + +* (PHP_5_2) + run-tests.php + run-tests.php: + MFH: set default value of precision ini setting, + many tests depend on this + +* run-tests.php: + set default value of precision ini setting, + many tests depend on this + +* ext/sockets/tests/ipv6_skipif.inc + ext/sockets/tests/ipv6_skipif.inc + ext/sockets/tests/ipv6_skipif.inc + ext/sockets/tests/ipv6loop.phpt + ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt: +1.1.4; + Fix skipif + +* (PHP_5_2) + NEWS + ext/sockets/sockets.c + ext/sockets/sockets.c: + MFH: Fixed bug #48326 (constant MSG_DONTWAIT not defined) + +2009-05-20 Kalle Sommer Nielsen kalle@gmail.com + +* (PHP_5_3) + ext/mysql/php_mysql.c + ext/mysqli/mysqli_api.c + ext/mysqli/mysqli_prop.c + ext/pdo_mysql/mysql_statement.c: + MFH: Fix compiler warnings in ext/mysql, ext/mysqli and ext/pdo_mysql + +* ext/mysql/php_mysql.c + ext/mysqli/mysqli_api.c + ext/mysqli/mysqli_driver.c + ext/mysqli/mysqli_prop.c + ext/pdo_mysql/mysql_statement.c: + Fix compiler warnings in ext/mysql, ext/mysqli and ext/pdo_mysql + +* ext/imap/php_imap.c: + Nuke warnings (only in HEAD) + +* (PHP_5_3) + ext/standard/dns.c: + MFH: Fix Windows build, dns_get_record is defined in dns_win32.c, not here + +* ext/date/php_date.c: + Nuke newly introduced warning + +* ext/standard/dns.c: + Fix Windows build, dns_get_record is defined in dns_win32.c, not here + 2009-05-19 Derick Rethans p...@derickrethans.nl * ext/date/php_date.c: @@ -41055,7 +41165,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3409 2009/05/20 01:32:40 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3410 2009/05/21 01:32:45 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
Re: [PHP-CVS] cvs: php-src /ext/curl interface.c
On 18.05.2009 16:03, Pierre-Alain Joye wrote:
while (*p != NULL) {
- add_next_index_ascii_string(protocol_list, *p, 1);
- *p++;
+ add_next_index_ascii_string(protocol_list, *p++, 1);
HEAD chokes on this line.
Program terminated with signal 11, Segmentation fault.
#0 0x7f2b3a0e39c0 in u_charsToUChars_4_0 () from /usr/lib64/libicuuc.so.40
(gdb) bt
#0 0x7f2b3a0e39c0 in u_charsToUChars_4_0 () from /usr/lib64/libicuuc.so.40
#1 0x0056c46e in zend_ascii_to_unicode (cs=0x0, cs_size=5,
__zend_filename=0x9efd10 /local/qa/head/ext/curl/interface.c,
__zend_lineno=1296)
at /local/qa/head/Zend/zend_unicode.h:157
#2 0x0056c366 in zif_curl_version (ht=0, return_value=0x11c4e70,
return_value_ptr=0x7f2b3cc62138, this_ptr=0x0, return_value_used=1)
at /local/qa/head/ext/curl/interface.c:1296
#3 0x0089dc41 in zend_do_fcall_common_helper_SPEC
(execute_data=0x7f2b3cc62090) at /local/qa/head/Zend/zend_vm_execute.h:321
#4 0x008a31f3 in ZEND_DO_FCALL_SPEC_CONST_HANDLER
(execute_data=0x7f2b3cc62090) at /local/qa/head/Zend/zend_vm_execute.h:1588
#5 0x0089cebc in execute (op_array=0x11c5ad8) at
/local/qa/head/Zend/zend_vm_execute.h:104
#6 0x008617ac in zend_execute_scripts (type=8, retval=0x0,
file_count=3) at /local/qa/head/Zend/zend.c:1752
#7 0x007d9df2 in php_execute_script (primary_file=0x7fff44d972f0) at
/local/qa/head/main/main.c:2298
#8 0x00958999 in main (argc=60, argv=0x7fff44d97538) at
/local/qa/head/sapi/cli/php_cli.c:1192
(gdb) f 2
#2 0x0056c366 in zif_curl_version (ht=0, return_value=0x11c4e70,
return_value_ptr=0x7f2b3cc62138, this_ptr=0x0, return_value_used=1)
at /local/qa/head/ext/curl/interface.c:1296
1296add_next_index_ascii_string(protocol_list,
*p++, 1);
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dns.c
kalle Wed May 20 08:16:56 2009 UTC
Modified files:
/php-src/ext/standard dns.c
Log:
Fix Windows build, dns_get_record is defined in dns_win32.c, not here
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.107r2=1.108diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.107 php-src/ext/standard/dns.c:1.108
--- php-src/ext/standard/dns.c:1.107Tue May 19 11:12:01 2009
+++ php-src/ext/standard/dns.c Wed May 20 08:16:56 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.107 2009/05/19 11:12:01 jani Exp $ */
+/* $Id: dns.c,v 1.108 2009/05/20 08:16:56 kalle Exp $ */
/* {{{ includes */
#include php.h
@@ -278,7 +278,7 @@
#define PHP_DNS_ALL
(PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_)
#endif /* HAVE_DNS_FUNCS || defined(PHP_WIN32) */
-#if defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
+#if !defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
/* {{{ proto bool dns_check_record(string host [, string type]) U
Check DNS records corresponding to a given Internet host name or IP address
*/
--
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
kalle Wed May 20 08:18:07 2009 UTC
Modified files:
/php-src/ext/date php_date.c
Log:
Nuke newly introduced warning
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.234r2=1.235diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.234 php-src/ext/date/php_date.c:1.235
--- php-src/ext/date/php_date.c:1.234 Tue May 19 19:43:44 2009
+++ php-src/ext/date/php_date.c Wed May 20 08:18:07 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.234 2009/05/19 19:43:44 derick Exp $ */
+/* $Id: php_date.c,v 1.235 2009/05/20 08:18:07 kalle Exp $ */
#include php.h
#include php_streams.h
@@ -826,8 +826,6 @@
/* {{{ Helper functions */
static char* guess_timezone(const timelib_tzdb *tzdb TSRMLS_DC)
{
- char *env;
-
/* Checking configure timezone */
if (DATEG(timezone) (strlen(DATEG(timezone)) 0)) {
return DATEG(timezone);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard dns.c
kalle Wed May 20 08:18:48 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dns.c
Log:
MFH: Fix Windows build, dns_get_record is defined in dns_win32.c, not here
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.5.2.21r2=1.70.2.7.2.5.2.22diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.7.2.5.2.21
php-src/ext/standard/dns.c:1.70.2.7.2.5.2.22
--- php-src/ext/standard/dns.c:1.70.2.7.2.5.2.21Tue May 19 11:12:20 2009
+++ php-src/ext/standard/dns.c Wed May 20 08:18:48 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.70.2.7.2.5.2.21 2009/05/19 11:12:20 jani Exp $ */
+/* $Id: dns.c,v 1.70.2.7.2.5.2.22 2009/05/20 08:18:48 kalle Exp $ */
/* {{{ includes */
#include php.h
@@ -277,7 +277,7 @@
# define PHP_DNS_ALL
(PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_)
#endif /* HAVE_DNS_FUNCS || defined(PHP_WIN32) */
-#if defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
+#if !defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
/* {{{ proto bool dns_check_record(string host [, string type])
Check DNS records corresponding to a given Internet host name or IP address
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap php_imap.c
kalle Wed May 20 08:22:38 2009 UTC
Modified files:
/php-src/ext/imap php_imap.c
Log:
Nuke warnings (only in HEAD)
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.289r2=1.290diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.289 php-src/ext/imap/php_imap.c:1.290
--- php-src/ext/imap/php_imap.c:1.289 Tue May 5 01:44:08 2009
+++ php-src/ext/imap/php_imap.c Wed May 20 08:22:38 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski z...@zend.com |
+--+
*/
-/* $Id: php_imap.c,v 1.289 2009/05/05 01:44:08 jani Exp $ */
+/* $Id: php_imap.c,v 1.290 2009/05/20 08:22:38 kalle Exp $ */
#define IMAP41
@@ -3368,7 +3368,7 @@
PHP_FUNCTION(imap_mail_compose)
{
zval *envelope, *body;
- char *key;
+ zstr key;
zval **data, **pvalue, **disp_data, **env_data;
ulong ind;
char *cookie = NIL;
@@ -3482,7 +3482,7 @@
while
(zend_hash_get_current_data(Z_ARRVAL_PP(pvalue), (void **) disp_data) ==
SUCCESS) {
disp_param = mail_newbody_parameter();
zend_hash_get_current_key(Z_ARRVAL_PP(pvalue), key, ind, 0);
- disp_param-attribute = cpystr(key);
+ disp_param-attribute = cpystr(key.s);
convert_to_string_ex(disp_data);
disp_param-value = (char *)
fs_get(Z_STRLEN_PP(disp_data) + 1);
memcpy(disp_param-value,
Z_STRVAL_PP(disp_data), Z_STRLEN_PP(disp_data) + 1);
@@ -3516,7 +3516,7 @@
while
(zend_hash_get_current_data(Z_ARRVAL_PP(pvalue), (void **) disp_data) ==
SUCCESS) {
disp_param = mail_newbody_parameter();
zend_hash_get_current_key(Z_ARRVAL_PP(pvalue), key, ind, 0);
- disp_param-attribute = cpystr(key);
+ disp_param-attribute = cpystr(key.s);
convert_to_string_ex(disp_data);
disp_param-value = (char *)
fs_get(Z_STRLEN_PP(disp_data) + 1);
memcpy(disp_param-value,
Z_STRVAL_PP(disp_data), Z_STRLEN_PP(disp_data) + 1);
@@ -3595,7 +3595,7 @@
while
(zend_hash_get_current_data(Z_ARRVAL_PP(pvalue), (void **) disp_data) ==
SUCCESS) {
disp_param =
mail_newbody_parameter();
zend_hash_get_current_key(Z_ARRVAL_PP(pvalue), key, ind, 0);
- disp_param-attribute =
cpystr(key);
+ disp_param-attribute =
cpystr(key.s);
convert_to_string_ex(disp_data);
disp_param-value = (char *)
fs_get(Z_STRLEN_PP(disp_data) + 1);
memcpy(disp_param-value,
Z_STRVAL_PP(disp_data), Z_STRLEN_PP(disp_data) + 1);
@@ -3629,7 +3629,7 @@
while
(zend_hash_get_current_data(Z_ARRVAL_PP(pvalue), (void **) disp_data) ==
SUCCESS) {
disp_param =
mail_newbody_parameter();
zend_hash_get_current_key(Z_ARRVAL_PP(pvalue), key, ind, 0);
- disp_param-attribute =
cpystr(key);
+ disp_param-attribute =
cpystr(key.s);
convert_to_string_ex(disp_data);
disp_param-value = (char *)
fs_get(Z_STRLEN_PP(disp_data) + 1);
memcpy(disp_param-value,
Z_STRVAL_PP(disp_data), Z_STRLEN_PP(disp_data) + 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysql php_mysql.c /ext/mysqli mysqli_api.c mysqli_driver.c mysqli_prop.c /ext/pdo_mysql mysql_statement.c
kalle Wed May 20 08:29:23 2009 UTC
Modified files:
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli_api.c mysqli_driver.c mysqli_prop.c
/php-src/ext/pdo_mysql mysql_statement.c
Log:
Fix compiler warnings in ext/mysql, ext/mysqli and ext/pdo_mysql
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.276r2=1.277diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.276 php-src/ext/mysql/php_mysql.c:1.277
--- php-src/ext/mysql/php_mysql.c:1.276 Fri Mar 27 22:22:02 2009
+++ php-src/ext/mysql/php_mysql.c Wed May 20 08:29:22 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.276 2009/03/27 22:22:02 tony2001 Exp $ */
+/* $Id: php_mysql.c,v 1.277 2009/05/20 08:29:22 kalle Exp $ */
/* TODO:
*
@@ -625,7 +625,9 @@
int hashed_details_length, port = MYSQL_PORT;
long client_flags = 0;
php_mysql_conn *mysql=NULL;
+#if !defined(MYSQL_USE_MYSQLND) !defined(MYSQL_HASH_SET_CHARSET)
char *encoding;
+#endif
#if MYSQL_VERSION_ID = 32230
void (*handler) (int);
#endif
@@ -1185,7 +1187,7 @@
}
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id,
MySQL-Link, le_link, le_plink);
- RETURN_LONG(mysql_thread_id(mysql-conn));
+ RETURN_LONG((long) mysql_thread_id(mysql-conn));
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.173r2=1.174diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.173
php-src/ext/mysqli/mysqli_api.c:1.174
--- php-src/ext/mysqli/mysqli_api.c:1.173 Fri Mar 27 19:28:26 2009
+++ php-src/ext/mysqli/mysqli_api.c Wed May 20 08:29:23 2009
@@ -17,7 +17,7 @@
| Ulf Wendel u...@php.net |
+--+
- $Id: mysqli_api.c,v 1.173 2009/03/27 19:28:26 felipe Exp $
+ $Id: mysqli_api.c,v 1.174 2009/05/20 08:29:23 kalle Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -158,7 +158,7 @@
int mysqli_stmt_bind_param_do_bind(MY_STMT *stmt, unsigned int argc, unsigned
int num_vars,
zval
***args, unsigned int start, const char * const types TSRMLS_DC)
{
- int i;
+ unsigned int i;
MYSQLND_PARAM_BIND *params;
enum_func_statusret = FAIL;
@@ -1123,7 +1123,7 @@
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result,
mysqli_result, MYSQLI_STATUS_VALID);
- if (offset 0 || offset = mysql_num_fields(result)) {
+ if (offset 0 || offset = (long) mysql_num_fields(result)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Field offset is
invalid for resultset);
RETURN_FALSE;
}
@@ -2142,7 +2142,7 @@
return;
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, mysql_link, mysqli_link,
MYSQLI_STATUS_INITIALIZED);
- RETURN_BOOL(!mysql_refresh(mysql-mysql, options));
+ RETURN_BOOL(!mysql_refresh(mysql-mysql, (uint8_t) options));
}
/* }}} */
@@ -2416,7 +2416,7 @@
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, mysql_link, mysqli_link,
MYSQLI_STATUS_VALID);
- RETURN_LONG(mysql_thread_id(mysql-mysql));
+ RETURN_LONG((long) mysql_thread_id(mysql-mysql));
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_driver.c?r1=1.18r2=1.19diff_format=u
Index: php-src/ext/mysqli/mysqli_driver.c
diff -u php-src/ext/mysqli/mysqli_driver.c:1.18
php-src/ext/mysqli/mysqli_driver.c:1.19
--- php-src/ext/mysqli/mysqli_driver.c:1.18 Wed Dec 31 11:12:33 2008
+++ php-src/ext/mysqli/mysqli_driver.c Wed May 20 08:29:23 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqli_driver.c,v 1.18 2008/12/31 11:12:33 sebastian Exp $ */
+/* $Id: mysqli_driver.c,v 1.19 2009/05/20 08:29:23 kalle Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -134,12 +134,14 @@
ZEND_FUNCTION(mysqli_driver_construct)
{
+#if G0
MYSQLI_RESOURCE *mysqli_resource;
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1,
sizeof(MYSQLI_RESOURCE));
mysqli_resource-ptr = 1;
mysqli_resource-status = (ZEND_NUM_ARGS() == 1) ?
MYSQLI_STATUS_INITIALIZED : MYSQLI_STATUS_VALID;
((mysqli_object *) zend_object_store_get_object(getThis()
TSRMLS_CC))-ptr = mysqli_resource;
+#endif
}
const mysqli_property_entry mysqli_driver_property_entries[] = {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_prop.c?r1=1.42r2=1.43diff_format=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.42
php-src/ext/mysqli/mysqli_prop.c:1.43
--- php-src/ext/mysqli/mysqli_prop.c:1.42 Mon Jan 12 12:54:17 2009
+++
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql php_mysql.c /ext/mysqli mysqli_api.c mysqli_prop.c /ext/pdo_mysql mysql_statement.c
kalle Wed May 20 08:30:12 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli_api.c mysqli_prop.c
/php-src/ext/pdo_mysql mysql_statement.c
Log:
MFH: Fix compiler warnings in ext/mysql, ext/mysqli and ext/pdo_mysql
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.36r2=1.213.2.6.2.16.2.37diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.36
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.37
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.36 Wed Mar 25 10:27:38 2009
+++ php-src/ext/mysql/php_mysql.c Wed May 20 08:30:12 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.36 2009/03/25 10:27:38 johannes Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.37 2009/05/20 08:30:12 kalle Exp $ */
/* TODO:
*
@@ -1166,7 +1166,7 @@
}
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id,
MySQL-Link, le_link, le_plink);
- RETURN_LONG(mysql_thread_id(mysql-conn));
+ RETURN_LONG((long) mysql_thread_id(mysql-conn));
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.24r2=1.118.2.22.2.16.2.25diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.24
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.25
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.24Thu Jan 22
21:01:56 2009
+++ php-src/ext/mysqli/mysqli_api.c Wed May 20 08:30:12 2009
@@ -17,7 +17,7 @@
| Ulf Wendel u...@php.net |
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.24 2009/01/22 21:01:56 johannes Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.25 2009/05/20 08:30:12 kalle Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -158,7 +158,7 @@
int mysqli_stmt_bind_param_do_bind(MY_STMT *stmt, unsigned int argc, unsigned
int num_vars,
zval
***args, unsigned int start, const char * const types TSRMLS_DC)
{
- int i;
+ unsigned int i;
MYSQLND_PARAM_BIND *params;
enum_func_statusret = FAIL;
@@ -1074,7 +1074,7 @@
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result,
mysqli_result, MYSQLI_STATUS_VALID);
- if (offset 0 || offset = mysql_num_fields(result)) {
+ if (offset 0 || offset = (long) mysql_num_fields(result)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Field offset is
invalid for resultset);
RETURN_FALSE;
}
@@ -2081,7 +2081,7 @@
return;
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, mysql_link, mysqli_link,
MYSQLI_STATUS_INITIALIZED);
- RETURN_BOOL(!mysql_refresh(mysql-mysql, options));
+ RETURN_BOOL(!mysql_refresh(mysql-mysql, (uint8_t) options));
}
/* }}} */
@@ -2354,7 +2354,7 @@
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, mysql_link, mysqli_link,
MYSQLI_STATUS_VALID);
- RETURN_LONG(mysql_thread_id(mysql-mysql));
+ RETURN_LONG((long) mysql_thread_id(mysql-mysql));
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_prop.c?r1=1.23.2.5.2.2.2.11r2=1.23.2.5.2.2.2.12diff_format=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.23.2.5.2.2.2.11
php-src/ext/mysqli/mysqli_prop.c:1.23.2.5.2.2.2.12
--- php-src/ext/mysqli/mysqli_prop.c:1.23.2.5.2.2.2.11 Mon Jan 12 12:56:01 2009
+++ php-src/ext/mysqli/mysqli_prop.cWed May 20 08:30:12 2009
@@ -15,7 +15,7 @@
| Author: Georg Richter ge...@php.net|
+--+
- $Id: mysqli_prop.c,v 1.23.2.5.2.2.2.11 2009/01/12 12:56:01 johannes Exp $
+ $Id: mysqli_prop.c,v 1.23.2.5.2.2.2.12 2009/05/20 08:30:12 kalle Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -83,7 +83,7 @@
} else {\
l = (__ret_type)__int_func(p);\
if (l LONG_MAX) {\
- ZVAL_LONG(*retval, l);\
+ ZVAL_LONG(*retval, (long) l);\
} else { \
char *ret; \
int ret_len = spprintf(ret, 0, __ret_type_sprint_mod,
l); \
@@ -156,7 +156,7 @@
static int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
MY_MYSQL *mysql;
- my_ulonglong rc;
+ long rc;
MAKE_STD_ZVAL(*retval);
@@ -169,9 +169,9 @@
} else {
CHECK_STATUS(MYSQLI_STATUS_VALID);
- rc = mysql_affected_rows(mysql-mysql);
+ rc = (long) mysql_affected_rows(mysql-mysql);
-
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sockets sockets.c
lbarnaudWed May 20 09:05:46 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/socketssockets.c Log: MFH: Fixed bug #48326 (constant MSG_DONTWAIT not defined) http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.14.2.18r2=1.171.2.9.2.14.2.19diff_format=u Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.18 php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.19 --- php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.18 Sun May 10 01:03:45 2009 +++ php-src/ext/sockets/sockets.c Wed May 20 09:05:46 2009 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: sockets.c,v 1.171.2.9.2.14.2.18 2009/05/10 01:03:45 felipe Exp $ */ +/* $Id: sockets.c,v 1.171.2.9.2.14.2.19 2009/05/20 09:05:46 lbarnaud Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -620,6 +620,9 @@ REGISTER_LONG_CONSTANT(SOCK_RDM, SOCK_RDM, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MSG_OOB, MSG_OOB, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MSG_WAITALL, MSG_WAITALL,CONST_CS | CONST_PERSISTENT); +#ifdef MSG_DONTWAIT + REGISTER_LONG_CONSTANT(MSG_DONTWAIT, MSG_DONTWAIT, CONST_CS | CONST_PERSISTENT); +#endif REGISTER_LONG_CONSTANT(MSG_PEEK, MSG_PEEK, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MSG_DONTROUTE, MSG_DONTROUTE, CONST_CS | CONST_PERSISTENT); #ifdef MSG_EOR -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/sockets sockets.c
lbarnaudWed May 20 09:06:32 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/socketssockets.c /php-srcNEWS Log: MFH: Fixed bug #48326 (constant MSG_DONTWAIT not defined) http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.24r2=1.171.2.9.2.25diff_format=u Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.24 php-src/ext/sockets/sockets.c:1.171.2.9.2.25 --- php-src/ext/sockets/sockets.c:1.171.2.9.2.24Sun May 10 01:07:01 2009 +++ php-src/ext/sockets/sockets.c Wed May 20 09:06:31 2009 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: sockets.c,v 1.171.2.9.2.24 2009/05/10 01:07:01 felipe Exp $ */ +/* $Id: sockets.c,v 1.171.2.9.2.25 2009/05/20 09:06:31 lbarnaud Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -484,6 +484,9 @@ REGISTER_LONG_CONSTANT(SOCK_RDM, SOCK_RDM, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MSG_OOB, MSG_OOB, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MSG_WAITALL, MSG_WAITALL,CONST_CS | CONST_PERSISTENT); +#ifdef MSG_DONTWAIT + REGISTER_LONG_CONSTANT(MSG_DONTWAIT, MSG_DONTWAIT, CONST_CS | CONST_PERSISTENT); +#endif REGISTER_LONG_CONSTANT(MSG_PEEK, MSG_PEEK, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MSG_DONTROUTE, MSG_DONTROUTE, CONST_CS | CONST_PERSISTENT); #ifdef MSG_EOR http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1514r2=1.2027.2.547.2.1515diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1514 php-src/NEWS:1.2027.2.547.2.1515 --- php-src/NEWS:1.2027.2.547.2.1514Mon May 18 18:46:06 2009 +++ php-src/NEWSWed May 20 09:06:31 2009 @@ -16,6 +16,7 @@ - Fixed segfault on invalid session.save_path. (Hannes) - Fixed leaks in imap when a mail_criteria is used. (Pierre) +- Fixed bug #48326 (constant MSG_DONTWAIT not defined). (Arnaud) - Fixed bug #48313 (fgetcsv() does not return null for empty rows). (Ilia) - Fixed bug #48309 (stream_copy_to_stream() and fpasstru() do not update stream position of plain files). (Arnaud) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sockets/tests ipv6_skipif.inc ipv6loop.phpt socket_sentto_recvfrom_ipv6_udp.phpt
lbarnaudWed May 20 09:13:08 2009 UTC
Added files:
/php-src/ext/sockets/tests ipv6_skipif.inc
Modified files:
/php-src/ext/sockets/tests ipv6loop.phpt
socket_sentto_recvfrom_ipv6_udp.phpt
Log:
Fix skipif
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv6loop.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/sockets/tests/ipv6loop.phpt
diff -u php-src/ext/sockets/tests/ipv6loop.phpt:1.4
php-src/ext/sockets/tests/ipv6loop.phpt:1.5
--- php-src/ext/sockets/tests/ipv6loop.phpt:1.4 Wed Jul 16 14:08:04 2008
+++ php-src/ext/sockets/tests/ipv6loop.phpt Wed May 20 09:13:08 2009
@@ -5,9 +5,7 @@
if (!extension_loaded('sockets')) {
die('skip sockets extension not available.');
}
- if (!defined(AF_INET6)) {
- die('skip no IPv6 support');
- }
+ require 'ipv6_skipif.inc';
?
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
diff -u php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt:1.1
php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt:1.2
--- php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt:1.1 Sun May
17 18:07:36 2009
+++ php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt Wed May
20 09:13:08 2009
@@ -5,6 +5,7 @@
if (!extension_loaded('sockets')) {
die('SKIP The sockets extension is not loaded.');
}
+require 'ipv6_skipif.inc';
--FILE--
?php
$socket = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP);
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv6_skipif.inc?view=markuprev=1.1
Index: php-src/ext/sockets/tests/ipv6_skipif.inc
+++ php-src/ext/sockets/tests/ipv6_skipif.inc
?php
if (!defined(AF_INET6)) {
die('skip no IPv6 support');
}
/* If IPv6 is supported on the platform this will error out with code 111 -
Connection refused.
If IPv6 is NOT supported, $errno will be set to something else (indicating
parse/getaddrinfo error) */
@stream_socket_client('tcp://[::1]:0', $errno);
if ($errno != 111) die('skip no IPv6 support');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sockets/tests ipv6_skipif.inc ipv6loop.phpt socket_sentto_recvfrom_ipv6_udp.phpt
lbarnaudWed May 20 09:13:29 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/sockets/tests ipv6_skipif.inc
Modified files:
/php-src/ext/sockets/tests ipv6loop.phpt
socket_sentto_recvfrom_ipv6_udp.phpt
Log:
MFH: Fix skipif
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv6loop.phpt?r1=1.2.6.1.2.1r2=1.2.6.1.2.2diff_format=u
Index: php-src/ext/sockets/tests/ipv6loop.phpt
diff -u php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.1.2.1
php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.1.2.2
--- php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.1.2.1 Wed Jul 16 14:08:38 2008
+++ php-src/ext/sockets/tests/ipv6loop.phpt Wed May 20 09:13:29 2009
@@ -5,9 +5,7 @@
if (!extension_loaded('sockets')) {
die('skip sockets extension not available.');
}
- if (!defined(AF_INET6)) {
- die('skip no IPv6 support');
- }
+ require 'ipv6_skipif.inc';
?
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
diff -u php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt:1.1.2.2
php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt:1.1.2.3
--- php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt:1.1.2.2
Sun May 17 18:08:09 2009
+++ php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt Wed May
20 09:13:29 2009
@@ -5,6 +5,7 @@
if (!extension_loaded('sockets')) {
die('SKIP The sockets extension is not loaded.');
}
+require 'ipv6_skipif.inc';
--FILE--
?php
$socket = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP);
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv6_skipif.inc?view=markuprev=1.1
Index: php-src/ext/sockets/tests/ipv6_skipif.inc
+++ php-src/ext/sockets/tests/ipv6_skipif.inc
?php
if (!defined(AF_INET6)) {
die('skip no IPv6 support');
}
/* If IPv6 is supported on the platform this will error out with code 111 -
Connection refused.
If IPv6 is NOT supported, $errno will be set to something else (indicating
parse/getaddrinfo error) */
@stream_socket_client('tcp://[::1]:0', $errno);
if ($errno != 111) die('skip no IPv6 support');
--
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/sockets/tests ipv6_skipif.inc ipv6loop.phpt socket_sentto_recvfrom_ipv6_udp.phpt
lbarnaudWed May 20 09:13:39 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/sockets/tests ipv6_skipif.inc
Modified files:
/php-src/ext/sockets/tests ipv6loop.phpt
socket_sentto_recvfrom_ipv6_udp.phpt
Log:
MFH: Fix skipif
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv6loop.phpt?r1=1.2.6.2r2=1.2.6.3diff_format=u
Index: php-src/ext/sockets/tests/ipv6loop.phpt
diff -u php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.2
php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.3
--- php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.2 Wed Jul 16 14:10:50 2008
+++ php-src/ext/sockets/tests/ipv6loop.phpt Wed May 20 09:13:39 2009
@@ -5,9 +5,7 @@
if (!extension_loaded('sockets')) {
die('skip sockets extension not available.');
}
- if (!defined(AF_INET6)) {
- die('skip no IPv6 support');
- }
+ require 'ipv6_skipif.inc';
?
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
diff -u php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt:1.1.4.2
php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt:1.1.4.3
--- php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt:1.1.4.2
Sun May 17 18:08:27 2009
+++ php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt Wed May
20 09:13:39 2009
@@ -5,6 +5,7 @@
if (!extension_loaded('sockets')) {
die('SKIP The sockets extension is not loaded.');
}
+require 'ipv6_skipif.inc';
--FILE--
?php
$socket = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP);
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv6_skipif.inc?view=markuprev=1.1
Index: php-src/ext/sockets/tests/ipv6_skipif.inc
+++ php-src/ext/sockets/tests/ipv6_skipif.inc
?php
if (!defined(AF_INET6)) {
die('skip no IPv6 support');
}
/* If IPv6 is supported on the platform this will error out with code 111 -
Connection refused.
If IPv6 is NOT supported, $errno will be set to something else (indicating
parse/getaddrinfo error) */
@stream_socket_client('tcp://[::1]:0', $errno);
if ($errno != 111) die('skip no IPv6 support');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
lbarnaudWed May 20 09:22:24 2009 UTC Modified files: /php-srcrun-tests.php Log: set default value of precision ini setting, many tests depend on this http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.397r2=1.398diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.397 php-src/run-tests.php:1.398 --- php-src/run-tests.php:1.397 Mon May 18 14:07:59 2009 +++ php-src/run-tests.php Wed May 20 09:22:24 2009 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.397 2009/05/18 14:07:59 bjori Exp $ */ +/* $Id: run-tests.php,v 1.398 2009/05/20 09:22:24 lbarnaud Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -230,6 +230,7 @@ 'auto_append_file=', 'magic_quotes_runtime=0', 'ignore_repeated_errors=0', + 'precision=14', 'unicode.runtime_encoding=ISO-8859-1', 'unicode.script_encoding=UTF-8', 'unicode.output_encoding=UTF-8', @@ -633,7 +634,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.397 $' . \n; + echo '$Revision: 1.398 $' . \n; exit(1); default: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
lbarnaudWed May 20 09:22:50 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcrun-tests.php Log: MFH: set default value of precision ini setting, many tests depend on this http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.66r2=1.226.2.37.2.35.2.67diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.66 php-src/run-tests.php:1.226.2.37.2.35.2.67 --- php-src/run-tests.php:1.226.2.37.2.35.2.66 Mon May 18 14:08:23 2009 +++ php-src/run-tests.php Wed May 20 09:22:50 2009 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.66 2009/05/18 14:08:23 bjori Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.67 2009/05/20 09:22:50 lbarnaud Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -230,6 +230,7 @@ 'auto_append_file=', 'magic_quotes_runtime=0', 'ignore_repeated_errors=0', + 'precision=14', 'unicode.runtime_encoding=ISO-8859-1', 'unicode.script_encoding=UTF-8', 'unicode.output_encoding=UTF-8', @@ -633,7 +634,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.66 $' . \n; + echo '$Revision: 1.226.2.37.2.35.2.67 $' . \n; exit(1); default: -- 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) / run-tests.php
lbarnaudWed May 20 09:23:15 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcrun-tests.php Log: MFH: set default value of precision ini setting, many tests depend on this http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.64r2=1.226.2.37.2.65diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.64 php-src/run-tests.php:1.226.2.37.2.65 --- php-src/run-tests.php:1.226.2.37.2.64 Mon May 18 14:08:56 2009 +++ php-src/run-tests.php Wed May 20 09:23:15 2009 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.64 2009/05/18 14:08:56 bjori Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.65 2009/05/20 09:23:15 lbarnaud Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -230,6 +230,7 @@ 'auto_append_file=', 'magic_quotes_runtime=0', 'ignore_repeated_errors=0', + 'precision=14', 'unicode.runtime_encoding=ISO-8859-1', 'unicode.script_encoding=UTF-8', 'unicode.output_encoding=UTF-8', @@ -633,7 +634,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.64 $' . \n; + echo '$Revision: 1.226.2.37.2.65 $' . \n; exit(1); default: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
tony2001Wed May 20 09:26:04 2009 UTC
Modified files:
/php-src/ext/curl interface.c
Log:
fix segfault
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.164r2=1.165diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.164 php-src/ext/curl/interface.c:1.165
--- php-src/ext/curl/interface.c:1.164 Tue May 19 18:08:13 2009
+++ php-src/ext/curl/interface.cWed May 20 09:26:03 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.164 2009/05/19 18:08:13 kalle Exp $ */
+/* $Id: interface.c,v 1.165 2009/05/20 09:26:03 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1293,7 +1293,8 @@
array_init(protocol_list);
while (*p != NULL) {
- add_next_index_ascii_string(protocol_list, *p++, 1);
+ add_next_index_ascii_string(protocol_list, *p, 1);
+ p++;
}
CAAZ(protocols, protocol_list);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/curl interface.c
tony2001Wed May 20 09:26:12 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/curl interface.c
Log:
sync with HEAD
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.47r2=1.62.2.14.2.27.2.48diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.47
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.48
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.47Tue May 19 18:08:57 2009
+++ php-src/ext/curl/interface.cWed May 20 09:26:12 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.14.2.27.2.47 2009/05/19 18:08:57 kalle Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.48 2009/05/20 09:26:12 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1290,7 +1290,8 @@
array_init(protocol_list);
while (*p != NULL) {
- add_next_index_string(protocol_list, *p++, 1);
+ add_next_index_string(protocol_list, *p, 1);
+ p++;
}
CAAZ(protocols, protocol_list);
}
--
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/curl interface.c
tony2001Wed May 20 09:26:21 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl interface.c
Log:
sync with HEAD
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.48r2=1.62.2.14.2.49diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.48
php-src/ext/curl/interface.c:1.62.2.14.2.49
--- php-src/ext/curl/interface.c:1.62.2.14.2.48 Tue May 19 13:50:32 2009
+++ php-src/ext/curl/interface.cWed May 20 09:26:20 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.14.2.48 2009/05/19 13:50:32 jani Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.49 2009/05/20 09:26:20 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1094,7 +1094,8 @@
array_init(protocol_list);
while (*p != NULL) {
- add_next_index_string(protocol_list, *p++, 1);
+ add_next_index_string(protocol_list, *p, 1);
+ p++;
}
CAAZ(protocols, protocol_list);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mysql php_mysql.c /ext/mysqli mysqli_api.c mysqli_driver.c mysqli_prop.c /ext/pdo_mysql mysql_statement.c
Hi,
Kalle Sommer Nielsen wrote:
kalle Wed May 20 08:29:23 2009 UTC
Modified files:
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli_api.c mysqli_driver.c mysqli_prop.c
/php-src/ext/pdo_mysql mysql_statement.c
Log:
Fix compiler warnings in ext/mysql, ext/mysqli and ext/pdo_mysql
- if (rc == (my_ulonglong)-1) {
+ if (rc == (long)-1) {
This is not correct. Maybe you have 64bit box, but 32bit machines are
still out there and this will be bad. my_ulonglong is 8 byte and -1,
will be the max value 2^64-1, long is 4 byte and even when it is 8 byte,
(long) -1 will be -1, not 2^64-1, so I think it would be better to
revert these changes! Especially when the come after RC2
This is also wrong:
- row_count = mysql_stmt_affected_rows(S-stmt);
- if (row_count != (my_ulonglong)-1) {
+ row_count = (long) mysql_stmt_affected_rows(S-stmt);
+ if (row_count != (long)-1) {
There are a few places where you have done the same mistake and they
should be reverted.
Andrey
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap/tests/interop/Round2/Base r2_base_005p.phpt r2_base_005s.phpt r2_base_005w.phpt /sapi/cli/tests 006.phpt
lbarnaudWed May 20 10:08:23 2009 UTC
Modified files:
/php-src/ext/soap/tests/interop/Round2/Base r2_base_005p.phpt
r2_base_005s.phpt
r2_base_005w.phpt
/php-src/sapi/cli/tests 006.phpt
Log:
Fix skipif
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt
diff -u php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt:1.3
php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt:1.4
--- php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt:1.3Sat May
24 15:13:09 2008
+++ php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phptWed May
20 10:08:23 2009
@@ -2,6 +2,7 @@
SOAP Interop Round2 base 005 (php/direct): echoString(utf-8)
--SKIPIF--
?php require_once('skipif.inc'); ?
+?php if (!function_exists('utf8_encode')) die('skip utf8_encode() not
available'); ?
--FILE--
?php
$client = new
SoapClient(NULL,array(location=test://,uri=http://soapinterop.org/,trace=1,exceptions=0));
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt
diff -u php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt:1.3
php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt:1.4
--- php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt:1.3Sat May
24 15:13:09 2008
+++ php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phptWed May
20 10:08:23 2009
@@ -2,6 +2,7 @@
SOAP Interop Round2 base 005 (soap/direct): echoString(utf-8)
--SKIPIF--
?php require_once('skipif.inc'); ?
+?php if (!function_exists('utf8_encode')) die('skip utf8_encode() not
available'); ?
--FILE--
?php
$client = new
SoapClient(NULL,array(location=test://,uri=http://soapinterop.org/,trace=1,exceptions=0));
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt
diff -u php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt:1.4
php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt:1.5
--- php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt:1.4Sat May
24 15:13:09 2008
+++ php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phptWed May
20 10:08:23 2009
@@ -2,6 +2,7 @@
SOAP Interop Round2 base 005 (php/wsdl): echoString(utf-8)
--SKIPIF--
?php require_once('skipif.inc'); ?
+?php if (!function_exists('utf8_encode')) die('skip utf8_encode() not
available'); ?
--INI--
soap.wsdl_cache_enabled=0
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/006.phpt?r1=1.13r2=1.14diff_format=u
Index: php-src/sapi/cli/tests/006.phpt
diff -u php-src/sapi/cli/tests/006.phpt:1.13
php-src/sapi/cli/tests/006.phpt:1.14
--- php-src/sapi/cli/tests/006.phpt:1.13Sat Aug 30 11:32:12 2008
+++ php-src/sapi/cli/tests/006.phpt Wed May 20 10:08:23 2009
@@ -3,7 +3,7 @@
--SKIPIF--
?php
include skipif.inc;
-if (!extension_loaded(reflection)) {
+if (!extension_loaded(reflection) || !extension_loaded(session)) {
die(skip);
}
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/soap/tests/interop/Round2/Base r2_base_005p.phpt r2_base_005s.phpt r2_base_005w.phpt /sapi/cli/tests 006.phpt
lbarnaudWed May 20 10:08:32 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/soap/tests/interop/Round2/Base r2_base_005p.phpt
r2_base_005s.phpt
r2_base_005w.phpt
/php-src/sapi/cli/tests 006.phpt
Log:
MFH: Fix skipif
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt?r1=1.1.6.1r2=1.1.6.2diff_format=u
Index: php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt
diff -u php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt:1.1.6.1
php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt:1.1.6.2
--- php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt:1.1.6.1
Sat May 24 15:22:18 2008
+++ php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phptWed May
20 10:08:32 2009
@@ -2,6 +2,7 @@
SOAP Interop Round2 base 005 (php/direct): echoString(utf-8)
--SKIPIF--
?php require_once('skipif.inc'); ?
+?php if (!function_exists('utf8_encode')) die('skip utf8_encode() not
available'); ?
--FILE--
?php
$client = new
SoapClient(NULL,array(location=test://,uri=http://soapinterop.org/,trace=1,exceptions=0));
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt?r1=1.1.6.1r2=1.1.6.2diff_format=u
Index: php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt
diff -u php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt:1.1.6.1
php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt:1.1.6.2
--- php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt:1.1.6.1
Sat May 24 15:22:18 2008
+++ php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phptWed May
20 10:08:32 2009
@@ -2,6 +2,7 @@
SOAP Interop Round2 base 005 (soap/direct): echoString(utf-8)
--SKIPIF--
?php require_once('skipif.inc'); ?
+?php if (!function_exists('utf8_encode')) die('skip utf8_encode() not
available'); ?
--FILE--
?php
$client = new
SoapClient(NULL,array(location=test://,uri=http://soapinterop.org/,trace=1,exceptions=0));
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt?r1=1.1.6.2r2=1.1.6.3diff_format=u
Index: php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt
diff -u php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt:1.1.6.2
php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt:1.1.6.3
--- php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt:1.1.6.2
Sat May 24 15:22:18 2008
+++ php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phptWed May
20 10:08:32 2009
@@ -2,6 +2,7 @@
SOAP Interop Round2 base 005 (php/wsdl): echoString(utf-8)
--SKIPIF--
?php require_once('skipif.inc'); ?
+?php if (!function_exists('utf8_encode')) die('skip utf8_encode() not
available'); ?
--INI--
soap.wsdl_cache_enabled=0
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/006.phpt?r1=1.1.2.9.2.8r2=1.1.2.9.2.9diff_format=u
Index: php-src/sapi/cli/tests/006.phpt
diff -u php-src/sapi/cli/tests/006.phpt:1.1.2.9.2.8
php-src/sapi/cli/tests/006.phpt:1.1.2.9.2.9
--- php-src/sapi/cli/tests/006.phpt:1.1.2.9.2.8 Sat Aug 30 11:32:29 2008
+++ php-src/sapi/cli/tests/006.phpt Wed May 20 10:08:32 2009
@@ -3,7 +3,7 @@
--SKIPIF--
?php
include skipif.inc;
-if (!extension_loaded(reflection)) {
+if (!extension_loaded(reflection) || !extension_loaded(session)) {
die(skip);
}
?
--
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/soap/tests/interop/Round2/Base r2_base_005p.phpt r2_base_005s.phpt r2_base_005w.phpt /sapi/cli/tests 006.phpt
lbarnaudWed May 20 10:08:42 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/interop/Round2/Base r2_base_005p.phpt
r2_base_005s.phpt
r2_base_005w.phpt
/php-src/sapi/cli/tests 006.phpt
Log:
MFH: Fix skipif
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt?r1=1.1r2=1.1.4.1diff_format=u
Index: php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt
diff -u php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt:1.1
php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt:1.1.4.1
--- php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt:1.1Sun Apr
3 15:51:18 2005
+++ php-src/ext/soap/tests/interop/Round2/Base/r2_base_005p.phptWed May
20 10:08:42 2009
@@ -2,6 +2,7 @@
SOAP Interop Round2 base 005 (php/direct): echoString(utf-8)
--SKIPIF--
?php require_once('skipif.inc'); ?
+?php if (!function_exists('utf8_encode')) die('skip utf8_encode() not
available'); ?
--FILE--
?php
$client = new
SoapClient(NULL,array(location=test://,uri=http://soapinterop.org/,trace=1,exceptions=0));
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt?r1=1.1r2=1.1.4.1diff_format=u
Index: php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt
diff -u php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt:1.1
php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt:1.1.4.1
--- php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt:1.1Sun Apr
3 15:51:18 2005
+++ php-src/ext/soap/tests/interop/Round2/Base/r2_base_005s.phptWed May
20 10:08:42 2009
@@ -2,6 +2,7 @@
SOAP Interop Round2 base 005 (soap/direct): echoString(utf-8)
--SKIPIF--
?php require_once('skipif.inc'); ?
+?php if (!function_exists('utf8_encode')) die('skip utf8_encode() not
available'); ?
--FILE--
?php
$client = new
SoapClient(NULL,array(location=test://,uri=http://soapinterop.org/,trace=1,exceptions=0));
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt?r1=1.1.4.1r2=1.1.4.2diff_format=u
Index: php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt
diff -u php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt:1.1.4.1
php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt:1.1.4.2
--- php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt:1.1.4.1
Wed Jan 9 16:45:29 2008
+++ php-src/ext/soap/tests/interop/Round2/Base/r2_base_005w.phptWed May
20 10:08:42 2009
@@ -2,6 +2,7 @@
SOAP Interop Round2 base 005 (php/wsdl): echoString(utf-8)
--SKIPIF--
?php require_once('skipif.inc'); ?
+?php if (!function_exists('utf8_encode')) die('skip utf8_encode() not
available'); ?
--INI--
soap.wsdl_cache_enabled=0
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/006.phpt?r1=1.1.2.9r2=1.1.2.10diff_format=u
Index: php-src/sapi/cli/tests/006.phpt
diff -u php-src/sapi/cli/tests/006.phpt:1.1.2.9
php-src/sapi/cli/tests/006.phpt:1.1.2.10
--- php-src/sapi/cli/tests/006.phpt:1.1.2.9 Wed May 30 14:43:18 2007
+++ php-src/sapi/cli/tests/006.phpt Wed May 20 10:08:42 2009
@@ -3,7 +3,7 @@
--SKIPIF--
?php
include skipif.inc;
-if (!extension_loaded(reflection)) {
+if (!extension_loaded(reflection) || !extension_loaded(session)) {
die(skip);
}
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_dblib pdo_dblib.c
kalle Wed May 20 10:18:41 2009 UTC Modified files: /php-src/ext/pdo_dblib pdo_dblib.c Log: Fixed shared build http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/pdo_dblib.c?r1=1.21r2=1.22diff_format=u Index: php-src/ext/pdo_dblib/pdo_dblib.c diff -u php-src/ext/pdo_dblib/pdo_dblib.c:1.21 php-src/ext/pdo_dblib/pdo_dblib.c:1.22 --- php-src/ext/pdo_dblib/pdo_dblib.c:1.21 Tue May 19 10:22:10 2009 +++ php-src/ext/pdo_dblib/pdo_dblib.c Wed May 20 10:18:41 2009 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: pdo_dblib.c,v 1.21 2009/05/19 10:22:10 kalle Exp $ */ +/* $Id: pdo_dblib.c,v 1.22 2009/05/20 10:18:41 kalle Exp $ */ #ifdef HAVE_CONFIG_H # include config.h @@ -79,8 +79,12 @@ }; #if defined(COMPILE_DL_PDO_DBLIB) || defined(COMPILE_DL_PDO_MSSQL) +#if PDO_DBLIB_IS_MSSQL +ZEND_GET_MODULE(pdo_mssql) +#else ZEND_GET_MODULE(pdo_dblib) #endif +#endif int error_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, char *dberrstr, char *oserrstr) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_dblib pdo_dblib.c
kalle Wed May 20 10:18:51 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pdo_dblib pdo_dblib.c Log: MFH: Fixed shared build http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/pdo_dblib.c?r1=1.9.2.6.2.3.2.4r2=1.9.2.6.2.3.2.5diff_format=u Index: php-src/ext/pdo_dblib/pdo_dblib.c diff -u php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.6.2.3.2.4 php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.6.2.3.2.5 --- php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.6.2.3.2.4 Tue May 19 10:22:25 2009 +++ php-src/ext/pdo_dblib/pdo_dblib.c Wed May 20 10:18:51 2009 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: pdo_dblib.c,v 1.9.2.6.2.3.2.4 2009/05/19 10:22:25 kalle Exp $ */ +/* $Id: pdo_dblib.c,v 1.9.2.6.2.3.2.5 2009/05/20 10:18:51 kalle Exp $ */ #ifdef HAVE_CONFIG_H # include config.h @@ -79,8 +79,12 @@ }; #if defined(COMPILE_DL_PDO_DBLIB) || defined(COMPILE_DL_PDO_MSSQL) +#if PDO_DBLIB_IS_MSSQL +ZEND_GET_MODULE(pdo_mssql) +#else ZEND_GET_MODULE(pdo_dblib) #endif +#endif int error_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, char *dberrstr, char *oserrstr) -- 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/pdo_dblib pdo_dblib.c
kalle Wed May 20 10:19:28 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pdo_dblib pdo_dblib.c Log: MFH: Fixed shared build http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/pdo_dblib.c?r1=1.9.2.6.2.6r2=1.9.2.6.2.7diff_format=u Index: php-src/ext/pdo_dblib/pdo_dblib.c diff -u php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.6.2.6 php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.6.2.7 --- php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.6.2.6 Tue May 19 10:22:31 2009 +++ php-src/ext/pdo_dblib/pdo_dblib.c Wed May 20 10:19:28 2009 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: pdo_dblib.c,v 1.9.2.6.2.6 2009/05/19 10:22:31 kalle Exp $ */ +/* $Id: pdo_dblib.c,v 1.9.2.6.2.7 2009/05/20 10:19:28 kalle Exp $ */ #ifdef HAVE_CONFIG_H # include config.h @@ -79,8 +79,12 @@ }; #if defined(COMPILE_DL_PDO_DBLIB) || defined(COMPILE_DL_PDO_MSSQL) +#if PDO_DBLIB_IS_MSSQL +ZEND_GET_MODULE(pdo_mssql) +#else ZEND_GET_MODULE(pdo_dblib) #endif +#endif int error_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, char *dberrstr, char *oserrstr) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mysql php_mysql.c /ext/mysqli mysqli_api.c mysqli_driver.c mysqli_prop.c /ext/pdo_mysql mysql_statement.c
Hi Andrey
2009/5/20 Andrey Hristov p...@hristov.com:
 Hi,
- Â Â Â Â Â Â Â if (rc == (my_ulonglong)-1) {
+ Â Â Â Â Â Â Â if (rc == (long)-1) {
This is not correct. Maybe you have 64bit box, but 32bit machines are still
out there and this will be bad. my_ulonglong is 8 byte and -1, will be the
max value 2^64-1, long is 4 byte and even when it is 8 byte, (long) -1 will
be -1, not 2^64-1, so I think it would be better to revert these changes!
Especially when the come after RC2
This is also wrong:
- Â Â Â row_count = mysql_stmt_affected_rows(S-stmt);
- Â Â Â if (row_count != (my_ulonglong)-1) {
+ Â Â Â row_count = (long) mysql_stmt_affected_rows(S-stmt);
+ Â Â Â if (row_count != (long)-1) {
There are a few places where you have done the same mistake and they should
be reverted.
I will review and commit fixes tonight or tomorrow, thanks for the
notice. btw. mysqlnd is emitting many warnings too, if non of you
mysql'ers wants to deal with it, I'll have a look at it aswell.
Andrey
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
Kalle Sommer Nielsen
ka...@php.net
--
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/standard basic_functions.c dns.c dns.h
janiWed May 20 12:09:35 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard basic_functions.c dns.c dns.h
Log:
- Fix win32 build
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.83r2=1.725.2.31.2.84diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.83
php-src/ext/standard/basic_functions.c:1.725.2.31.2.84
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.83 Tue May 19
11:12:32 2009
+++ php-src/ext/standard/basic_functions.c Wed May 20 12:09:33 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.83 2009/05/19 11:12:32 jani Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.84 2009/05/20 12:09:33 jani Exp $ */
#include php.h
#include php_streams.h
@@ -1113,7 +1113,7 @@
ZEND_ARG_INFO(0, hostname)
ZEND_END_ARG_INFO()
-#if defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
+#if HAVE_RES_SEARCH !(defined(__BEOS__) || defined(PHP_WIN32) ||
defined(NETWARE))
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_check_record, 0, 0, 1)
ZEND_ARG_INFO(0, host)
@@ -1138,7 +1138,7 @@
ZEND_ARG_INFO(1, weight) /* ARRAY_INFO(1, weight, 1) */
ZEND_END_ARG_INFO()
# endif
-#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE))) */
+#endif /* HAVE_RES_SEARCH !(defined(__BEOS__) || defined(PHP_WIN32) ||
defined(NETWARE)) */
/* }}} */
/* {{{ exec.c */
static
@@ -3443,7 +3443,7 @@
PHP_FE(gethostbyname,
arginfo_gethostbyname)
PHP_FE(gethostbynamel,
arginfo_gethostbynamel)
-#if defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
+#if HAVE_RES_SEARCH !(defined(__BEOS__) || defined(PHP_WIN32) ||
defined(NETWARE))
PHP_FE(dns_check_record,
arginfo_dns_check_record)
PHP_FALIAS(checkdnsrr, dns_check_record,
arginfo_dns_check_record)
# if HAVE_DN_SKIPNAME HAVE_DN_EXPAND
@@ -4078,7 +4078,7 @@
php_register_url_stream_wrapper(ftp, php_stream_ftp_wrapper
TSRMLS_CC);
#endif
-#if defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
+#if HAVE_RES_SEARCH !(defined(__BEOS__) ||defined(PHP_WIN32) ||
defined(NETWARE))
# if HAVE_DNS_FUNCS
PHP_MINIT(dns)(INIT_FUNC_ARGS_PASSTHRU);
# endif
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.10r2=1.70.2.7.2.11diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.7.2.10
php-src/ext/standard/dns.c:1.70.2.7.2.11
--- php-src/ext/standard/dns.c:1.70.2.7.2.10Tue May 19 11:12:33 2009
+++ php-src/ext/standard/dns.c Wed May 20 12:09:33 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.70.2.7.2.10 2009/05/19 11:12:33 jani Exp $ */
+/* $Id: dns.c,v 1.70.2.7.2.11 2009/05/20 12:09:33 jani Exp $ */
/* {{{ includes */
#include php.h
@@ -244,7 +244,7 @@
}
/* }}} */
-#if defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
+#if HAVE_RES_SEARCH !(defined(__BEOS__) || defined(PHP_WIN32) ||
defined(NETWARE))
/* {{{ proto int dns_check_record(string host [, string type])
Check DNS records corresponding to a given Internet host name or IP address
*/
@@ -942,7 +942,8 @@
}
/* }}} */
#endif /* HAVE_DN_SKIPNAME HAVE_DN_EXPAND */
-#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE))) */
+
+#endif /* HAVE_RES_SEARCH !(defined(__BEOS__) || defined(PHP_WIN32) ||
defined(NETWARE)) */
/*
* Local variables:
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.h?r1=1.19.2.1.2.5r2=1.19.2.1.2.6diff_format=u
Index: php-src/ext/standard/dns.h
diff -u php-src/ext/standard/dns.h:1.19.2.1.2.5
php-src/ext/standard/dns.h:1.19.2.1.2.6
--- php-src/ext/standard/dns.h:1.19.2.1.2.5 Tue May 19 19:38:00 2009
+++ php-src/ext/standard/dns.h Wed May 20 12:09:33 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.h,v 1.19.2.1.2.5 2009/05/19 19:38:00 jani Exp $ */
+/* $Id: dns.h,v 1.19.2.1.2.6 2009/05/20 12:09:33 jani Exp $ */
#ifndef DNS_H
#define DNS_H
@@ -31,7 +31,7 @@
PHP_FUNCTION(gethostbyname);
PHP_FUNCTION(gethostbynamel);
-#if defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
+#if HAVE_RES_SEARCH !(defined(__BEOS__) || defined(PHP_WIN32) ||
defined(NETWARE))
[PHP-CVS] cvs: php-src /ext/standard dns.c
janiWed May 20 12:15:36 2009 UTC
Modified files:
/php-src/ext/standard dns.c
Log:
- Fix non-windows builds too
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.108r2=1.109diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.108 php-src/ext/standard/dns.c:1.109
--- php-src/ext/standard/dns.c:1.108Wed May 20 08:16:56 2009
+++ php-src/ext/standard/dns.c Wed May 20 12:15:36 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.108 2009/05/20 08:16:56 kalle Exp $ */
+/* $Id: dns.c,v 1.109 2009/05/20 12:15:36 jani Exp $ */
/* {{{ includes */
#include php.h
@@ -278,7 +278,8 @@
#define PHP_DNS_ALL
(PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_)
#endif /* HAVE_DNS_FUNCS || defined(PHP_WIN32) */
-#if !defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
+/* Note: These functions are defined in ext/standard/dns_win32.c for Windows!
*/
+#if !defined(PHP_WIN32) (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
/* {{{ proto bool dns_check_record(string host [, string type]) U
Check DNS records corresponding to a given Internet host name or IP address
*/
@@ -916,7 +917,7 @@
}
/* }}} */
#endif /* HAVE_DN_SKIPNAME HAVE_DN_EXPAND */
-#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE))) */
+#endif /* !defined(PHP_WIN32) (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE))) */
#if HAVE_DNS_FUNCS || defined(PHP_WIN32)
PHP_MINIT_FUNCTION(dns) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard dns.c
janiWed May 20 12:15:39 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dns.c
Log:
MFH: Fix non-windows builds
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.5.2.22r2=1.70.2.7.2.5.2.23diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.7.2.5.2.22
php-src/ext/standard/dns.c:1.70.2.7.2.5.2.23
--- php-src/ext/standard/dns.c:1.70.2.7.2.5.2.22Wed May 20 08:18:48 2009
+++ php-src/ext/standard/dns.c Wed May 20 12:15:39 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.70.2.7.2.5.2.22 2009/05/20 08:18:48 kalle Exp $ */
+/* $Id: dns.c,v 1.70.2.7.2.5.2.23 2009/05/20 12:15:39 jani Exp $ */
/* {{{ includes */
#include php.h
@@ -277,7 +277,8 @@
# define PHP_DNS_ALL
(PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_)
#endif /* HAVE_DNS_FUNCS || defined(PHP_WIN32) */
-#if !defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
+/* Note: These functions are defined in ext/standard/dns_win32.c for Windows!
*/
+#if !defined(PHP_WIN32) (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE)))
/* {{{ proto bool dns_check_record(string host [, string type])
Check DNS records corresponding to a given Internet host name or IP address
*/
@@ -916,7 +917,7 @@
}
/* }}} */
#endif /* HAVE_DN_SKIPNAME HAVE_DN_EXPAND */
-#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE))) */
+#endif /* defined(PHP_WIN32) (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE))) */
#if HAVE_DNS_FUNCS || defined(PHP_WIN32)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard dns.c
janiWed May 20 12:44:19 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dns.c
Log:
- Sync with HEAD (thanks Hannes :)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.5.2.23r2=1.70.2.7.2.5.2.24diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.7.2.5.2.23
php-src/ext/standard/dns.c:1.70.2.7.2.5.2.24
--- php-src/ext/standard/dns.c:1.70.2.7.2.5.2.23Wed May 20 12:15:39 2009
+++ php-src/ext/standard/dns.c Wed May 20 12:44:19 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.70.2.7.2.5.2.23 2009/05/20 12:15:39 jani Exp $ */
+/* $Id: dns.c,v 1.70.2.7.2.5.2.24 2009/05/20 12:44:19 jani Exp $ */
/* {{{ includes */
#include php.h
@@ -917,10 +917,9 @@
}
/* }}} */
#endif /* HAVE_DN_SKIPNAME HAVE_DN_EXPAND */
-#endif /* defined(PHP_WIN32) (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE))) */
+#endif /* !defined(PHP_WIN32) (HAVE_RES_SEARCH !(defined(__BEOS__) ||
defined(NETWARE))) */
#if HAVE_DNS_FUNCS || defined(PHP_WIN32)
-
PHP_MINIT_FUNCTION(dns) {
REGISTER_LONG_CONSTANT(DNS_A, PHP_DNS_A, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(DNS_NS,PHP_DNS_NS,CONST_CS |
CONST_PERSISTENT);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_api.c
iliaa Wed May 20 13:10:49 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqli mysqli_api.c Log: Fixed build http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.25r2=1.118.2.22.2.16.2.26diff_format=u Index: php-src/ext/mysqli/mysqli_api.c diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.25 php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.26 --- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.25Wed May 20 08:30:12 2009 +++ php-src/ext/mysqli/mysqli_api.c Wed May 20 13:10:49 2009 @@ -17,7 +17,7 @@ | Ulf Wendel u...@php.net | +--+ - $Id: mysqli_api.c,v 1.118.2.22.2.16.2.25 2009/05/20 08:30:12 kalle Exp $ + $Id: mysqli_api.c,v 1.118.2.22.2.16.2.26 2009/05/20 13:10:49 iliaa Exp $ */ #ifdef HAVE_CONFIG_H @@ -2081,7 +2081,7 @@ return; } MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, mysql_link, mysqli_link, MYSQLI_STATUS_INITIALIZED); - RETURN_BOOL(!mysql_refresh(mysql-mysql, (uint8_t) options)); + RETURN_BOOL(!mysql_refresh(mysql-mysql, options)); } /* }}} */ -- 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_2) /ext/pdo_sqlite sqlite_statement.c
On 19.05.2009 23:20, Ilia Alshanetsky wrote: iliaa Tue May 19 19:20:01 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pdo_sqlite sqlite_statement.c Log: MFB: The \0 removal is only needed prior to 3.4.0 New failed tests: /local/qa/5_2/ext/pdo_sqlite/tests/bug44327_2.phpt /local/qa/5_2/ext/pdo_sqlite/tests/bug44327_3.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/bug_34630.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/bug_38394.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/bug_39398.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/bug_39656.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/bug_43139.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_001.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_002.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_003.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_004.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_005.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_006.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_009.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_010.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_011.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_015.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_016.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_016a.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_017.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_018.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_019.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_021.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_023.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_025.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_026.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_027.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_028.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_029.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_030.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_031.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pdo_032.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/pdo/tests/pecl_bug_5772.phpt -- Wbr, Antony Dovgal -- 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_2) /ext/pdo_sqlite sqlite_statement.c
Tony, is this with the built-in lib or an external lib and if it is an external lib can you please tell me the version. Thanks, Ilia Alshanetsky On 20-May-09, at 9:25 AM, Antony Dovgal wrote: On 19.05.2009 23:20, Ilia Alshanetsky wrote: iliaa Tue May 19 19:20:01 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pdo_sqlite sqlite_statement.c Log: MFB: The \0 removal is only needed prior to 3.4.0 New failed tests: /local/qa/5_2/ext/pdo_sqlite/tests/bug44327_2.phpt /local/qa/5_2/ext/pdo_sqlite/tests/bug44327_3.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/bug_34630.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/bug_38394.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/bug_39398.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/bug_39656.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/bug_43139.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_001.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_002.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_003.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_004.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_005.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_006.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_009.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_010.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_011.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_015.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_016.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_016a.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_017.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_018.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_019.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_021.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_023.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_025.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_026.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_027.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_028.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_029.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_030.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_031.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pdo_032.phpt # /local/qa/5_2/ext/pdo_sqlite/tests/common.phpt: /local/qa/5_2/ext/ pdo/tests/pecl_bug_5772.phpt -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- 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_2) /ext/pdo_sqlite sqlite_statement.c
On 20.05.2009 17:38, Ilia Alshanetsky wrote: Tony, is this with the built-in lib or an external lib and if it is an external lib can you please tell me the version. Built-in, I guess, since I don't have sqlite3 headers installed. -- Wbr, Antony Dovgal -- 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_2) /ext/pdo_sqlite sqlite_statement.c
Antony Dovgal ha scritto: On 20.05.2009 17:38, Ilia Alshanetsky wrote: Tony, is this with the built-in lib or an external lib and if it is an external lib can you please tell me the version. Built-in, I guess, since I don't have sqlite3 headers installed. Which again confirms what I've been trying to tell, given that 5.2 is still bundling 3.3.7: http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite/VERSION?revision=1.3.2.3.2.7view=markuppathrev=PHP_5_2 FWIW, I also tested 5.3 compiled with a checkout of sqlite 3.0.8 (-D 2005-01-01). Same failures. Cheers -- Matteo Beccati OpenX - http://www.openx.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_sqlite sqlite_statement.c
How did you manage to build 5.3 against 3.0.8, since the config requires version 3.3.9 or higher? Ilia Alshanetsky On 20-May-09, at 10:07 AM, Matteo Beccati wrote: Antony Dovgal ha scritto: On 20.05.2009 17:38, Ilia Alshanetsky wrote: Tony, is this with the built-in lib or an external lib and if it is an external lib can you please tell me the version. Built-in, I guess, since I don't have sqlite3 headers installed. Which again confirms what I've been trying to tell, given that 5.2 is still bundling 3.3.7: http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite/VERSION?revision=1.3.2.3.2.7view=markuppathrev=PHP_5_2 FWIW, I also tested 5.3 compiled with a checkout of sqlite 3.0.8 (-D 2005-01-01). Same failures. Cheers -- Matteo Beccati OpenX - http://www.openx.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_sqlite sqlite_statement.c
Ilia Alshanetsky ha scritto: How did you manage to build 5.3 against 3.0.8, since the config requires version 3.3.9 or higher? Good question... configure didn't complain: checking for sqlite 3 support for PDO... yes checking for PDO includes... (cached) /root/compile/php-5.3/ext checking for sqlite3_open in -lsqlite3... yes checking for sqlite3_key in -lsqlite3... no but in fact php was built with the bundled version. Funny thing is that it seemed to be using the old headers as tests are failing and gdb confirms that the (*len)-- is executed. Cheers -- Matteo Beccati OpenX - http://www.openx.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_sqlite sqlite_statement.c
On 20-May-09, at 10:49 AM, Matteo Beccati wrote: Ilia Alshanetsky ha scritto: How did you manage to build 5.3 against 3.0.8, since the config requires version 3.3.9 or higher? Good question... configure didn't complain: checking for sqlite 3 support for PDO... yes checking for PDO includes... (cached) /root/compile/php-5.3/ext checking for sqlite3_open in -lsqlite3... yes checking for sqlite3_key in -lsqlite3... no but in fact php was built with the bundled version. Funny thing is that it seemed to be using the old headers as tests are failing and gdb confirms that the (*len)-- is executed. Nice, it actually aborted configure when trying to compile against external 3.3.9 sources in 5.3. I wonder why it let 3.0.8 through... Btw, you were right, bad on my part. It seems Sqlite3 header is not entirely correct in saying \0 is included in the byte count, it returns a real length about 4 different version of sqlite 3.4.0 confirm it. Thanks for being so persistent ;-) Ilia -- 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/pdo_sqlite sqlite_statement.c
iliaa Wed May 20 15:03:17 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo_sqlite sqlite_statement.c
Log:
Re-introduce the Matteo's patch and combine default text handling since
they appear to be the same irregardless on notes inside sqlite3.h
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.18.2.4.2.7r2=1.18.2.4.2.8diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.7
php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.8
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.7 Tue May 19
19:20:01 2009
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Wed May 20 15:03:16 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite_statement.c,v 1.18.2.4.2.7 2009/05/19 19:20:01 iliaa Exp $ */
+/* $Id: sqlite_statement.c,v 1.18.2.4.2.8 2009/05/20 15:03:16 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -231,25 +231,9 @@
*len = sqlite3_column_bytes(S-stmt, colno);
return 1;
- case SQLITE3_TEXT:
- *ptr = (char*)sqlite3_column_text(S-stmt, colno);
- *len = sqlite3_column_bytes(S-stmt, colno);
- if (*len) {
- /* sqlite3.h says the NUL terminator is
included in the byte count
-* for TEXT values */
- *len--;
- }
- return 1;
-
default:
*ptr = (char*)sqlite3_column_text(S-stmt, colno);
*len = sqlite3_column_bytes(S-stmt, colno);
-#if SQLITE_VERSION_NUMBER 3004000
- if (*len) {
- /* sqlite3.h says the NUL terminator is
included in the byte count for TEXT values */
- (*len)--;
- }
-#endif
return 1;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_sqlite sqlite_statement.c
iliaa Wed May 20 15:05:36 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite sqlite_statement.c
Log:
MFB: Re-introduce the Matteo's patch and combine default text handling
since they appear to be the same irregardless on notes inside sqlite3.h
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.18.2.4.2.3.2.9r2=1.18.2.4.2.3.2.10diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3.2.9
php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3.2.10
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3.2.9 Tue May 19
19:15:18 2009
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Wed May 20 15:05:36 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite_statement.c,v 1.18.2.4.2.3.2.9 2009/05/19 19:15:18 iliaa Exp $
*/
+/* $Id: sqlite_statement.c,v 1.18.2.4.2.3.2.10 2009/05/20 15:05:36 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
#include config.h
@@ -262,16 +262,6 @@
*len = sqlite3_column_bytes(S-stmt, colno);
return 1;
- case SQLITE3_TEXT:
- *ptr = (char*)sqlite3_column_text(S-stmt, colno);
- *len = sqlite3_column_bytes(S-stmt, colno);
-#if SQLITE_VERSION_NUMBER 3004000
- if (*len) {
- /* sqlite3.h says the NUL terminator is
included in the byte count for TEXT values */
- (*len)--;
- }
-#endif
- return 1;
default:
*ptr = (char*)sqlite3_column_text(S-stmt, colno);
*len = sqlite3_column_bytes(S-stmt, colno);
--
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_2) /ext/pdo_sqlite sqlite_statement.c
Ilia Alshanetsky wrote: Nice, it actually aborted configure when trying to compile against external 3.3.9 sources in 5.3. I wonder why it let 3.0.8 through... No idea. It might even just be my FreeBSD box or the fact I installed the external sqlite library and headers using a cvs checkout. Please let me know if there's something I can go to help you figure it out. Btw, you were right, bad on my part. It seems Sqlite3 header is not entirely correct in saying \0 is included in the byte count, it returns a real length about 4 different version of sqlite 3.4.0 confirm it. Thanks for being so persistent ;-) You're welcome ;) Cheers -- Matteo Beccati OpenX - http://www.openx.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_sqlite sqlite_statement.c
iliaa Wed May 20 15:06:20 2009 UTC
Modified files:
/php-src/ext/pdo_sqlite sqlite_statement.c
Log:
MFB: Re-introduce the Matteo's patch and combine default text handling
since they appear to be the same irregardless on notes inside sqlite3.h
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.34r2=1.35diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.34
php-src/ext/pdo_sqlite/sqlite_statement.c:1.35
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.34 Tue May 19 19:16:05 2009
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Wed May 20 15:06:20 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite_statement.c,v 1.34 2009/05/19 19:16:05 iliaa Exp $ */
+/* $Id: sqlite_statement.c,v 1.35 2009/05/20 15:06:20 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -262,16 +262,6 @@
*len = sqlite3_column_bytes(S-stmt, colno);
return 1;
- case SQLITE3_TEXT:
- *ptr = (char*)sqlite3_column_text(S-stmt, colno);
- *len = sqlite3_column_bytes(S-stmt, colno);
-#if SQLITE_VERSION_NUMBER 3004000
- if (*len) {
- /* sqlite3.h says the NUL terminator is
included in the byte count for TEXT values */
- (*len)--;
- }
-#endif
- return 1;
default:
*ptr = (char*)sqlite3_column_text(S-stmt, colno);
*len = sqlite3_column_bytes(S-stmt, colno);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mysql php_mysql.c /ext/mysqli mysqli_api.c mysqli_driver.c mysqli_prop.c /ext/pdo_mysql mysql_statement.c
Kalle Sommer Nielsen wrote:
Hi Andrey
2009/5/20 Andrey Hristov p...@hristov.com:
Hi,
- if (rc == (my_ulonglong)-1) {
+ if (rc == (long)-1) {
This is not correct. Maybe you have 64bit box, but 32bit machines are still
out there and this will be bad. my_ulonglong is 8 byte and -1, will be the
max value 2^64-1, long is 4 byte and even when it is 8 byte, (long) -1 will
be -1, not 2^64-1, so I think it would be better to revert these changes!
Especially when the come after RC2
This is also wrong:
- row_count = mysql_stmt_affected_rows(S-stmt);
- if (row_count != (my_ulonglong)-1) {
+ row_count = (long) mysql_stmt_affected_rows(S-stmt);
+ if (row_count != (long)-1) {
There are a few places where you have done the same mistake and they should
be reverted.
I will review and commit fixes tonight or tomorrow, thanks for the
notice. btw. mysqlnd is emitting many warnings too, if non of you
mysql'ers wants to deal with it, I'll have a look at it aswell.
could you mail me the list of warnings which you see. I try to compile
without any warnings and my latest builds didn't have warnings. So, as
long as I get the list I will try to take care of them.
Thanks
Andrey
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mysql php_mysql.c /ext/mysqli mysqli_api.c mysqli_driver.c mysqli_prop.c /ext/pdo_mysql mysql_statement.c
Hi 2009/5/20 Andrey Hristov p...@hristov.com: could you mail me the list of warnings which you see. I try to compile without any warnings and my latest builds didn't have warnings. So, as long as I get the list I will try to take care of them. Thanks ext\mysqlnd\mysqlnd_debug.c(317) : warning C4018: '=' : signed/unsigned mismatch ext\mysqlnd\mysqlnd_debug.c(365) : warning C4018: '=' : signed/unsigned mismatch ext\mysqlnd\mysqlnd_ps_codec.c(87) : warning C4244: '=' : conversion from 'uint64_t' to 'long', possible loss of data ext\mysqlnd\mysqlnd_ps_codec.c(115) : warning C4244: '=' : conversion from 'int64_t' to 'long', possible loss of data ext\mysqlnd\mysqlnd_result.c(102) : warning C4244: 'initializing' : conversion from 'uint64_t' to 'unsigned int', possible loss of data ext\mysqlnd\mysqlnd_result.c(106) : warning C4018: '' : signed/unsigned mismatch ext\mysqlnd\mysqlnd_result.c(193) : warning C4244: '=' : conversion from 'uint64_t' to 'int', possible loss of data ext\mysqlnd\mysqlnd_result.c(795) : warning C4018: '' : signed/unsigned mismatch ext\mysqlnd\mysqlnd_result.c(931) : warning C4018: '' : signed/unsigned mismatch ext\mysqlnd\mysqlnd_result.c(1221) : warning C4244: 'function' : conversion from 'uint64_t' to 'size_t', possible loss of data ext\mysqlnd\mysqlnd_result.c(1242) : warning C4244: 'function' : conversion from 'uint64_t' to 'size_t', possible loss of data ext\mysqlnd\mysqlnd_result.c(1243) : warning C4244: 'function' : conversion from 'uint64_t' to 'size_t', possible loss of data ext\mysqlnd\mysqlnd_result.c(1260) : warning C4244: 'function' : conversion from 'uint64_t' to 'size_t', possible loss of data ext\mysqlnd\mysqlnd_wireprotocol.c(615) : warning C4018: '' : signed/unsigned mismatch ext\mysqlnd\mysqlnd_wireprotocol.c(629) : warning C4018: '' : signed/unsigned mismatch ext\mysqlnd\mysqlnd_wireprotocol.c(814) : warning C4018: '' : signed/unsigned mismatch ext\mysqlnd\mysqlnd_wireprotocol.c(825) : warning C4018: '' : signed/unsigned mismatch ext\mysqlnd\mysqlnd_wireprotocol.c(898) : warning C4018: '' : signed/unsigned mismatch ext\mysqlnd\mysqlnd_wireprotocol.c(1048) : warning C4018: '' : signed/unsigned mismatch ext\mysqlnd\mysqlnd_wireprotocol.c(1063) : warning C4018: '' : signed/unsigned mismatch ext\mysqlnd\mysqlnd_wireprotocol.c(1191) : warning C4018: '' : signed/unsigned mismatch ext\mysqlnd\mysqlnd_wireprotocol.c(1203) : warning C4018: '' : signed/unsigned mismatch ext\mysqlnd\mysqlnd_wireprotocol.c(1317) : warning C4244: 'function' : conversion from 'uint64_t' to 'unsigned int', possible loss of data ext\mysqlnd\mysqlnd_wireprotocol.c(1331) : warning C4244: 'function' : conversion from 'uint64_t' to 'unsigned int', possible loss of data ext\mysqlnd\mysqlnd_wireprotocol.c(1464) : warning C4244: 'initializing' : conversion from 'uint64_t' to 'size_t', possible loss of data ext\mysqlnd\mysqlnd_wireprotocol.c(1567) : warning C4244: '=' : conversion from 'int64_t' to 'long', possible loss of data ext\mysqlnd\mysqlnd_wireprotocol.c(1587) : warning C4244: '=' : conversion from 'int64_t' to 'long', possible loss of data ext\mysqlnd\mysqlnd_wireprotocol.c(1750) : warning C4244: '=' : conversion from 'uint64_t' to 'size_t', possible loss of data ext\mysqlnd\mysqlnd_wireprotocol.c(1760) : warning C4244: 'function' : conversion from 'uint64_t' to 'size_t', possible loss of data ext\mysqlnd\mysqlnd_wireprotocol.c(1942) : warning C4018: '' : signed/unsigned mismatch ext\mysqlnd\mysqlnd_wireprotocol.c(2002) : warning C4018: '' : signed/unsigned mismatch These are all the warnings I get (from a PHP_5_3 build, since I reckon mysqlnd was in sync with HEAD then it should be the same there) Windows Vista Ultimate, 32bit little endian (Intel) Andrey -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Kalle Sommer Nielsen ka...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard file.c
janiThu May 21 01:39:49 2009 UTC Modified files: /php-src/ext/standard file.c Log: ws http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.545r2=1.546diff_format=u Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.545 php-src/ext/standard/file.c:1.546 --- php-src/ext/standard/file.c:1.545 Fri May 8 10:01:40 2009 +++ php-src/ext/standard/file.c Thu May 21 01:39:48 2009 @@ -21,7 +21,7 @@ +--+ */ -/* $Id: file.c,v 1.545 2009/05/08 10:01:40 lbarnaud Exp $ */ +/* $Id: file.c,v 1.546 2009/05/21 01:39:48 jani Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -43,60 +43,65 @@ #include sys/types.h #include sys/stat.h #include fcntl.h + #ifdef PHP_WIN32 -#include io.h -#define O_RDONLY _O_RDONLY -#include win32/param.h -#include win32/winutil.h -#include win32/fnmatch.h +# include io.h +# define O_RDONLY _O_RDONLY +# include win32/param.h +# include win32/winutil.h +# include win32/fnmatch.h #elif defined(NETWARE) -#include sys/param.h -#include sys/select.h -#ifdef USE_WINSOCK -#include novsock2.h -#else -#include sys/socket.h -#include netinet/in.h -#include netdb.h -#endif -#else -#if HAVE_SYS_PARAM_H -#include sys/param.h -#endif -#if HAVE_SYS_SELECT_H -#include sys/select.h -#endif -#if defined(NETWARE) defined(USE_WINSOCK) -#include novsock2.h +# include sys/param.h +# include sys/select.h +# ifdef USE_WINSOCK +# include novsock2.h +# else +# include sys/socket.h +# include netinet/in.h +# include netdb.h +# endif #else -#include sys/socket.h -#include netinet/in.h -#include netdb.h -#endif -#if HAVE_ARPA_INET_H -#include arpa/inet.h -#endif +# if HAVE_SYS_PARAM_H +# include sys/param.h +# endif +# if HAVE_SYS_SELECT_H +# include sys/select.h +# endif +# if defined(NETWARE) defined(USE_WINSOCK) +# include novsock2.h +# else +# include sys/socket.h +# include netinet/in.h +# include netdb.h +# endif +# if HAVE_ARPA_INET_H +# include arpa/inet.h +# endif #endif + #include ext/standard/head.h #include php_string.h #include file.h + #if HAVE_PWD_H -#ifdef PHP_WIN32 -#include win32/pwd.h -#else -#include pwd.h -#endif +# ifdef PHP_WIN32 +# include win32/pwd.h +# else +# include pwd.h +# endif #endif + #ifdef HAVE_SYS_TIME_H -#include sys/time.h +# include sys/time.h #endif + #include fsock.h #include fopen_wrappers.h #include streamsfuncs.h #include php_globals.h #ifdef HAVE_SYS_FILE_H -#include sys/file.h +# include sys/file.h #endif #if MISSING_FCLOSE_DECL @@ -104,7 +109,7 @@ #endif #ifdef HAVE_SYS_MMAN_H -#include sys/mman.h +# include sys/mman.h #endif #include scanf.h @@ -117,18 +122,18 @@ #endif #if defined(HAVE_FNMATCH) !defined(PHP_WIN32) -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif -#include fnmatch.h +# ifndef _GNU_SOURCE +# define _GNU_SOURCE +# endif +# include fnmatch.h #endif #ifdef HAVE_WCHAR_H -#include wchar.h +# include wchar.h #endif #ifndef S_ISDIR -#define S_ISDIR(mode) (((mode)S_IFMT) == S_IFDIR) +# define S_ISDIR(mode) (((mode)S_IFMT) == S_IFDIR) #endif /* }}} */ @@ -198,7 +203,7 @@ REGISTER_LONG_CONSTANT(LOCK_UN, PHP_LOCK_UN, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(LOCK_NB, PHP_LOCK_NB, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(STREAM_NOTIFY_CONNECT, PHP_STREAM_NOTIFY_CONNECT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(STREAM_NOTIFY_CONNECT, PHP_STREAM_NOTIFY_CONNECT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(STREAM_NOTIFY_AUTH_REQUIRED, PHP_STREAM_NOTIFY_AUTH_REQUIRED,CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(STREAM_NOTIFY_AUTH_RESULT, PHP_STREAM_NOTIFY_AUTH_RESULT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(STREAM_NOTIFY_MIME_TYPE_IS, PHP_STREAM_NOTIFY_MIME_TYPE_IS, CONST_CS | CONST_PERSISTENT); @@ -209,9 +214,9 @@ REGISTER_LONG_CONSTANT(STREAM_NOTIFY_COMPLETED, PHP_STREAM_NOTIFY_COMPLETED,CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(STREAM_NOTIFY_RESOLVE, PHP_STREAM_NOTIFY_RESOLVE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(STREAM_NOTIFY_SEVERITY_INFO, PHP_STREAM_NOTIFY_SEVERITY_INFO,CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(STREAM_NOTIFY_SEVERITY_WARN, PHP_STREAM_NOTIFY_SEVERITY_WARN,CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(STREAM_NOTIFY_SEVERITY_ERR, PHP_STREAM_NOTIFY_SEVERITY_ERR, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(STREAM_NOTIFY_SEVERITY_INFO, PHP_STREAM_NOTIFY_SEVERITY_INFO,CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(STREAM_NOTIFY_SEVERITY_WARN,
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard file.c
janiThu May 21 02:15:03 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard file.c Log: MFH: ws http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.33r2=1.409.2.6.2.28.2.34diff_format=u Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.33 php-src/ext/standard/file.c:1.409.2.6.2.28.2.34 --- php-src/ext/standard/file.c:1.409.2.6.2.28.2.33 Mon May 18 18:45:30 2009 +++ php-src/ext/standard/file.c Thu May 21 02:15:03 2009 @@ -21,7 +21,7 @@ +--+ */ -/* $Id: file.c,v 1.409.2.6.2.28.2.33 2009/05/18 18:45:30 iliaa Exp $ */ +/* $Id: file.c,v 1.409.2.6.2.28.2.34 2009/05/21 02:15:03 jani Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -43,61 +43,66 @@ #include sys/types.h #include sys/stat.h #include fcntl.h + #ifdef PHP_WIN32 -#include io.h -#define O_RDONLY _O_RDONLY -#include win32/param.h -#include win32/winutil.h -#include win32/fnmatch.h +# include io.h +# define O_RDONLY _O_RDONLY +# include win32/param.h +# include win32/winutil.h +# include win32/fnmatch.h #elif defined(NETWARE) -#include sys/param.h -#include sys/select.h -#ifdef USE_WINSOCK -#include novsock2.h -#else -#include sys/socket.h -#include netinet/in.h -#include netdb.h -#endif +# include sys/param.h +# include sys/select.h +# ifdef USE_WINSOCK +# include novsock2.h +# else +# include sys/socket.h +# include netinet/in.h +# include netdb.h +# endif #else -#if HAVE_SYS_PARAM_H -#include sys/param.h -#endif -#if HAVE_SYS_SELECT_H -#include sys/select.h -#endif -#if defined(NETWARE) defined(USE_WINSOCK) -#include novsock2.h -#else -#include sys/socket.h -#include netinet/in.h -#include netdb.h -#endif -#if HAVE_ARPA_INET_H -#include arpa/inet.h -#endif +# if HAVE_SYS_PARAM_H +# include sys/param.h +# endif +# if HAVE_SYS_SELECT_H +# include sys/select.h +# endif +# if defined(NETWARE) defined(USE_WINSOCK) +# include novsock2.h +# else +# include sys/socket.h +# include netinet/in.h +# include netdb.h +# endif +# if HAVE_ARPA_INET_H +# include arpa/inet.h +# endif #endif + #include ext/standard/head.h #include safe_mode.h #include php_string.h #include file.h + #if HAVE_PWD_H -#ifdef PHP_WIN32 -#include win32/pwd.h -#else -#include pwd.h -#endif +# ifdef PHP_WIN32 +# include win32/pwd.h +# else +# include pwd.h +# endif #endif + #ifdef HAVE_SYS_TIME_H -#include sys/time.h +# include sys/time.h #endif + #include fsock.h #include fopen_wrappers.h #include streamsfuncs.h #include php_globals.h #ifdef HAVE_SYS_FILE_H -#include sys/file.h +# include sys/file.h #endif #if MISSING_FCLOSE_DECL @@ -105,7 +110,7 @@ #endif #ifdef HAVE_SYS_MMAN_H -#include sys/mman.h +# include sys/mman.h #endif #include scanf.h @@ -118,18 +123,18 @@ #endif #if defined(HAVE_FNMATCH) !defined(PHP_WIN32) -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif -#include fnmatch.h +# ifndef _GNU_SOURCE +# define _GNU_SOURCE +# endif +# include fnmatch.h #endif #ifdef HAVE_WCHAR_H -#include wchar.h +# include wchar.h #endif #ifndef S_ISDIR -#define S_ISDIR(mode) (((mode)S_IFMT) == S_IFDIR) +# define S_ISDIR(mode) (((mode)S_IFMT) == S_IFDIR) #endif /* }}} */ @@ -199,7 +204,7 @@ REGISTER_LONG_CONSTANT(LOCK_UN, PHP_LOCK_UN, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(LOCK_NB, PHP_LOCK_NB, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(STREAM_NOTIFY_CONNECT, PHP_STREAM_NOTIFY_CONNECT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(STREAM_NOTIFY_CONNECT, PHP_STREAM_NOTIFY_CONNECT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(STREAM_NOTIFY_AUTH_REQUIRED, PHP_STREAM_NOTIFY_AUTH_REQUIRED,CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(STREAM_NOTIFY_AUTH_RESULT, PHP_STREAM_NOTIFY_AUTH_RESULT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(STREAM_NOTIFY_MIME_TYPE_IS, PHP_STREAM_NOTIFY_MIME_TYPE_IS, CONST_CS | CONST_PERSISTENT); @@ -210,9 +215,9 @@ REGISTER_LONG_CONSTANT(STREAM_NOTIFY_COMPLETED, PHP_STREAM_NOTIFY_COMPLETED,CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(STREAM_NOTIFY_RESOLVE, PHP_STREAM_NOTIFY_RESOLVE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(STREAM_NOTIFY_SEVERITY_INFO, PHP_STREAM_NOTIFY_SEVERITY_INFO,CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(STREAM_NOTIFY_SEVERITY_WARN, PHP_STREAM_NOTIFY_SEVERITY_WARN,CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(STREAM_NOTIFY_SEVERITY_ERR, PHP_STREAM_NOTIFY_SEVERITY_ERR, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(STREAM_NOTIFY_SEVERITY_INFO,
[PHP-CVS] cvs: win-installer / PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerScripts53.vbs
jmertic Thu May 21 02:41:06 2009 UTC Added files: /win-installer PHPInstallerScripts53.vbs Modified files: /win-installer PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs Log: Bug 47855: Remove references to apache13 sapi in vbs custom actions. http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.19r2=1.20diff_format=u Index: win-installer/PHPInstallerBase53.wxs diff -u win-installer/PHPInstallerBase53.wxs:1.19 win-installer/PHPInstallerBase53.wxs:1.20 --- win-installer/PHPInstallerBase53.wxs:1.19 Sat Mar 21 01:58:33 2009 +++ win-installer/PHPInstallerBase53.wxsThu May 21 02:41:06 2009 @@ -489,7 +489,7 @@ /Feature /Feature -Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / +Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts53.vbs / Binary Id=WixCA src=Wix\wixca.dll/ CustomAction Id=netserveCGIInterpretersaddCmd http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.16r2=1.17diff_format=u Index: win-installer/PHPInstallerBase53NTS.wxs diff -u win-installer/PHPInstallerBase53NTS.wxs:1.16 win-installer/PHPInstallerBase53NTS.wxs:1.17 --- win-installer/PHPInstallerBase53NTS.wxs:1.16Fri Feb 20 15:48:16 2009 +++ win-installer/PHPInstallerBase53NTS.wxs Thu May 21 02:41:06 2009 @@ -412,7 +412,7 @@ /Feature /Feature -Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / +Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts53.vbs / Binary Id=WixCA src=Wix\wixca.dll/ CustomAction Id=iis700FastCGIaddCmd http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerScripts53.vbs?view=markuprev=1.1 Index: win-installer/PHPInstallerScripts53.vbs +++ win-installer/PHPInstallerScripts53.vbs Const ForReading = 1 Const ForWriting = 2 Sub configApache Dim objFSO Dim objFile strDirective = vbCrLf vbCrLf #BEGIN PHP INSTALLER EDITS - REMOVE ONLY ON UNINSTALL vbCrLf strApacheDir = Session.Property(APACHEDIR) strPHPPath = Replace(Session.TargetPath(INSTALLDIR),\,/) If ( right(strApacheDir,1) \ ) then strApacheDir = strApacheDir \ End If If ( Session.FeatureRequestState(apacheCGI) = 3 ) Then strDirective = strDirective ScriptAlias /php/ strPHPPath vbCrLf strDirective = strDirective Action application/x-httpd-php strPHPPath php-cgi.exe vbCrLf End If If ( Session.FeatureRequestState(apache22) = 3 ) Then strDirective = strDirective PHPIniDir strPHPPath vbCrLf strDirective = strDirective LoadModule php5_module strPHPPath php5apache2_2.dll vbCrLf End If 'If ( Session.FeatureRequestState(apache20) = 3 ) Then 'strDirective = strDirective PHPIniDir strPHPPath vbCrLf 'strDirective = strDirective LoadModule php5_module strPHPPath php5apache2.dll vbCrLf 'End If strDirective = strDirective #END PHP INSTALLER EDITS - REMOVE ONLY ON UNINSTALL vbCrLf Set objFSO = CreateObject(Scripting.FileSystemObject) strFileName = strApacheDir httpd.conf If objFSO.FileExists(strFileName) Then Set objFile = objFSO.OpenTextFile( strFileName, ForReading) Else strFileName = strApacheDir conf\httpd.conf If objFSO.FileExists(strFileName) Then Set objFile = objFSO.OpenTextFile( strFileName, ForReading) Else FatalError (Error trying access httpd.conf file.) Exit Sub End If End If strText = objFile.ReadAll objFile.Close ' try and comment out old directives if they exist strText = Replace(strText,ScriptAlias /php/,#ScriptAlias /php/) strText = Replace(strText,Action application/x-httpd-php,#Action application/x-httpd-php) strText = Replace(strText,PHPIniDir,#PHPIniDir) strText = Replace(strText,LoadModule php5_module,#LoadModule php5_module) strText = strText strDirective ' backup old file strBackupFileName = strFileName .bak objFSO.CopyFile strFileName, strBackupFileName Set objFile = objFSO.OpenTextFile( strFileName, ForWriting) objFile.WriteLine strText objFile.Close strFileName = strApacheDir mime.types If objFSO.FileExists(strFileName) Then Set objFile = objFSO.OpenTextFile( strFileName, ForReading) Else strFileName = strApacheDir conf\mime.types If objFSO.FileExists(strFileName) Then Set objFile = objFSO.OpenTextFile( strFileName, ForReading) Else FatalError (Error trying access mime.types file.) Exit Sub End If End If strText = objFile.ReadAll objFile.Close If ( InStr(strText,application/x-httpd-php) = 0 ) Then strText = strText application/x-httpd-php vbTab php vbCrLf End If If (
