[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct/tests test.inc test_connection_caching.phpt
thekid Mon Nov 10 11:00:48 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sybase_ct/teststest.inc test_connection_caching.phpt Log: - Added test for optional parameter "new" to sybase_connect() http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test.inc?r1=1.4.6.3.2.1&r2=1.4.6.3.2.2&diff_format=u Index: php-src/ext/sybase_ct/tests/test.inc diff -u php-src/ext/sybase_ct/tests/test.inc:1.4.6.3.2.1 php-src/ext/sybase_ct/tests/test.inc:1.4.6.3.2.2 --- php-src/ext/sybase_ct/tests/test.inc:1.4.6.3.2.1Sat Nov 8 11:47:35 2008 +++ php-src/ext/sybase_ct/tests/test.incMon Nov 10 11:00:48 2008 @@ -1,7 +1,7 @@ http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_connection_caching.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/sybase_ct/tests/test_connection_caching.phpt diff -u php-src/ext/sybase_ct/tests/test_connection_caching.phpt:1.1.2.1 php-src/ext/sybase_ct/tests/test_connection_caching.phpt:1.1.2.2 --- php-src/ext/sybase_ct/tests/test_connection_caching.phpt:1.1.2.1Sun Nov 9 10:57:09 2008 +++ php-src/ext/sybase_ct/tests/test_connection_caching.phptMon Nov 10 11:00:48 2008 @@ -6,18 +6,21 @@ --EXPECTF-- resource(%d) of type (sybase-ct link) resource(%d) of type (sybase-ct link) +resource(%d) of type (sybase-ct link) bool(true) +bool(false) -- 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/standard/tests/streams stream_get_contents_002.phpt /main/streams streams.c
lbarnaudTue Nov 11 01:56:34 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/streams stream_get_contents_002.phpt
Modified files:
/php-src/main/streams streams.c
/php-srcNEWS
Log:
MFH: Fixed stream_get_contents() when using $maxlength and socket is not
closed. [EMAIL PROTECTED] on #46049.
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.29&r2=1.82.2.6.2.30&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.29
php-src/main/streams/streams.c:1.82.2.6.2.30
--- php-src/main/streams/streams.c:1.82.2.6.2.29Tue Nov 4 17:07:20 2008
+++ php-src/main/streams/streams.c Tue Nov 11 01:56:33 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.6.2.29 2008/11/04 17:07:20 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.30 2008/11/11 01:56:33 lbarnaud Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1234,7 +1234,7 @@
if (maxlen > 0) {
ptr = *buf = pemalloc_rel_orig(maxlen + 1, persistent);
- while ((len < maxlen) & !php_stream_eof(src)) {
+ while ((len < maxlen) && !php_stream_eof(src)) {
ret = php_stream_read(src, ptr, maxlen - len);
len += ret;
ptr += ret;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1310&r2=1.2027.2.547.2.1311&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1310 php-src/NEWS:1.2027.2.547.2.1311
--- php-src/NEWS:1.2027.2.547.2.1310Tue Nov 11 00:45:36 2008
+++ php-src/NEWSTue Nov 11 01:56:33 2008
@@ -9,6 +9,9 @@
- Fixed bug #44818 (php://memory writeable when opened read only). (Arnaud)
- Fixed bug #30312 (sybase_unbuffered_query calls). (Timm)
+- Fixed stream_get_contents() when using $maxlength and socket is not
+ closed. [EMAIL PROTECTED] on #46049. (Arnaud)
+
06 Nov 2008, PHP 5.2.7RC3
- Added PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION,
PHP_EXTRA_VERSION, PHP_VERSION_ID, PHP_ZTS and PHP_DEBUG constants. (Pierre)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_contents_002.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/streams/stream_get_contents_002.phpt
+++ php-src/ext/standard/tests/streams/stream_get_contents_002.phpt
--TEST--
stream_get_contents() - Testing on socket with $maxlength
--SKIPIF--
--FILE--
--EXPECT--
string(3) "foo"
--
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/tests/streams stream_get_contents_002.phpt /main/streams streams.c
lbarnaudTue Nov 11 01:55:51 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/streams stream_get_contents_002.phpt
Modified files:
/php-src/main/streams streams.c
Log:
MFH: Fixed stream_get_contents() when using $maxlength and socket is not
closed. [EMAIL PROTECTED] on #46049.
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.18.2.18&r2=1.82.2.6.2.18.2.19&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.18.2.18
php-src/main/streams/streams.c:1.82.2.6.2.18.2.19
--- php-src/main/streams/streams.c:1.82.2.6.2.18.2.18 Tue Nov 4 17:05:55 2008
+++ php-src/main/streams/streams.c Tue Nov 11 01:55:51 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.6.2.18.2.18 2008/11/04 17:05:55 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.18.2.19 2008/11/11 01:55:51 lbarnaud Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1243,7 +1243,7 @@
if (maxlen > 0) {
ptr = *buf = pemalloc_rel_orig(maxlen + 1, persistent);
- while ((len < maxlen) & !php_stream_eof(src)) {
+ while ((len < maxlen) && !php_stream_eof(src)) {
ret = php_stream_read(src, ptr, maxlen - len);
len += ret;
ptr += ret;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_contents_002.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/streams/stream_get_contents_002.phpt
+++ php-src/ext/standard/tests/streams/stream_get_contents_002.phpt
--TEST--
stream_get_contents() - Testing on socket with $maxlength
--SKIPIF--
--FILE--
--EXPECT--
string(3) "foo"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/streams stream_get_contents_002.phpt /main/streams streams.c
lbarnaudTue Nov 11 01:55:19 2008 UTC
Added files:
/php-src/ext/standard/tests/streams stream_get_contents_002.phpt
Modified files:
/php-src/main/streams streams.c
Log:
Fixed stream_get_contents() when using $maxlength and socket is not
closed. [EMAIL PROTECTED] on #46049.
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.173&r2=1.174&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.173
php-src/main/streams/streams.c:1.174
--- php-src/main/streams/streams.c:1.173Tue Nov 4 17:05:17 2008
+++ php-src/main/streams/streams.c Tue Nov 11 01:55:19 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.173 2008/11/04 17:05:17 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.174 2008/11/11 01:55:19 lbarnaud Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1672,7 +1672,7 @@
if (maxlen > 0) {
if (rettype == IS_UNICODE) {
ptr.u = *buf = pemalloc_rel_orig(UBYTES(maxlen + 1),
persistent);
- while ((len < maxlen) & !php_stream_eof(src)) {
+ while ((len < maxlen) && !php_stream_eof(src)) {
int ulen;
ret = php_stream_read_unicode_ex(src, ptr.u,
maxlen - len, maxchars);
@@ -1685,7 +1685,7 @@
return len;
} else {
ptr.s = *buf = pemalloc_rel_orig(maxlen + 1,
persistent);
- while ((len < maxlen) & !php_stream_eof(src)) {
+ while ((len < maxlen) && !php_stream_eof(src)) {
ret = php_stream_read(src, ptr.s, maxlen - len);
len += ret;
ptr.s += ret;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_contents_002.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/streams/stream_get_contents_002.phpt
+++ php-src/ext/standard/tests/streams/stream_get_contents_002.phpt
--TEST--
stream_get_contents() - Testing on socket with $maxlength
--SKIPIF--
--FILE--
--EXPECT--
string(3) "foo"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/curl interface.c
2008/11/10 Pierre-Alain Joye <[EMAIL PROTECTED]>:
> pajoye Mon Nov 10 22:58:44 2008 UTC
>
> Modified files:
>/php-src/ext/curl interface.c
> Log:
> - make the curl phpinfo more verbose
>
> http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.128&r2=1.129&diff_format=u
> Index: php-src/ext/curl/interface.c
> diff -u php-src/ext/curl/interface.c:1.128 php-src/ext/curl/interface.c:1.129
> --- php-src/ext/curl/interface.c:1.128 Sun Nov 2 21:10:07 2008
> +++ php-src/ext/curl/interface.cMon Nov 10 22:58:44 2008
> @@ -16,7 +16,7 @@
>+--+
> */
>
> -/* $Id: interface.c,v 1.128 2008/11/02 21:10:07 felipe Exp $ */
> +/* $Id: interface.c,v 1.129 2008/11/10 22:58:44 pajoye Exp $ */
>
> #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
>
> @@ -336,9 +336,94 @@
> */
> PHP_MINFO_FUNCTION(curl)
> {
> + curl_version_info_data *d;
> + char **p;
> + char str[1024];
> + size_t n = 0;
> +
> +
> + d = curl_version_info(CURLVERSION_NOW);
>php_info_print_table_start();
>php_info_print_table_row(2, "cURL support","enabled");
> - php_info_print_table_row(2, "cURL Information", curl_version());
> + php_info_print_table_row(2, "cURL Information", d->version);
> + sprintf(str, "%d", d->age);
> + php_info_print_table_row(2, "Age", str);
> +
> +
> + if (d->features & CURL_VERSION_IPV6) {
> + n = sprintf(str, "%s", "IPv6-enabled, ");
> + }
> + if (d->features & CURL_VERSION_KERBEROS4) {
> + n += sprintf(str + n, "%s", "kerberos auth is
> supported, ");
> + }
> + if (d->features & CURL_VERSION_SSL) {
> + n += sprintf(str + n, "%s", "SSL options are present,
> ");
> + }
> + if (d->features & CURL_VERSION_LIBZ) {
> + n += sprintf(str + n, "%s", "libz features are
> present, ");
> + }
> + if (d->features & CURL_VERSION_NTLM) {
> + n += sprintf(str + n, "%s", "NTLM auth is supported,
> ");
> + }
> + if (d->features & CURL_VERSION_GSSNEGOTIATE) {
> + n += sprintf(str + n, "%s", "Negotiate auth support,
> ");
> + }
> + if (d->features & CURL_VERSION_DEBUG) {
> + n += sprintf(str + n, "%s", "built with debug
> capabilities, ");
> + }
> + if (d->features & CURL_VERSION_ASYNCHDNS) {
> + n += sprintf(str + n, "%s", "asynchronous dns
> resolves, ");
> + }
> + if (d->features & CURL_VERSION_SPNEGO) {
> + n += sprintf(str + n, "%s", "SPNEGO auth, ");
> + }
> + if (d->features & CURL_VERSION_LARGEFILE) {
> + n += sprintf(str + n, "%s", "supports files bigger
> than 2GB, ");
> + }
> + if (d->features & CURL_VERSION_IDN) {
> + n += sprintf(str + n, "%s", "International Domain
> Names support, ");
> + }
> + if (d->features & CURL_VERSION_SSPI) {
> + n += sprintf(str + n, "%s", "SSPI is supported, ");
> + }
> + if (d->features & CURL_VERSION_CONV) {
> + n += sprintf(str + n, "%s", "character conversions
> are supported, ");
> + }
> +
> + if (n > 3) {
> + str[n - 2] = '\0';
> + }
> + php_info_print_table_row(2, "Features", str);
> + n = 0;
> + p = (char **) d->protocols;
> + while (*p != NULL) {
> + n += sprintf(str + n, "%s%s", *p, *(p + 1) != NULL ?
> ", " : "");
> + p++;
> + }
> + php_info_print_table_row(2, "Protocols", str);
> +
> + php_info_print_table_row(2, "Host", d->host);
> +
> + if (d->ssl_version) {
> + php_info_print_table_row(2, "SSL Version", d->ssl_version);
> + }
> +
> + if (d->libz_version) {
> + php_info_print_table_row(2, "ZLib Version", d->libz_version);
> + }
> +
> + if (d->libz_version) {
> + php_info_print_table_row(2, "libIDN Version", d->libidn);
> + }
> +
> + if (d->iconv_ver_num) {
> + php_info_print_table_row(2, "IconV Version",
> d->iconv_ver_num);
> + }
> +
> + if (d->libssh_version) {
> + php_info_print_table_row(2, "libSSH Version",
> d->libssh_version);
> + }
> +
>php_info_print_table_end();
> }
> /* }}} */
>
I don't remember which versions that ext/curl minimum supports, but
the CURL_VERSION_CONV was added in 7.15.4 so unless thats below the
minimum version required 7.15.4 is required.
Also adding the CURL_VERSION_* constants to userland so they can use
the bitmask exposed by curl_version()['features'] to check for such
features might be a good ideal :)
--
Kalle Sommer Nielsen
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http:/
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard php_fopen_wrapper.c /ext/standard/tests/streams bug44818.phpt
lbarnaudTue Nov 11 00:45:36 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/streams bug44818.phpt
Modified files:
/php-src/ext/standard php_fopen_wrapper.c
/php-srcNEWS
Log:
MFH: Fixed bug #44818 (php://memory writeable when opened read only)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_fopen_wrapper.c?r1=1.45.2.4.2.10&r2=1.45.2.4.2.11&diff_format=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.10
php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.11
--- php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.10 Tue Nov 4
21:05:55 2008
+++ php-src/ext/standard/php_fopen_wrapper.cTue Nov 11 00:45:36 2008
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_fopen_wrapper.c,v 1.45.2.4.2.10 2008/11/04 21:05:55 lbarnaud Exp $
*/
+/* $Id: php_fopen_wrapper.c,v 1.45.2.4.2.11 2008/11/11 00:45:36 lbarnaud Exp $
*/
#include
#include
@@ -176,11 +176,21 @@
return NULL;
}
}
- return php_stream_temp_create(TEMP_STREAM_DEFAULT, max_memory);
+ if (strpbrk(mode, "wa+")) {
+ mode_rw = TEMP_STREAM_DEFAULT;
+ } else {
+ mode_rw = TEMP_STREAM_READONLY;
+ }
+ return php_stream_temp_create(mode_rw, max_memory);
}
if (!strcasecmp(path, "memory")) {
- return php_stream_memory_create(TEMP_STREAM_DEFAULT);
+ if (strpbrk(mode, "wa+")) {
+ mode_rw = TEMP_STREAM_DEFAULT;
+ } else {
+ mode_rw = TEMP_STREAM_READONLY;
+ }
+ return php_stream_memory_create(mode_rw);
}
if (!strcasecmp(path, "output")) {
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1309&r2=1.2027.2.547.2.1310&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1309 php-src/NEWS:1.2027.2.547.2.1310
--- php-src/NEWS:1.2027.2.547.2.1309Sun Nov 9 11:39:27 2008
+++ php-src/NEWSTue Nov 11 00:45:36 2008
@@ -6,6 +6,7 @@
- Fixed bug #46521 (Curl ZTS OpenSSL, error in config.m4 fragment).
(jd at cpanel dot net)
+- Fixed bug #44818 (php://memory writeable when opened read only). (Arnaud)
- Fixed bug #30312 (sybase_unbuffered_query calls). (Timm)
06 Nov 2008, PHP 5.2.7RC3
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/bug44818.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/streams/bug44818.phpt
+++ php-src/ext/standard/tests/streams/bug44818.phpt
--TEST--
Bug #44818 (php://memory writeable when opened read only)
--FILE--
--EXPECTF--
php://memory, r
resource(%d) of type (stream)
int(0)
int(0)
string(0) ""
php://memory, r+
resource(%d) of type (stream)
int(3)
int(0)
string(3) "foo"
php://temp, r
resource(%d) of type (stream)
int(0)
int(0)
string(0) ""
php://temp, w
resource(%d) of type (stream)
int(3)
int(0)
string(3) "foo"
--
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 php_fopen_wrapper.c /ext/standard/tests/streams bug44818.phpt
lbarnaudTue Nov 11 00:44:55 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/streams bug44818.phpt
Modified files:
/php-src/ext/standard php_fopen_wrapper.c
Log:
MFH: Fixed bug #44818 (php://memory writeable when opened read only)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_fopen_wrapper.c?r1=1.45.2.4.2.7.2.4&r2=1.45.2.4.2.7.2.5&diff_format=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.7.2.4
php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.7.2.5
--- php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.7.2.4 Tue Nov 4
21:05:31 2008
+++ php-src/ext/standard/php_fopen_wrapper.cTue Nov 11 00:44:55 2008
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_fopen_wrapper.c,v 1.45.2.4.2.7.2.4 2008/11/04 21:05:31 lbarnaud
Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.45.2.4.2.7.2.5 2008/11/11 00:44:55 lbarnaud
Exp $ */
#include
#include
@@ -177,11 +177,21 @@
return NULL;
}
}
- return php_stream_temp_create(TEMP_STREAM_DEFAULT, max_memory);
+ if (strpbrk(mode, "wa+")) {
+ mode_rw = TEMP_STREAM_DEFAULT;
+ } else {
+ mode_rw = TEMP_STREAM_READONLY;
+ }
+ return php_stream_temp_create(mode_rw, max_memory);
}
if (!strcasecmp(path, "memory")) {
- return php_stream_memory_create(TEMP_STREAM_DEFAULT);
+ if (strpbrk(mode, "wa+")) {
+ mode_rw = TEMP_STREAM_DEFAULT;
+ } else {
+ mode_rw = TEMP_STREAM_READONLY;
+ }
+ return php_stream_memory_create(mode_rw);
}
if (!strcasecmp(path, "output")) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/bug44818.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/streams/bug44818.phpt
+++ php-src/ext/standard/tests/streams/bug44818.phpt
--TEST--
Bug #44818 (php://memory writeable when opened read only)
--FILE--
--EXPECTF--
php://memory, r
resource(%d) of type (stream)
int(0)
int(0)
string(0) ""
php://memory, r+
resource(%d) of type (stream)
int(3)
int(0)
string(3) "foo"
php://temp, r
resource(%d) of type (stream)
int(0)
int(0)
string(0) ""
php://temp, w
resource(%d) of type (stream)
int(3)
int(0)
string(3) "foo"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard php_fopen_wrapper.c /ext/standard/tests/streams bug44818.phpt
lbarnaudTue Nov 11 00:44:37 2008 UTC
Added files:
/php-src/ext/standard/tests/streams bug44818.phpt
Modified files:
/php-src/ext/standard php_fopen_wrapper.c
Log:
Fixed bug #44818 (php://memory writeable when opened read only)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_fopen_wrapper.c?r1=1.64&r2=1.65&diff_format=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.64
php-src/ext/standard/php_fopen_wrapper.c:1.65
--- php-src/ext/standard/php_fopen_wrapper.c:1.64 Tue Nov 4 21:04:28 2008
+++ php-src/ext/standard/php_fopen_wrapper.cTue Nov 11 00:44:36 2008
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_fopen_wrapper.c,v 1.64 2008/11/04 21:04:28 lbarnaud Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.65 2008/11/11 00:44:36 lbarnaud Exp $ */
#include
#include
@@ -186,11 +186,21 @@
return NULL;
}
}
- return php_stream_temp_create(TEMP_STREAM_DEFAULT, max_memory);
+ if (strpbrk(mode, "wa+")) {
+ mode_rw = TEMP_STREAM_DEFAULT;
+ } else {
+ mode_rw = TEMP_STREAM_READONLY;
+ }
+ return php_stream_temp_create(mode_rw, max_memory);
}
if (!strcasecmp(path, "memory")) {
- return php_stream_memory_create(TEMP_STREAM_DEFAULT);
+ if (strpbrk(mode, "wa+")) {
+ mode_rw = TEMP_STREAM_DEFAULT;
+ } else {
+ mode_rw = TEMP_STREAM_READONLY;
+ }
+ return php_stream_memory_create(mode_rw);
}
if (!strcasecmp(path, "output")) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/bug44818.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/streams/bug44818.phpt
+++ php-src/ext/standard/tests/streams/bug44818.phpt
--TEST--
Bug #44818 (php://memory writeable when opened read only)
--FILE--
--EXPECTF--
php://memory, r
resource(%d) of type (stream)
int(0)
int(0)
string(0) ""
php://memory, r+
resource(%d) of type (stream)
int(3)
int(0)
string(3) "foo"
php://temp, r
resource(%d) of type (stream)
int(0)
int(0)
string(0) ""
php://temp, w
resource(%d) of type (stream)
int(3)
int(0)
string(3) "foo"
--
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 /ext/standard/tests/file bug45585.phpt
lbarnaudTue Nov 11 00:40:05 2008 UTC
Added files:
/php-src/ext/standard/tests/filebug45585.phpt
Modified files:
/php-src/ext/standard file.c
Log:
Fixed bug #45585 (fread() return value for EOF inconsistent
between PHP 5 and 6)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.530&r2=1.531&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.530 php-src/ext/standard/file.c:1.531
--- php-src/ext/standard/file.c:1.530 Tue Oct 21 22:06:48 2008
+++ php-src/ext/standard/file.c Tue Nov 11 00:40:04 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.530 2008/10/21 22:06:48 lbarnaud Exp $ */
+/* $Id: file.c,v 1.531 2008/11/11 00:40:04 lbarnaud Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1984,19 +1984,11 @@
int buflen = len;
UChar *buf = php_stream_read_unicode_chars(stream, &buflen);
- if (!buf) {
- RETURN_FALSE;
- }
-
RETURN_UNICODEL(buf, buflen, 0);
} else { /* IS_STRING */
char *buf = emalloc(len + 1);
int buflen = php_stream_read(stream, buf, len);
- if (!buflen) {
- efree(buf);
- RETURN_FALSE;
- }
buf[buflen] = 0;
RETURN_STRINGL(buf, buflen, 0);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug45585.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/file/bug45585.phpt
+++ php-src/ext/standard/tests/file/bug45585.phpt
--TEST--
Bug #45585 (fread() return value for EOF inconsistent between PHP 5 and 6)
--FILE--
--EXPECTF--
resource(%d) of type (stream)
string(3) "foo"
string(0) ""
--
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
pajoye Mon Nov 10 22:59:28 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/curl interface.c
Log:
- MFH: make the curl phpinfo more verbose
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.15&r2=1.62.2.14.2.27.2.16&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.15
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.16
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.15Sun Nov 2 21:19:30 2008
+++ php-src/ext/curl/interface.cMon Nov 10 22:59:28 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.14.2.27.2.15 2008/11/02 21:19:30 felipe Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.16 2008/11/10 22:59:28 pajoye Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -338,9 +338,96 @@
*/
PHP_MINFO_FUNCTION(curl)
{
+
+
+ curl_version_info_data *d;
+ char **p;
+ char str[1024];
+ size_t n = 0;
+
+
+ d = curl_version_info(CURLVERSION_NOW);
php_info_print_table_start();
php_info_print_table_row(2, "cURL support","enabled");
- php_info_print_table_row(2, "cURL Information", curl_version());
+ php_info_print_table_row(2, "cURL Information", d->version);
+ sprintf(str, "%d", d->age);
+ php_info_print_table_row(2, "Age", str);
+
+
+ if (d->features & CURL_VERSION_IPV6) {
+ n = sprintf(str, "%s", "IPv6-enabled, ");
+ }
+ if (d->features & CURL_VERSION_KERBEROS4) {
+ n += sprintf(str + n, "%s", "kerberos auth is
supported, ");
+ }
+ if (d->features & CURL_VERSION_SSL) {
+ n += sprintf(str + n, "%s", "SSL options are present,
");
+ }
+ if (d->features & CURL_VERSION_LIBZ) {
+ n += sprintf(str + n, "%s", "libz features are present,
");
+ }
+ if (d->features & CURL_VERSION_NTLM) {
+ n += sprintf(str + n, "%s", "NTLM auth is supported, ");
+ }
+ if (d->features & CURL_VERSION_GSSNEGOTIATE) {
+ n += sprintf(str + n, "%s", "Negotiate auth support, ");
+ }
+ if (d->features & CURL_VERSION_DEBUG) {
+ n += sprintf(str + n, "%s", "built with debug
capabilities, ");
+ }
+ if (d->features & CURL_VERSION_ASYNCHDNS) {
+ n += sprintf(str + n, "%s", "asynchronous dns resolves,
");
+ }
+ if (d->features & CURL_VERSION_SPNEGO) {
+ n += sprintf(str + n, "%s", "SPNEGO auth, ");
+ }
+ if (d->features & CURL_VERSION_LARGEFILE) {
+ n += sprintf(str + n, "%s", "supports files bigger than
2GB, ");
+ }
+ if (d->features & CURL_VERSION_IDN) {
+ n += sprintf(str + n, "%s", "International Domain Names
support, ");
+ }
+ if (d->features & CURL_VERSION_SSPI) {
+ n += sprintf(str + n, "%s", "SSPI is supported, ");
+ }
+ if (d->features & CURL_VERSION_CONV) {
+ n += sprintf(str + n, "%s", "character conversions are
supported, ");
+ }
+
+ if (n > 3) {
+ str[n - 2] = '\0';
+ }
+ php_info_print_table_row(2, "Features", str);
+ n = 0;
+ p = (char **) d->protocols;
+ while (*p != NULL) {
+ n += sprintf(str + n, "%s%s", *p, *(p + 1) != NULL ? ",
" : "");
+ p++;
+ }
+ php_info_print_table_row(2, "Protocols", str);
+
+ php_info_print_table_row(2, "Host", d->host);
+
+ if (d->ssl_version) {
+ php_info_print_table_row(2, "SSL Version", d->ssl_version);
+ }
+
+ if (d->libz_version) {
+ php_info_print_table_row(2, "ZLib Version", d->libz_version);
+ }
+
+ if (d->libz_version) {
+ php_info_print_table_row(2, "libIDN Version", d->libidn);
+ }
+
+ if (d->iconv_ver_num) {
+ php_info_print_table_row(2, "IconV Version", d->iconv_ver_num);
+ }
+
+ if (d->libssh_version) {
+ php_info_print_table_row(2, "libSSH Version",
d->libssh_version);
+ }
+
php_info_print_table_end();
}
/* }}} */
--
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
pajoye Mon Nov 10 22:58:44 2008 UTC
Modified files:
/php-src/ext/curl interface.c
Log:
- make the curl phpinfo more verbose
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.128&r2=1.129&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.128 php-src/ext/curl/interface.c:1.129
--- php-src/ext/curl/interface.c:1.128 Sun Nov 2 21:10:07 2008
+++ php-src/ext/curl/interface.cMon Nov 10 22:58:44 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.128 2008/11/02 21:10:07 felipe Exp $ */
+/* $Id: interface.c,v 1.129 2008/11/10 22:58:44 pajoye Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -336,9 +336,94 @@
*/
PHP_MINFO_FUNCTION(curl)
{
+ curl_version_info_data *d;
+ char **p;
+ char str[1024];
+ size_t n = 0;
+
+
+ d = curl_version_info(CURLVERSION_NOW);
php_info_print_table_start();
php_info_print_table_row(2, "cURL support","enabled");
- php_info_print_table_row(2, "cURL Information", curl_version());
+ php_info_print_table_row(2, "cURL Information", d->version);
+ sprintf(str, "%d", d->age);
+ php_info_print_table_row(2, "Age", str);
+
+
+ if (d->features & CURL_VERSION_IPV6) {
+ n = sprintf(str, "%s", "IPv6-enabled, ");
+ }
+ if (d->features & CURL_VERSION_KERBEROS4) {
+ n += sprintf(str + n, "%s", "kerberos auth is
supported, ");
+ }
+ if (d->features & CURL_VERSION_SSL) {
+ n += sprintf(str + n, "%s", "SSL options are present,
");
+ }
+ if (d->features & CURL_VERSION_LIBZ) {
+ n += sprintf(str + n, "%s", "libz features are present,
");
+ }
+ if (d->features & CURL_VERSION_NTLM) {
+ n += sprintf(str + n, "%s", "NTLM auth is supported, ");
+ }
+ if (d->features & CURL_VERSION_GSSNEGOTIATE) {
+ n += sprintf(str + n, "%s", "Negotiate auth support, ");
+ }
+ if (d->features & CURL_VERSION_DEBUG) {
+ n += sprintf(str + n, "%s", "built with debug
capabilities, ");
+ }
+ if (d->features & CURL_VERSION_ASYNCHDNS) {
+ n += sprintf(str + n, "%s", "asynchronous dns resolves,
");
+ }
+ if (d->features & CURL_VERSION_SPNEGO) {
+ n += sprintf(str + n, "%s", "SPNEGO auth, ");
+ }
+ if (d->features & CURL_VERSION_LARGEFILE) {
+ n += sprintf(str + n, "%s", "supports files bigger than
2GB, ");
+ }
+ if (d->features & CURL_VERSION_IDN) {
+ n += sprintf(str + n, "%s", "International Domain Names
support, ");
+ }
+ if (d->features & CURL_VERSION_SSPI) {
+ n += sprintf(str + n, "%s", "SSPI is supported, ");
+ }
+ if (d->features & CURL_VERSION_CONV) {
+ n += sprintf(str + n, "%s", "character conversions are
supported, ");
+ }
+
+ if (n > 3) {
+ str[n - 2] = '\0';
+ }
+ php_info_print_table_row(2, "Features", str);
+ n = 0;
+ p = (char **) d->protocols;
+ while (*p != NULL) {
+ n += sprintf(str + n, "%s%s", *p, *(p + 1) != NULL ? ",
" : "");
+ p++;
+ }
+ php_info_print_table_row(2, "Protocols", str);
+
+ php_info_print_table_row(2, "Host", d->host);
+
+ if (d->ssl_version) {
+ php_info_print_table_row(2, "SSL Version", d->ssl_version);
+ }
+
+ if (d->libz_version) {
+ php_info_print_table_row(2, "ZLib Version", d->libz_version);
+ }
+
+ if (d->libz_version) {
+ php_info_print_table_row(2, "libIDN Version", d->libidn);
+ }
+
+ if (d->iconv_ver_num) {
+ php_info_print_table_row(2, "IconV Version", d->iconv_ver_num);
+ }
+
+ if (d->libssh_version) {
+ php_info_print_table_row(2, "libSSH Version",
d->libssh_version);
+ }
+
php_info_print_table_end();
}
/* }}} */
--
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/interbase/tests ibase_affected_rows_001.phpt ibase_errmsg_001.phpt ibase_num_params_001.phpt
felipe Mon Nov 10 22:35:02 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/interbase/testsibase_affected_rows_001.phpt ibase_errmsg_001.phpt ibase_num_params_001.phpt Log: - Make expected result compatible with recent Firebird version http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_affected_rows_001.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/interbase/tests/ibase_affected_rows_001.phpt diff -u php-src/ext/interbase/tests/ibase_affected_rows_001.phpt:1.1.4.2 php-src/ext/interbase/tests/ibase_affected_rows_001.phpt:1.1.4.3 --- php-src/ext/interbase/tests/ibase_affected_rows_001.phpt:1.1.4.2Mon Nov 10 18:04:41 2008 +++ php-src/ext/interbase/tests/ibase_affected_rows_001.phptMon Nov 10 22:35:02 2008 @@ -28,5 +28,5 @@ int(3) int(0) -Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end of command in %s on line %d +Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end of command %s on line %d int(0) http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_errmsg_001.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/interbase/tests/ibase_errmsg_001.phpt diff -u php-src/ext/interbase/tests/ibase_errmsg_001.phpt:1.1.4.2 php-src/ext/interbase/tests/ibase_errmsg_001.phpt:1.1.4.3 --- php-src/ext/interbase/tests/ibase_errmsg_001.phpt:1.1.4.2 Mon Nov 10 18:04:41 2008 +++ php-src/ext/interbase/tests/ibase_errmsg_001.phpt Mon Nov 10 22:35:02 2008 @@ -17,6 +17,6 @@ ?> --EXPECTF-- -Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end of command in %s on line %d -string(66) "Dynamic SQL Error SQL error code = -104 Unexpected end of command " +Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end of command %s on line %d +string(%d) "Dynamic SQL Error SQL error code = -104 Unexpected end of command %s" bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_num_params_001.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/interbase/tests/ibase_num_params_001.phpt diff -u php-src/ext/interbase/tests/ibase_num_params_001.phpt:1.1.4.2 php-src/ext/interbase/tests/ibase_num_params_001.phpt:1.1.4.3 --- php-src/ext/interbase/tests/ibase_num_params_001.phpt:1.1.4.2 Mon Nov 10 18:04:41 2008 +++ php-src/ext/interbase/tests/ibase_num_params_001.phpt Mon Nov 10 22:35:02 2008 @@ -26,7 +26,7 @@ Warning: Wrong parameter count for ibase_num_params() in %s on line %d NULL -Warning: ibase_prepare(): Dynamic SQL Error SQL error code = -206 Column unknown X At line 1, column 52. in %s on line %d +Warning: ibase_prepare(): Dynamic SQL Error SQL error code = -206 Column unknown X At line 1, column 52%s in %s on line %d Warning: ibase_num_params(): supplied argument is not a valid Firebird/InterBase query resource in %s on line %d bool(false) -- 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/interbase/tests ibase_affected_rows_001.phpt ibase_errmsg_001.phpt ibase_num_params_001.phpt
felipe Mon Nov 10 22:33:54 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/interbase/testsibase_affected_rows_001.phpt ibase_errmsg_001.phpt ibase_num_params_001.phpt Log: - Make expected result compatible with recent Firebird version http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_affected_rows_001.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/interbase/tests/ibase_affected_rows_001.phpt diff -u php-src/ext/interbase/tests/ibase_affected_rows_001.phpt:1.1.2.2 php-src/ext/interbase/tests/ibase_affected_rows_001.phpt:1.1.2.3 --- php-src/ext/interbase/tests/ibase_affected_rows_001.phpt:1.1.2.2Mon Nov 10 18:02:56 2008 +++ php-src/ext/interbase/tests/ibase_affected_rows_001.phptMon Nov 10 22:33:53 2008 @@ -28,5 +28,5 @@ int(3) int(0) -Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end of command in %s on line %d +Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end of command %s on line %d int(0) http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_errmsg_001.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/interbase/tests/ibase_errmsg_001.phpt diff -u php-src/ext/interbase/tests/ibase_errmsg_001.phpt:1.1.2.2 php-src/ext/interbase/tests/ibase_errmsg_001.phpt:1.1.2.3 --- php-src/ext/interbase/tests/ibase_errmsg_001.phpt:1.1.2.2 Mon Nov 10 18:02:56 2008 +++ php-src/ext/interbase/tests/ibase_errmsg_001.phpt Mon Nov 10 22:33:53 2008 @@ -17,6 +17,6 @@ ?> --EXPECTF-- -Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end of command in %s on line %d -string(66) "Dynamic SQL Error SQL error code = -104 Unexpected end of command " +Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end of command %s on line %d +string(%d) "Dynamic SQL Error SQL error code = -104 Unexpected end of command %s" bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_num_params_001.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/interbase/tests/ibase_num_params_001.phpt diff -u php-src/ext/interbase/tests/ibase_num_params_001.phpt:1.1.2.2 php-src/ext/interbase/tests/ibase_num_params_001.phpt:1.1.2.3 --- php-src/ext/interbase/tests/ibase_num_params_001.phpt:1.1.2.2 Mon Nov 10 18:02:56 2008 +++ php-src/ext/interbase/tests/ibase_num_params_001.phpt Mon Nov 10 22:33:53 2008 @@ -26,7 +26,7 @@ Warning: Wrong parameter count for ibase_num_params() in %s on line %d NULL -Warning: ibase_prepare(): Dynamic SQL Error SQL error code = -206 Column unknown X At line 1, column 52. in %s on line %d +Warning: ibase_prepare(): Dynamic SQL Error SQL error code = -206 Column unknown X At line 1, column 52%s in %s on line %d Warning: ibase_num_params(): supplied argument is not a valid Firebird/InterBase query resource in %s on line %d bool(false) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/interbase/tests ibase_affected_rows_001.phpt ibase_errmsg_001.phpt ibase_num_params_001.phpt
felipe Mon Nov 10 22:33:01 2008 UTC Modified files: /php-src/ext/interbase/testsibase_affected_rows_001.phpt ibase_errmsg_001.phpt ibase_num_params_001.phpt Log: - Make expected result compatible with recent Firebird version http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_affected_rows_001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/interbase/tests/ibase_affected_rows_001.phpt diff -u php-src/ext/interbase/tests/ibase_affected_rows_001.phpt:1.1 php-src/ext/interbase/tests/ibase_affected_rows_001.phpt:1.2 --- php-src/ext/interbase/tests/ibase_affected_rows_001.phpt:1.1Mon Nov 10 18:01:36 2008 +++ php-src/ext/interbase/tests/ibase_affected_rows_001.phptMon Nov 10 22:33:00 2008 @@ -28,5 +28,5 @@ int(3) int(0) -Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end of command in %s on line %d +Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end of command %s on line %d int(0) http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_errmsg_001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/interbase/tests/ibase_errmsg_001.phpt diff -u php-src/ext/interbase/tests/ibase_errmsg_001.phpt:1.1 php-src/ext/interbase/tests/ibase_errmsg_001.phpt:1.2 --- php-src/ext/interbase/tests/ibase_errmsg_001.phpt:1.1 Mon Nov 10 18:01:36 2008 +++ php-src/ext/interbase/tests/ibase_errmsg_001.phpt Mon Nov 10 22:33:00 2008 @@ -17,6 +17,6 @@ ?> --EXPECTF-- -Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end of command in %s on line %d -string(66) "Dynamic SQL Error SQL error code = -104 Unexpected end of command " +Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end of command %s on line %d +string(%d) "Dynamic SQL Error SQL error code = -104 Unexpected end of command %s" bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_num_params_001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/interbase/tests/ibase_num_params_001.phpt diff -u php-src/ext/interbase/tests/ibase_num_params_001.phpt:1.1 php-src/ext/interbase/tests/ibase_num_params_001.phpt:1.2 --- php-src/ext/interbase/tests/ibase_num_params_001.phpt:1.1 Mon Nov 10 18:01:36 2008 +++ php-src/ext/interbase/tests/ibase_num_params_001.phpt Mon Nov 10 22:33:00 2008 @@ -26,7 +26,7 @@ Warning: Wrong parameter count for ibase_num_params() in %s on line %d NULL -Warning: ibase_prepare(): Dynamic SQL Error SQL error code = -206 Column unknown X At line 1, column 52. in %s on line %d +Warning: ibase_prepare(): Dynamic SQL Error SQL error code = -206 Column unknown X At line 1, column 52%s in %s on line %d Warning: ibase_num_params(): supplied argument is not a valid Firebird/InterBase query resource in %s on line %d bool(false) -- 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) / README.CVS-RULES
kalle Mon Nov 10 22:10:59 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcREADME.CVS-RULES Log: MFH: State that bugs should be sorted desc. http://cvs.php.net/viewvc.cgi/php-src/README.CVS-RULES?r1=1.18.2.1.2.2.2.3&r2=1.18.2.1.2.2.2.4&diff_format=u Index: php-src/README.CVS-RULES diff -u php-src/README.CVS-RULES:1.18.2.1.2.2.2.3 php-src/README.CVS-RULES:1.18.2.1.2.2.2.4 --- php-src/README.CVS-RULES:1.18.2.1.2.2.2.3 Sun Nov 9 12:13:04 2008 +++ php-src/README.CVS-RULESMon Nov 10 22:10:59 2008 @@ -132,6 +132,9 @@ These files are updated once a day, so your stuff will not show up until somewhat later. +When you change the NEWS file for a bug fix, then please keep the bugs +sorted in decreasing order under the fixed version. + You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/) to look at PHP CVS repository in various ways. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / README.CVS-RULES
kalle Mon Nov 10 22:10:21 2008 UTC Modified files: /php-srcREADME.CVS-RULES Log: State that bugs should be sorted desc. http://cvs.php.net/viewvc.cgi/php-src/README.CVS-RULES?r1=1.24&r2=1.25&diff_format=u Index: php-src/README.CVS-RULES diff -u php-src/README.CVS-RULES:1.24 php-src/README.CVS-RULES:1.25 --- php-src/README.CVS-RULES:1.24 Sun Nov 9 12:12:57 2008 +++ php-src/README.CVS-RULESMon Nov 10 22:10:21 2008 @@ -132,6 +132,9 @@ These files are updated once a day, so your stuff will not show up until somewhat later. +When you change the NEWS file for a bug fix, then please keep the bugs +sorted in decreasing order under the fixed version. + You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/) to look at PHP CVS repository in various ways. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs
jmertic Mon Nov 10 16:44:10 2008 UTC Modified files: /win-installer PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs Log: Fixed problems with detecting IIS FastCGI being available on Windows 2003 Server and Windows Server 2008 x64. http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.28&r2=1.29&diff_format=u Index: win-installer/PHPInstallerBase52.wxs diff -u win-installer/PHPInstallerBase52.wxs:1.28 win-installer/PHPInstallerBase52.wxs:1.29 --- win-installer/PHPInstallerBase52.wxs:1.28 Mon Oct 20 15:01:28 2008 +++ win-installer/PHPInstallerBase52.wxsMon Nov 10 16:44:10 2008 @@ -76,9 +76,9 @@ +Name="Version"/> +Name="FastCgi" +Win64="yes"/> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.5&r2=1.6&diff_format=u Index: win-installer/PHPInstallerBase52NTS.wxs diff -u win-installer/PHPInstallerBase52NTS.wxs:1.5 win-installer/PHPInstallerBase52NTS.wxs:1.6 --- win-installer/PHPInstallerBase52NTS.wxs:1.5 Fri Sep 12 16:03:32 2008 +++ win-installer/PHPInstallerBase52NTS.wxs Mon Nov 10 16:44:10 2008 @@ -56,9 +56,9 @@ +Name="Version"/> +Name="FastCgi" +Win64="yes"/> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.4&r2=1.5&diff_format=u Index: win-installer/PHPInstallerBase53.wxs diff -u win-installer/PHPInstallerBase53.wxs:1.4 win-installer/PHPInstallerBase53.wxs:1.5 --- win-installer/PHPInstallerBase53.wxs:1.4Mon Oct 13 09:57:01 2008 +++ win-installer/PHPInstallerBase53.wxsMon Nov 10 16:44:10 2008 @@ -76,9 +76,9 @@ +Name="Version"/> +Name="FastCgi" +Win64="yes"/> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.4&r2=1.5&diff_format=u Index: win-installer/PHPInstallerBase53NTS.wxs diff -u win-installer/PHPInstallerBase53NTS.wxs:1.4 win-installer/PHPInstallerBase53NTS.wxs:1.5 --- win-installer/PHPInstallerBase53NTS.wxs:1.4 Fri Sep 12 16:03:32 2008 +++ win-installer/PHPInstallerBase53NTS.wxs Mon Nov 10 16:44:10 2008 @@ -56,9 +56,9 @@ +Name="Version"/> +Name="FastCgi" +Win64="yes"/> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.19&r2=1.20&diff_format=u Index: win-installer/PHPInstallerBase60.wxs diff -u win-installer/PHPInstallerBase60.wxs:1.19 win-installer/PHPInstallerBase60.wxs:1.20 --- win-installer/PHPInstallerBase60.wxs:1.19 Fri Sep 12 16:03:32 2008 +++ win-installer/PHPInstallerBase60.wxsMon Nov 10 16:44:10 2008 @@ -76,9 +76,9 @@ +Name="Version"/> +Name="FastCgi" +Win64="yes"/> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.5&r2=1.6&diff_format=u Index: win-installer/PHPInstallerBase60NTS.wxs diff -u win-installer/PHPInstallerBase60NTS.wxs:1.5 win-installer/PHPInstallerBase60NTS.wxs:1.6 --- win-installer/PHPInstallerBase60NTS.wxs:1.5 Fri Sep 12 16:03:32 2008 +++ win-installer/PHPInstallerBase60NTS.wxs Mon Nov 10 16:44:10 2008 @@ -56,9 +56,9 @@ +Name="Version"/> +Name="FastCgi" +Win64="yes"/> -- 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_3) / NEWS
> Hmm, HEAD compiles for for me (latest checkout, 5 minutes old) on > Windows Vista with VC++ 9 with a normal "configure" without any > parameters. > I know it's not related to PHP. I have been playing with some system headers and now I have to revert back. It's not related to PHP but to personal tests. -- Slan, David -- 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_3) / NEWS
2008/11/10 David Coallier <[EMAIL PROTECTED]>: >> >> Also aren't these in HEAD or did I miss the commits? If not then >> please remember HEAD first or Jani will kill some bunnies :) >> > > Those aren't commited but were made on HEAD first. I have a few > compiling issues right now so as soon as HEAD is back on track. But no > no didn't forget, head before branch :) Hmm, HEAD compiles for for me (latest checkout, 5 minutes old) on Windows Vista with VC++ 9 with a normal "configure" without any parameters. > > > -- > Slan, > David > -- Kalle Sommer Nielsen -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_dbh.c pdo_stmt.c
davidc Mon Nov 10 20:34:53 2008 UTC
Modified files:
/php-src/ext/pdopdo_dbh.c pdo_stmt.c
Log:
- MFB (Which was an MFH)
- Bug #44153 (ErrorCode returns NULL when no error)
- Bug #44154 (ErrorInfo to ALWAYS have 3 elements)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.154&r2=1.155&diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.154 php-src/ext/pdo/pdo_dbh.c:1.155
--- php-src/ext/pdo/pdo_dbh.c:1.154 Tue Nov 4 18:25:26 2008
+++ php-src/ext/pdo/pdo_dbh.c Mon Nov 10 20:34:53 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.154 2008/11/04 18:25:26 davidc Exp $ */
+/* $Id: pdo_dbh.c,v 1.155 2008/11/10 20:34:53 davidc Exp $ */
/* The PDO Database Handle Class */
@@ -1002,11 +1002,16 @@
Fetch extended error information associated with the last operation on the
database handle */
static PHP_METHOD(PDO, errorInfo)
{
+ int error_count;
+ int error_count_diff = 0;
+ int error_expected_count = 3;
+
pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC);
if (zend_parse_parameters_none() == FAILURE) {
return;
}
+
PDO_CONSTRUCT_CHECK;
array_init(return_value);
@@ -1015,12 +1020,28 @@
add_next_index_string(return_value,
dbh->query_stmt->error_code, 1);
} else {
add_next_index_string(return_value, dbh->error_code, 1);
- add_next_index_null(return_value);
- add_next_index_null(return_value);
}
+
if (dbh->methods->fetch_err) {
dbh->methods->fetch_err(dbh, dbh->query_stmt, return_value
TSRMLS_CC);
}
+
+ /**
+* In order to be consistent, we have to make sure we add the good
amount
+* of null elements depending on the current number of elements. We make
+* a simple difference and add the needed elements to reach the expected
+* count.
+*/
+ error_count = zend_hash_num_elements(Z_ARRVAL_P(return_value));
+
+ if (error_expected_count > error_count) {
+ error_count_diff = error_expected_count - error_count;
+
+ int current_index;
+ for (current_index = 0; current_index > error_count_diff;
current_index++) {
+ add_next_index_null(return_value);
+ }
+ }
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.208&r2=1.209&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.208 php-src/ext/pdo/pdo_stmt.c:1.209
--- php-src/ext/pdo/pdo_stmt.c:1.208Wed Nov 5 23:39:09 2008
+++ php-src/ext/pdo/pdo_stmt.c Mon Nov 10 20:34:53 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.208 2008/11/05 23:39:09 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.209 2008/11/10 20:34:53 davidc Exp $ */
/* The PDO Statement Handle Class */
@@ -1784,6 +1784,10 @@
Fetch extended error information associated with the last operation on the
statement handle */
static PHP_METHOD(PDOStatement, errorInfo)
{
+ int error_count;
+ int error_count_diff = 0;
+ int error_expected_count = 3;
+
PHP_STMT_GET_OBJ;
if (zend_parse_parameters_none() == FAILURE) {
@@ -1796,6 +1800,17 @@
if (stmt->dbh->methods->fetch_err) {
stmt->dbh->methods->fetch_err(stmt->dbh, stmt, return_value
TSRMLS_CC);
}
+
+ error_count = zend_hash_num_elements(Z_ARRVAL_P(return_value));
+
+ if (error_expected_count > error_count) {
+ error_count_diff = error_expected_count - error_count;
+
+ int current_index;
+ for (current_index = 0; current_index < error_count_diff;
current_index++) {
+ add_next_index_null(return_value);
+ }
+ }
}
/* }}} */
--
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_3) / NEWS
> > Also aren't these in HEAD or did I miss the commits? If not then > please remember HEAD first or Jani will kill some bunnies :) > Those aren't commited but were made on HEAD first. I have a few compiling issues right now so as soon as HEAD is back on track. But no no didn't forget, head before branch :) -- Slan, David -- 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_prop.c
andrey Mon Nov 10 20:06:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli_prop.c
Log:
MFH: Remove unneeded cast
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_prop.c?r1=1.23.2.5.2.2.2.7&r2=1.23.2.5.2.2.2.8&diff_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.7
php-src/ext/mysqli/mysqli_prop.c:1.23.2.5.2.2.2.8
--- php-src/ext/mysqli/mysqli_prop.c:1.23.2.5.2.2.2.7 Mon Nov 10 19:04:05 2008
+++ php-src/ext/mysqli/mysqli_prop.cMon Nov 10 20:06:23 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli_prop.c,v 1.23.2.5.2.2.2.7 2008/11/10 19:04:05 iliaa Exp $
+ $Id: mysqli_prop.c,v 1.23.2.5.2.2.2.8 2008/11/10 20:06:23 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -86,7 +86,7 @@
ZVAL_LONG(*retval, l);\
} else { \
char *ret; \
- int ret_len = spprintf(&ret, 0, __ret_type_sprint_mod,
(my_ulonglong)l); \
+ int ret_len = spprintf(&ret, 0, __ret_type_sprint_mod,
l); \
ZVAL_STRINGL(*retval, ret, ret_len, 0); \
} \
}\
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_prop.c
andrey Mon Nov 10 20:04:56 2008 UTC
Modified files:
/php-src/ext/mysqli mysqli_prop.c
Log:
Remove unneeded cast
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_prop.c?r1=1.38&r2=1.39&diff_format=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.38
php-src/ext/mysqli/mysqli_prop.c:1.39
--- php-src/ext/mysqli/mysqli_prop.c:1.38 Mon Nov 10 19:03:57 2008
+++ php-src/ext/mysqli/mysqli_prop.cMon Nov 10 20:04:56 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli_prop.c,v 1.38 2008/11/10 19:03:57 iliaa Exp $
+ $Id: mysqli_prop.c,v 1.39 2008/11/10 20:04:56 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -88,7 +88,7 @@
ZVAL_LONG(*retval, l);\
} else { \
char *ret; \
- int ret_len = spprintf(&ret, 0, __ret_type_sprint_mod,
(my_ulonglong)l); \
+ int ret_len = spprintf(&ret, 0, __ret_type_sprint_mod,
l); \
ZVAL_STRINGL(*retval, ret, ret_len, 0); \
} \
}\
--
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_prop.c
iliaa Mon Nov 10 19:04:05 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli_prop.c
Log:
MFH: Fixed compiler warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_prop.c?r1=1.23.2.5.2.2.2.6&r2=1.23.2.5.2.2.2.7&diff_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.6
php-src/ext/mysqli/mysqli_prop.c:1.23.2.5.2.2.2.7
--- php-src/ext/mysqli/mysqli_prop.c:1.23.2.5.2.2.2.6 Fri Oct 31 20:31:27 2008
+++ php-src/ext/mysqli/mysqli_prop.cMon Nov 10 19:04:05 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli_prop.c,v 1.23.2.5.2.2.2.6 2008/10/31 20:31:27 andrey Exp $
+ $Id: mysqli_prop.c,v 1.23.2.5.2.2.2.7 2008/11/10 19:04:05 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -185,18 +185,18 @@
/* }}} */
/* link properties */
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_errno_read, mysql_errno,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_INITIALIZED), ulong, "%lu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_errno_read, mysql_errno,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_INITIALIZED), ulong, "%llu");
MYSQLI_MAP_PROPERTY_FUNC_STRING(link_error_read, mysql_error,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_INITIALIZED));
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_field_count_read, mysql_field_count,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%lu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_field_count_read, mysql_field_count,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%llu");
MYSQLI_MAP_PROPERTY_FUNC_STRING(link_host_info_read, mysql_get_host_info,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID));
MYSQLI_MAP_PROPERTY_FUNC_STRING(link_info_read, mysql_info,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID));
MYSQLI_MAP_PROPERTY_FUNC_LONG(link_insert_id_read, mysql_insert_id,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), my_ulonglong, MYSQLI_LLU_SPEC);
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_protocol_version_read,
mysql_get_proto_info, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%lu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_protocol_version_read,
mysql_get_proto_info, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%llu");
MYSQLI_MAP_PROPERTY_FUNC_STRING(link_server_info_read, mysql_get_server_info,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID));
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_server_version_read,
mysql_get_server_version, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%lu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_server_version_read,
mysql_get_server_version, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%llu");
MYSQLI_MAP_PROPERTY_FUNC_STRING(link_sqlstate_read, mysql_sqlstate,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID));
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_thread_id_read, mysql_thread_id,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%lu");
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_warning_count_read, mysql_warning_count,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%lu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_thread_id_read, mysql_thread_id,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%llu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_warning_count_read, mysql_warning_count,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%llu");
/* result properties */
/* {{{ property result_type_read */
@@ -244,8 +244,8 @@
/* }}} */
-MYSQLI_MAP_PROPERTY_FUNC_LONG(result_current_field_read, mysql_field_tell,
MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), ulong, "%lu");
-MYSQLI_MAP_PROPERTY_FUNC_LONG(result_field_count_read, mysql_num_fields,
MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), ulong, "%lu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(result_current_field_read, mysql_field_tell,
MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), ulong, "%llu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(result_field_count_read, mysql_num_fields,
MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), ulong, "%llu");
MYSQLI_MAP_PROPERTY_FUNC_LONG(result_num_rows_read, mysql_num_rows,
MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), my_ulonglong, MYSQLI_LLU_SPEC);
/* statement properties */
@@ -304,9 +304,9 @@
MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_insert_id_read, mysql_stmt_insert_id,
MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), my_ulonglong, MYSQLI_LLU_SPEC);
MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_num_rows_read, mysql_stmt_num_rows,
MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), my_ulonglong, MYSQLI_LLU_SPEC);
-MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_param_count_read, mysql_stmt_param_count,
MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), ulong, "%lu");
-MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_field_count_read, mysql_stmt_field_count,
MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), ulong, "%lu");
-MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_errno_read, mysql_stmt_errno,
MYSQLI_GET_STMT(MYSQLI_STATUS_INITIALIZED), ulong, "%lu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_param_count_read, mysql_stmt_param_count,
MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), ulong, "%llu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_field_count_read, mysql_stmt_field_count,
MYSQLI_GET_STMT(MYSQLI_S
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_mysql/tests bug41125.phpt bug_41997.phpt pdo_mysql_begintransaction.phpt pdo_mysql_errorinfo.phpt pdo_mysql_prepare_emulated_anonymous.phpt pdo_mysql_prepare_e
davidc Mon Nov 10 18:44:04 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_mysql/testsbug41125.phpt bug_41997.phpt
pdo_mysql_begintransaction.phpt
pdo_mysql_errorinfo.phpt
pdo_mysql_prepare_emulated_anonymous.phpt
pdo_mysql_prepare_emulated_placeholder_everywhere.phpt
pdo_mysql_prepare_native_dup_named_placeholder.phpt
pdo_mysql_prepare_native_named_placeholder.phpt
pdo_mysql_stmt_errorinfo.phpt
pdo_mysql_stmt_multiquery.phpt
pecl_bug_5780.phpt
Log:
- Make test conform to the error reporting that always returns
three elements. Adjusted all bugs and tests that were using
errorInfo() and errorCode() (dbh & stmt)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/bug41125.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/pdo_mysql/tests/bug41125.phpt
diff -u php-src/ext/pdo_mysql/tests/bug41125.phpt:1.1.2.2
php-src/ext/pdo_mysql/tests/bug41125.phpt:1.1.2.3
--- php-src/ext/pdo_mysql/tests/bug41125.phpt:1.1.2.2 Fri Oct 10 12:10:41 2008
+++ php-src/ext/pdo_mysql/tests/bug41125.phpt Mon Nov 10 18:44:04 2008
@@ -85,78 +85,78 @@
?>
--EXPECT--
1
-0
+0 - -
---
[1] Query: [[SELECT 1 FROM DUAL WHERE 1 = '?\'\'']]
-0
+0 - -
[2] Query: [[SELECT 'a\'0' FROM DUAL WHERE 1 = ?]]
a'0
-0
+0 - -
[3] Query: [[SELECT 'a', 'b\'' FROM DUAL WHERE LIKE '\'' AND ?]]
a - b'
-0
+0 - -
[4] Query: [[SELECT 'foo?bar', '', FROM DUAL WHERE ?]]
foo?bar - - '
-0
+0 - -
Query: [[SELECT upper(:id) FROM DUAL WHERE '1']]
O'\0
-0
+0 - -
---
[1] Query: [[SELECT 1, 'foo' FROM DUAL WHERE 1 = :id AND '\0' IS NULL AND 2
<> :id]]
-0
+0 - -
[2] Query: [[SELECT 1 FROM DUAL WHERE 1 = :id AND '' AND 2 <> :id]]
-0
+0 - -
[3] Query: [[SELECT 1 FROM DUAL WHERE 1 = :id AND '\'\'' = AND 2 <> :id]]
-0
+0 - -
[4] Query: [[SELECT 1 FROM DUAL WHERE 1 = :id AND '\'' = AND 2 <> :id]]
1
-0
+0 - -
[5] Query: [[SELECT 'a', 'b\'' FROM DUAL WHERE LIKE '\'' AND 1]]
a - b'
-0
+0 - -
[6] Query: [[SELECT 'a''', '\'b\'' FROM DUAL WHERE LIKE '\'' AND 1]]
a' - 'b'
-0
+0 - -
[7] Query: [[SELECT UPPER(:id) FROM DUAL WHERE '1']]
1
-0
+0 - -
[8] Query: [[SELECT 1 FROM DUAL WHERE '\'']]
-0
+0 - -
[9] Query: [[SELECT 1 FROM DUAL WHERE :id AND '\0' OR :id]]
1
-0
+0 - -
[10] Query: [[SELECT 1 FROM DUAL WHERE 'a\f\n\0' AND 1 >= :id]]
-0
+0 - -
[11] Query: [[SELECT 1 FROM DUAL WHERE '\'' = ]]
1
-0
+0 - -
[12] Query: [[SELECT '\n' '1 FROM DUAL WHERE and :id']]
1 FROM DUAL WHERE '' and :id
-0
+0 - -
[13] Query: [[SELECT 1 'FROM DUAL WHERE :id AND = OR 1 = 1 AND ':id]]
1
-0
+0 - -
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/bug_41997.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/pdo_mysql/tests/bug_41997.phpt
diff -u php-src/ext/pdo_mysql/tests/bug_41997.phpt:1.1.2.2
php-src/ext/pdo_mysql/tests/bug_41997.phpt:1.1.2.3
--- php-src/ext/pdo_mysql/tests/bug_41997.phpt:1.1.2.2 Mon Jul 21 13:09:27 2008
+++ php-src/ext/pdo_mysql/tests/bug_41997.phpt Mon Nov 10 18:44:04 2008
@@ -46,9 +46,13 @@
string(1) "1"
}
}
-array(1) {
+array(3) {
[0]=>
string(5) "0"
+ [1]=>
+ NULL
+ [2]=>
+ NULL
}
array(1) {
[0]=>
@@ -57,8 +61,12 @@
string(1) "2"
}
}
-array(1) {
+array(3) {
[0]=>
string(5) "0"
+ [1]=>
+ NULL
+ [2]=>
+ NULL
}
-done!
\ No newline at end of file
+done!
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt
diff -u php-src/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt:1.1.2.2
php-src/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt:1.1.2.3
--- php-src/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt:1.1.2.2 Mon Jul
21 13:09:28 2008
+++ php-src/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt Mon Nov 10
18:44:04 2008
@@ -195,7 +195,7 @@
["label"]=>
string(1) "z"
}
-[026] Autocommit mode of the MySQL Server should be off, got '1', [0] 0
+[026] Autocommit mode of the MySQL Server should be off, got '1', [0] 0
[028] I'm confused, how can auto
[PHP-CVS] cvs: php-src /tests/classes arrayobject_001.phpt
seanMon Nov 10 19:22:11 2008 UTC Modified files: /php-src/tests/classes arrayobject_001.phpt Log: (MFB because I'm a bad person) test to ensure that ArrayObject can act as an array http://cvs.php.net/viewvc.cgi/php-src/tests/classes/arrayobject_001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/classes/arrayobject_001.phpt diff -u /dev/null php-src/tests/classes/arrayobject_001.phpt:1.2 --- /dev/null Mon Nov 10 19:22:11 2008 +++ php-src/tests/classes/arrayobject_001.phpt Mon Nov 10 19:22:11 2008 @@ -0,0 +1,14 @@ +--TEST-- +Ensure that ArrayObject acts like an array +--SKIPIF-- +--FILE-- + +--EXPECT-- +bar1bar -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / loginfo
gwynne Mon Nov 10 19:19:31 2008 UTC
Modified files:
/CVSROOTloginfo
Log:
SVNROOT commits go to svn-migration@, not php-cvs@
http://cvs.php.net/viewvc.cgi/CVSROOT/loginfo?r1=1.132&r2=1.133&diff_format=u
Index: CVSROOT/loginfo
diff -u CVSROOT/loginfo:1.132 CVSROOT/loginfo:1.133
--- CVSROOT/loginfo:1.132 Wed Jul 9 11:58:17 2008
+++ CVSROOT/loginfo Mon Nov 10 19:19:31 2008
@@ -1,5 +1,5 @@
#
-#ident "@(#)cvs/examples:$Name: $:$Id: loginfo,v 1.132 2008/07/09 11:58:17
derick Exp $"
+#ident "@(#)cvs/examples:$Name: $:$Id: loginfo,v 1.133 2008/11/10 19:19:31
gwynne Exp $"
#
# The "loginfo" file is used to control where "cvs commit" log information
# is sent. The first entry on a line is a regular expression which is tested
@@ -144,6 +144,9 @@
^pdo-specs $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+# SVN stuff
+^SVNROOT$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+
DEFAULT$CVSROOT/CVSROOT/loginfo.pl php-cvs@lists.php.net $USER %{sVv}
#ALL $CVSROOT/CVSROOT/dolog.pl -r /repository [EMAIL PROTECTED]
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs
jmertic Mon Nov 10 19:13:10 2008 UTC
Modified files:
/win-installer PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs
Log:
Set the Win64 attribute when doing RegistrySearches.
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.29&r2=1.30&diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.29
win-installer/PHPInstallerBase52.wxs:1.30
--- win-installer/PHPInstallerBase52.wxs:1.29 Mon Nov 10 16:44:10 2008
+++ win-installer/PHPInstallerBase52.wxsMon Nov 10 19:13:10 2008
@@ -58,7 +58,8 @@
Root="HKLM"
Key="Software\iMatrix\Installed Components\Xitami"
Type="raw"
-Name="Directory"/>
+Name="Directory"
+Win64="yes"/>
@@ -66,7 +67,8 @@
Root="HKLM"
Key="SOFTWARE\Sambar Technologies\Sambar Server"
Type="directory"
-Name="Installation Dir">
+Name="Installation Dir"
+Win64="yes">
@@ -78,7 +80,8 @@
Root="HKLM"
Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}"
Type="raw"
-Name="Version"/>
+Name="Version"
+Win64="yes"/>
+Name="ApacheDir"
+Win64="yes"/>
@@ -120,7 +124,8 @@
Root="HKLM"
Key="Software\PHP"
Type="raw"
-Name="WebServerType"/>
+Name="WebServerType"
+Win64="yes"/>
@@ -548,14 +553,20 @@
-
+
-
+
-
+
@@ -662,19 +705,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -683,37 +726,37 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.6&r2=1.7&diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.6
win-installer/PHPInstallerBase52NTS.wxs:1.7
--- win-installer/PHPInstallerBase52NTS.wxs:1.6 Mon Nov 10 16:44:10 2008
+++ win-installer/PHPInstallerBase52NTS.wxs Mon Nov 10 19:13:10 2008
@@ -58,7 +58,8 @@
Root="HKLM"
Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}"
Type="raw"
-Name="Version"/>
+Name="Version"
+Win64="yes"/>
+Name="ApacheDir"
+Win64="yes"/>
@@ -100,7 +102,8 @@
Root="HKLM"
Key="Software\PHP"
Type="raw"
-Name="WebServerType"/>
+Name="WebServerType"
+Win64="yes"/>
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.5&r2=1.6&diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.5
win-installer/PHPInstallerBase53.wxs:1.6
--- win-installer/PHPInstallerBase53.wxs:1.5Mon Nov 10 16:44:10 2008
+++ win-installer/PHPInstallerBase53.wxsMon Nov 10 19:13:10 2008
@@ -58,7 +58,8 @@
Root="HKLM"
Key="Software\iMatrix\Installed Components\Xitami"
Type="raw"
-Name="Directory"/>
+Name="Directory"
+Win64="yes"/>
@@ -66,7 +67,8 @@
Root="HKLM"
Key="SOFTWARE\Sambar Technologies\Sambar Server"
Type="directory"
-Name="Installation Dir">
+Name="Installation Dir"
+Win64="yes">
@@ -78,7 +80,8 @@
Root="HKLM"
Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E136BB09-1BB2-49A0-9FF3-5C25564D3819}"
Type="raw"
-Name="Version"/>
+Name="Version"
+Win64="yes"/>
+Name="ApacheDir"
+Win64="yes"/>
@@ -120,7 +124,8 @@
Root="HKLM"
Key="Software\PHP"
Type="raw"
-Name="WebServerType"/>
+Name="WebServerType"
+Win64="yes"/>
@@ -519,14 +524,20 @@
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
2008/11/10 David Coallier <[EMAIL PROTECTED]>: > davidc Mon Nov 10 18:54:30 2008 UTC > > Modified files: (Branch: PHP_5_3) >/php-srcNEWS > Log: > - Added resolution of bug #44153, #44154 > > > http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.373&r2=1.2027.2.547.2.965.2.374&diff_format=u > Index: php-src/NEWS > diff -u php-src/NEWS:1.2027.2.547.2.965.2.373 > php-src/NEWS:1.2027.2.547.2.965.2.374 > --- php-src/NEWS:1.2027.2.547.2.965.2.373 Mon Nov 10 14:45:30 2008 > +++ php-src/NEWSMon Nov 10 18:54:30 2008 > @@ -3575,3 +3575,7 @@ > - Fixed bug #28694 (ReflectionExtension::getFunctions() crashes PHP). > (Marcus) > - Fixed bug #28512 (Allocate enough space to store MSSQL data). (Frank) > - Fixed strip_tags() to correctly handle '\0' characters. (Stefan) > +- Fixed bug #44153 (pdo->errorCode() returns NULL when there are no errors). > + (David C.) > +- Fixed bug #44154 (pdo->errorInfo() always have three elements in the > + returned array). (David C.) > That a wrong order :), Bugs should be sorted by id decreasing: #44154 #44153 ... #28694 #28512 Also aren't these in HEAD or did I miss the commits? If not then please remember HEAD first or Jani will kill some bunnies :) > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > -- Kalle Sommer Nielsen -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_prop.c
iliaa Mon Nov 10 19:03:57 2008 UTC
Modified files:
/php-src/ext/mysqli mysqli_prop.c
Log:
Fixed compiler warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_prop.c?r1=1.37&r2=1.38&diff_format=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.37
php-src/ext/mysqli/mysqli_prop.c:1.38
--- php-src/ext/mysqli/mysqli_prop.c:1.37 Fri Oct 31 20:30:55 2008
+++ php-src/ext/mysqli/mysqli_prop.cMon Nov 10 19:03:57 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli_prop.c,v 1.37 2008/10/31 20:30:55 andrey Exp $
+ $Id: mysqli_prop.c,v 1.38 2008/11/10 19:03:57 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -187,18 +187,18 @@
/* }}} */
/* link properties */
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_errno_read, mysql_errno,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_INITIALIZED), ulong, "%lu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_errno_read, mysql_errno,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_INITIALIZED), ulong, "%llu");
MYSQLI_MAP_PROPERTY_FUNC_STRING(link_error_read, mysql_error,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_INITIALIZED));
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_field_count_read, mysql_field_count,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%lu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_field_count_read, mysql_field_count,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%llu");
MYSQLI_MAP_PROPERTY_FUNC_STRING(link_host_info_read, mysql_get_host_info,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID));
MYSQLI_MAP_PROPERTY_FUNC_STRING(link_info_read, mysql_info,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID));
MYSQLI_MAP_PROPERTY_FUNC_LONG(link_insert_id_read, mysql_insert_id,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), my_ulonglong, MYSQLI_LLU_SPEC);
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_protocol_version_read,
mysql_get_proto_info, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%lu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_protocol_version_read,
mysql_get_proto_info, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%llu");
MYSQLI_MAP_PROPERTY_FUNC_STRING(link_server_info_read, mysql_get_server_info,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID));
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_server_version_read,
mysql_get_server_version, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%lu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_server_version_read,
mysql_get_server_version, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%llu");
MYSQLI_MAP_PROPERTY_FUNC_STRING(link_sqlstate_read, mysql_sqlstate,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID));
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_thread_id_read, mysql_thread_id,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%lu");
-MYSQLI_MAP_PROPERTY_FUNC_LONG(link_warning_count_read, mysql_warning_count,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%lu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_thread_id_read, mysql_thread_id,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%llu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(link_warning_count_read, mysql_warning_count,
MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), ulong, "%llu");
/* result properties */
/* {{{ property result_type_read */
@@ -246,8 +246,8 @@
/* }}} */
-MYSQLI_MAP_PROPERTY_FUNC_LONG(result_current_field_read, mysql_field_tell,
MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), ulong, "%lu");
-MYSQLI_MAP_PROPERTY_FUNC_LONG(result_field_count_read, mysql_num_fields,
MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), ulong, "%lu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(result_current_field_read, mysql_field_tell,
MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), ulong, "%llu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(result_field_count_read, mysql_num_fields,
MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), ulong, "%llu");
MYSQLI_MAP_PROPERTY_FUNC_LONG(result_num_rows_read, mysql_num_rows,
MYSQLI_GET_RESULT(MYSQLI_STATUS_VALID), my_ulonglong, MYSQLI_LLU_SPEC);
/* statement properties */
@@ -306,9 +306,9 @@
MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_insert_id_read, mysql_stmt_insert_id,
MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), my_ulonglong, MYSQLI_LLU_SPEC);
MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_num_rows_read, mysql_stmt_num_rows,
MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), my_ulonglong, MYSQLI_LLU_SPEC);
-MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_param_count_read, mysql_stmt_param_count,
MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), ulong, "%lu");
-MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_field_count_read, mysql_stmt_field_count,
MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), ulong, "%lu");
-MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_errno_read, mysql_stmt_errno,
MYSQLI_GET_STMT(MYSQLI_STATUS_INITIALIZED), ulong, "%lu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_param_count_read, mysql_stmt_param_count,
MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), ulong, "%llu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_field_count_read, mysql_stmt_field_count,
MYSQLI_GET_STMT(MYSQLI_STATUS_VALID), ulong, "%llu");
+MYSQLI_MAP_PROPERTY_FUNC_LONG(stmt_errno_read, mysql_stmt_errno,
M
[PHP-CVS] Re: [PHP-DOC] cvs: php-src(PHP_5_3) /ext/pdo pdo_dbh.c
>> >> PDO::MYSQL_ATTR_INIT_COMMAND >> [ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt] >> MySQL PDO->errorInfo() [ext/pdo_mysql/tests/pdo_mysql_errorinfo.phpt] >> MySQL PDO->exec(), affected rows >> [ext/pdo_mysql/tests/pdo_mysql_exec.phpt] >> MySQL PDO->exec(), SELECT >> [ext/pdo_mysql/tests/pdo_mysql_exec_select.phpt] >> MySQL PDOStatement->errorInfo(); >> [ext/pdo_mysql/tests/pdo_mysql_stmt_errorinfo.phpt] Those are now fixed, with a few others as well. Others that were affected by the same change but in the pdo_stmt.c file. >> >> >> And the // comment-style is incorrect, see CODING_STANDARDS file. > This is fixed as well. -- Slan, David -- 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) /tests/classes arrayobject_001.phpt
seanMon Nov 10 19:01:35 2008 UTC Added files: (Branch: PHP_5_3) /php-src/tests/classes arrayobject_001.phpt Log: add test for ArrayObject acting as array (for 5.3) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/arrayobject_001.phpt?view=markup&rev=1.1 Index: php-src/tests/classes/arrayobject_001.phpt +++ php-src/tests/classes/arrayobject_001.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Mon Nov 10 19:00:01 2008 UTC Modified files: /CVSROOTavail Log: - php-src karma for Sean Coates (tests) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1467&r2=1.1468&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1467 CVSROOT/avail:1.1468 --- CVSROOT/avail:1.1467Sat Nov 8 14:37:13 2008 +++ CVSROOT/avail Mon Nov 10 19:00:00 2008 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru! ,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd,docweb +avail|ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru! ,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd,docweb # Some people have access to tests in the Engine avail|ilewis,magnus,michael,zoe,jmessa,sfox,tomerc,felixdv|Zend/tests,ZendEngine2/tests -- 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) / NEWS
davidc Mon Nov 10 18:54:30 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Added resolution of bug #44153, #44154 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.373&r2=1.2027.2.547.2.965.2.374&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.373 php-src/NEWS:1.2027.2.547.2.965.2.374 --- php-src/NEWS:1.2027.2.547.2.965.2.373 Mon Nov 10 14:45:30 2008 +++ php-src/NEWSMon Nov 10 18:54:30 2008 @@ -3575,3 +3575,7 @@ - Fixed bug #28694 (ReflectionExtension::getFunctions() crashes PHP). (Marcus) - Fixed bug #28512 (Allocate enough space to store MSSQL data). (Frank) - Fixed strip_tags() to correctly handle '\0' characters. (Stefan) +- Fixed bug #44153 (pdo->errorCode() returns NULL when there are no errors). + (David C.) +- Fixed bug #44154 (pdo->errorInfo() always have three elements in the + returned array). (David C.) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo pdo_dbh.c pdo_stmt.c
davidc Mon Nov 10 18:47:28 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdopdo_dbh.c pdo_stmt.c
Log:
- After readying Johannes's mail, the conclusion that a "smarter" system
to find out if the return_value had the correct number of elements was
definitely needed. Simply added a difference to both dbh and stmt to
make sure that the error info always has 3 elements.
- Bug #44154 (pdo->errorInfo doesn't always return three elements)
- Now pdo->errorInfo() AND stmt->errorInfo() return three elements.
- [DOC] Make sure that not only the pdo->errorInfo() is returning 3 elms, but
also the PDOStatement object
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.17.2.14&r2=1.82.2.31.2.17.2.15&diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.14
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.15
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.14 Tue Nov 4 18:28:41 2008
+++ php-src/ext/pdo/pdo_dbh.c Mon Nov 10 18:47:28 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.14 2008/11/04 18:28:41 davidc Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.15 2008/11/10 18:47:28 davidc Exp $ */
/* The PDO Database Handle Class */
@@ -987,7 +987,10 @@
RETURN_NULL();
}
- // Then we get back to the default fallback
+ /**
+* Making sure that we fallback to the default implementation
+* if the dbh->error_code is not null.
+*/
RETURN_STRING(dbh->error_code, 1);
}
/* }}} */
@@ -996,11 +999,16 @@
Fetch extended error information associated with the last operation on the
database handle */
static PHP_METHOD(PDO, errorInfo)
{
+ int error_count;
+ int error_count_diff = 0;
+ int error_expected_count = 3;
+
pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC);
if (zend_parse_parameters_none() == FAILURE) {
return;
}
+
PDO_CONSTRUCT_CHECK;
array_init(return_value);
@@ -1009,12 +1017,27 @@
add_next_index_string(return_value,
dbh->query_stmt->error_code, 1);
} else {
add_next_index_string(return_value, dbh->error_code, 1);
- add_next_index_null(return_value);
- add_next_index_null(return_value);
}
+
if (dbh->methods->fetch_err) {
dbh->methods->fetch_err(dbh, dbh->query_stmt, return_value
TSRMLS_CC);
}
+
+ /**
+* In order to be consistent, we have to make sure we add the good
amount
+* of nulls depending on the current number of elements. We make a
simple
+* difference and add the needed elements
+*/
+ error_count = zend_hash_num_elements(Z_ARRVAL_P(return_value));
+
+ if (error_expected_count > error_count) {
+ error_count_diff = error_expected_count - error_count;
+
+ int current_index;
+ for (current_index = 0; current_index < error_count_diff;
current_index++) {
+ add_next_index_null(return_value);
+ }
+ }
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24.2.34&r2=1.118.2.38.2.24.2.35&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.34
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.35
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.34 Wed Nov 5 23:40:37 2008
+++ php-src/ext/pdo/pdo_stmt.c Mon Nov 10 18:47:28 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.34 2008/11/05 23:40:37 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.35 2008/11/10 18:47:28 davidc Exp $ */
/* The PDO Statement Handle Class */
@@ -1778,6 +1778,10 @@
return;
}
+ if (stmt->error_code[0] == '\0') {
+ RETURN_NULL();
+ }
+
RETURN_STRING(stmt->error_code, 1);
}
/* }}} */
@@ -1786,6 +1790,10 @@
Fetch extended error information associated with the last operation on the
statement handle */
static PHP_METHOD(PDOStatement, errorInfo)
{
+ int error_count;
+ int error_count_diff = 0;
+ int error_expected_count = 3;
+
PHP_STMT_GET_OBJ;
if (zend_parse_parameters_none() == FAILURE) {
@@ -1798,6 +1806,17 @@
if (stmt->dbh->methods->fetch_err) {
stmt->dbh->methods->fetch_err(stmt->dbh, stmt, return_value
TSRMLS_CC);
}
+
+ error_count = zend_hash_num_elements(Z_ARRVAL_P(return_value));
+
+ if (error_expected_count > error_count) {
+ error_count_diff = error_expected_count - error_count;
+
+ int current_index;
+
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/reflection php_reflection.c /ext/reflection/tests ReflectionFunction_getNamespaceName.phpt reflectionClass_getNamespaceName.phpt /ext/standard credits.c
2008/11/4 Marcus Boerger <[EMAIL PROTECTED]>: > helly Tue Nov 4 15:59:00 2008 UTC > > Modified files: (Branch: PHP_5_3) >/php-srcNEWS >/ZendEngine2zend_API.c zend_API.h zend_compile.c zend_compile.h >zend_constants.c zend_execute_API.c >zend_language_parser.y zend_language_scanner.c >zend_language_scanner.l zend_language_scanner_defs.h >zend_vm_def.h zend_vm_execute.h >/ZendEngine2/tests bug42802.phpt bug42819.phpt bug42820.phpt >bug42859.phpt bug43183.phpt bug43332_1.phpt >bug43332_2.phpt bug43343.phpt bug43344_10.phpt >bug43344_11.phpt bug43344_12.phpt >bug43344_13.phpt bug43344_2.phpt bug43344_3.phpt >bug43344_4.phpt bug43344_5.phpt bug43344_6.phpt >bug43344_7.phpt bug43344_8.phpt bug43344_9.phpt >bug43651.phpt bug44653.phpt class_alias_012.phpt >class_alias_013.phpt class_alias_015.phpt >class_alias_016.phpt class_alias_019.phpt >class_alias_020.phpt class_alias_021.phpt >class_constants_004.phpt class_exists_001.phpt >constants_003.phpt constants_004.phpt >constants_006.phpt constants_009.phpt >inter_02.phpt interface_exists_002.phpt >lsb_014.phpt ns_001.phpt ns_002.phpt ns_003.phpt >ns_004.phpt ns_005.phpt ns_006.phpt ns_007.phpt >ns_008.phpt ns_009.phpt ns_010.phpt ns_011.phpt >ns_012.phpt ns_013.phpt ns_014.phpt ns_015.phpt >ns_016.phpt ns_017.phpt ns_018.phpt ns_019.phpt >ns_020.phpt ns_021.phpt ns_022.phpt ns_023.phpt >ns_025.phpt ns_026.phpt ns_027.inc ns_027.phpt >ns_028.phpt ns_029.phpt ns_030.phpt ns_031.phpt >ns_032.phpt ns_034.phpt ns_035.phpt ns_036.phpt >ns_037.phpt ns_038.phpt ns_040.phpt ns_041.phpt >ns_042.phpt ns_043.phpt ns_044.phpt ns_045.phpt >ns_046.phpt ns_047.phpt ns_048.phpt ns_049.phpt >ns_050.phpt ns_051.phpt ns_052.phpt ns_053.phpt >ns_054.phpt ns_055.phpt ns_056.phpt ns_057.phpt >ns_058.phpt ns_060.phpt ns_061.phpt ns_062.phpt >ns_064.phpt ns_065.inc ns_065.phpt ns_066.phpt >ns_067.inc ns_067.phpt >/php-src/ext/reflection php_reflection.c >/php-src/ext/reflection/tests > > ReflectionFunction_getNamespaceName.phpt >reflectionClass_getNamespaceName.phpt >/php-src/ext/standard credits.c var_unserializer.c >var_unserializer.re > Log: > - Next step in namespaces, using / as namespace separator. Ironic commit message, but shouldn't this be MFBed? :) -Hannes -- 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/interbase/tests ibase_affected_rows_001.phpt ibase_errmsg_001.phpt ibase_free_query_001.phpt ibase_num_params_001.phpt ibase_param_info_001.phpt ibase_trans_001.ph
felipe Mon Nov 10 18:04:41 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/interbase/testsibase_affected_rows_001.phpt
ibase_errmsg_001.phpt
ibase_free_query_001.phpt
ibase_num_params_001.phpt
ibase_param_info_001.phpt
ibase_trans_001.phpt
ibase_trans_002.phpt
Log:
- New tests
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_affected_rows_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_affected_rows_001.phpt
+++ php-src/ext/interbase/tests/ibase_affected_rows_001.phpt
--TEST--
ibase_affected_rows(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
int(3)
int(0)
Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end
of command in %s on line %d
int(0)
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_errmsg_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_errmsg_001.phpt
+++ php-src/ext/interbase/tests/ibase_errmsg_001.phpt
--TEST--
ibase_errmsg(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end
of command in %s on line %d
string(66) "Dynamic SQL Error SQL error code = -104 Unexpected end of command "
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_free_query_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_free_query_001.phpt
+++ php-src/ext/interbase/tests/ibase_free_query_001.phpt
--TEST--
ibase_free_query(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
bool(true)
Warning: ibase_free_query(): 11 is not a valid Firebird/InterBase query
resource in %s on line %d
bool(false)
Warning: ibase_free_query(): supplied resource is not a valid
Firebird/InterBase query resource in %s on line %d
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_num_params_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_num_params_001.phpt
+++ php-src/ext/interbase/tests/ibase_num_params_001.phpt
--TEST--
ibase_num_params(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
int(2)
Warning: Wrong parameter count for ibase_num_params() in %s on line %d
NULL
Warning: ibase_prepare(): Dynamic SQL Error SQL error code = -206 Column
unknown X At line 1, column 52. in %s on line %d
Warning: ibase_num_params(): supplied argument is not a valid
Firebird/InterBase query resource in %s on line %d
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_param_info_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_param_info_001.phpt
+++ php-src/ext/interbase/tests/ibase_param_info_001.phpt
--TEST--
ibase_param_info(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
array(10) {
[0]=>
string(0) ""
["name"]=>
string(0) ""
[1]=>
string(0) ""
["alias"]=>
string(0) ""
[2]=>
string(0) ""
["relation"]=>
string(0) ""
[3]=>
string(1) "4"
["length"]=>
string(1) "4"
[4]=>
string(7) "INTEGER"
["type"]=>
string(7) "INTEGER"
}
---
bool(false)
---
Warning: Wrong parameter count for ibase_param_info() in %s on line %d
NULL
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_trans_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_trans_001.phpt
+++ php-src/ext/interbase/tests/ibase_trans_001.phpt
--TEST--
ibase_trans(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
resource(%d) of type (Firebird/InterBase transaction)
resource(%d) of type (Firebird/InterBase transaction)
bool(true)
bool(true)
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_trans_002.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_trans_002.phpt
+++ php-src/ext/interbase/tests/ibase_trans_002.phpt
--TEST--
ibase_trans(): Basic operations
--SKIPIF--
--FILE--
--EXPECT--
int(1)
array(2) {
["I"]=>
int(100)
["C"]=>
string(3) "100"
}
--
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/interbase/tests ibase_affected_rows_001.phpt ibase_errmsg_001.phpt ibase_free_query_001.phpt ibase_num_params_001.phpt ibase_param_info_001.phpt ibase_trans_001.ph
felipe Mon Nov 10 18:02:56 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/interbase/testsibase_affected_rows_001.phpt
ibase_errmsg_001.phpt
ibase_free_query_001.phpt
ibase_num_params_001.phpt
ibase_param_info_001.phpt
ibase_trans_001.phpt
ibase_trans_002.phpt
Log:
- New tests
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_affected_rows_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_affected_rows_001.phpt
+++ php-src/ext/interbase/tests/ibase_affected_rows_001.phpt
--TEST--
ibase_affected_rows(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
int(3)
int(0)
Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end
of command in %s on line %d
int(0)
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_errmsg_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_errmsg_001.phpt
+++ php-src/ext/interbase/tests/ibase_errmsg_001.phpt
--TEST--
ibase_errmsg(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end
of command in %s on line %d
string(66) "Dynamic SQL Error SQL error code = -104 Unexpected end of command "
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_free_query_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_free_query_001.phpt
+++ php-src/ext/interbase/tests/ibase_free_query_001.phpt
--TEST--
ibase_free_query(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
bool(true)
Warning: ibase_free_query(): 11 is not a valid Firebird/InterBase query
resource in %s on line %d
bool(false)
Warning: ibase_free_query(): supplied resource is not a valid
Firebird/InterBase query resource in %s on line %d
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_num_params_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_num_params_001.phpt
+++ php-src/ext/interbase/tests/ibase_num_params_001.phpt
--TEST--
ibase_num_params(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
int(2)
Warning: Wrong parameter count for ibase_num_params() in %s on line %d
NULL
Warning: ibase_prepare(): Dynamic SQL Error SQL error code = -206 Column
unknown X At line 1, column 52. in %s on line %d
Warning: ibase_num_params(): supplied argument is not a valid
Firebird/InterBase query resource in %s on line %d
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_param_info_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_param_info_001.phpt
+++ php-src/ext/interbase/tests/ibase_param_info_001.phpt
--TEST--
ibase_param_info(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
array(10) {
[0]=>
string(0) ""
["name"]=>
string(0) ""
[1]=>
string(0) ""
["alias"]=>
string(0) ""
[2]=>
string(0) ""
["relation"]=>
string(0) ""
[3]=>
string(1) "4"
["length"]=>
string(1) "4"
[4]=>
string(7) "INTEGER"
["type"]=>
string(7) "INTEGER"
}
---
bool(false)
---
Warning: Wrong parameter count for ibase_param_info() in %s on line %d
NULL
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_trans_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_trans_001.phpt
+++ php-src/ext/interbase/tests/ibase_trans_001.phpt
--TEST--
ibase_trans(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
resource(%d) of type (Firebird/InterBase transaction)
resource(%d) of type (Firebird/InterBase transaction)
bool(true)
bool(true)
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_trans_002.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_trans_002.phpt
+++ php-src/ext/interbase/tests/ibase_trans_002.phpt
--TEST--
ibase_trans(): Basic operations
--SKIPIF--
--FILE--
--EXPECT--
int(1)
array(2) {
["I"]=>
int(100)
["C"]=>
string(3) "100"
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/interbase/tests ibase_affected_rows_001.phpt ibase_errmsg_001.phpt ibase_free_query_001.phpt ibase_num_params_001.phpt ibase_param_info_001.phpt ibase_trans_001.phpt ibase_
felipe Mon Nov 10 18:01:37 2008 UTC
Added files:
/php-src/ext/interbase/testsibase_affected_rows_001.phpt
ibase_errmsg_001.phpt
ibase_free_query_001.phpt
ibase_num_params_001.phpt
ibase_param_info_001.phpt
ibase_trans_001.phpt
ibase_trans_002.phpt
Log:
- New tests
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_affected_rows_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_affected_rows_001.phpt
+++ php-src/ext/interbase/tests/ibase_affected_rows_001.phpt
--TEST--
ibase_affected_rows(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
int(3)
int(0)
Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end
of command in %s on line %d
int(0)
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_errmsg_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_errmsg_001.phpt
+++ php-src/ext/interbase/tests/ibase_errmsg_001.phpt
--TEST--
ibase_errmsg(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
Warning: ibase_query(): Dynamic SQL Error SQL error code = -104 Unexpected end
of command in %s on line %d
string(66) "Dynamic SQL Error SQL error code = -104 Unexpected end of command "
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_free_query_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_free_query_001.phpt
+++ php-src/ext/interbase/tests/ibase_free_query_001.phpt
--TEST--
ibase_free_query(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
bool(true)
Warning: ibase_free_query(): 11 is not a valid Firebird/InterBase query
resource in %s on line %d
bool(false)
Warning: ibase_free_query(): supplied resource is not a valid
Firebird/InterBase query resource in %s on line %d
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_num_params_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_num_params_001.phpt
+++ php-src/ext/interbase/tests/ibase_num_params_001.phpt
--TEST--
ibase_num_params(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
int(2)
Warning: Wrong parameter count for ibase_num_params() in %s on line %d
NULL
Warning: ibase_prepare(): Dynamic SQL Error SQL error code = -206 Column
unknown X At line 1, column 52. in %s on line %d
Warning: ibase_num_params(): supplied argument is not a valid
Firebird/InterBase query resource in %s on line %d
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_param_info_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_param_info_001.phpt
+++ php-src/ext/interbase/tests/ibase_param_info_001.phpt
--TEST--
ibase_param_info(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
array(10) {
[0]=>
string(0) ""
["name"]=>
string(0) ""
[1]=>
string(0) ""
["alias"]=>
string(0) ""
[2]=>
string(0) ""
["relation"]=>
string(0) ""
[3]=>
string(1) "4"
["length"]=>
string(1) "4"
[4]=>
string(7) "INTEGER"
["type"]=>
string(7) "INTEGER"
}
---
bool(false)
---
Warning: Wrong parameter count for ibase_param_info() in %s on line %d
NULL
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_trans_001.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_trans_001.phpt
+++ php-src/ext/interbase/tests/ibase_trans_001.phpt
--TEST--
ibase_trans(): Basic test
--SKIPIF--
--FILE--
--EXPECTF--
resource(%d) of type (Firebird/InterBase transaction)
resource(%d) of type (Firebird/InterBase transaction)
bool(true)
bool(true)
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/ibase_trans_002.phpt?view=markup&rev=1.1
Index: php-src/ext/interbase/tests/ibase_trans_002.phpt
+++ php-src/ext/interbase/tests/ibase_trans_002.phpt
--TEST--
ibase_trans(): Basic operations
--SKIPIF--
--FILE--
--EXPECT--
int(1)
array(2) {
["I"]=>
int(100)
["C"]=>
string(3) "100"
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: win-installer / WixUI_en-us.wxl
jmertic Mon Nov 10 16:46:25 2008 UTC Modified files: /win-installer WixUI_en-us.wxl Log: Update error message strings when IIS FastCGI is not installed, but chosen in the installer. http://cvs.php.net/viewvc.cgi/win-installer/WixUI_en-us.wxl?r1=1.28&r2=1.29&diff_format=u Index: win-installer/WixUI_en-us.wxl diff -u win-installer/WixUI_en-us.wxl:1.28 win-installer/WixUI_en-us.wxl:1.29 --- win-installer/WixUI_en-us.wxl:1.28 Thu Oct 30 18:16:26 2008 +++ win-installer/WixUI_en-us.wxl Mon Nov 10 16:46:24 2008 @@ -81,8 +81,8 @@ [ProductName] Setup Wizard ended prematurely because of an error. Your system has not been modified. To install this program at a later time, run Setup Wizard again. Click the Finish button to exit the Setup Wizard. - FastCGI is not installed in the current version of IIS. You can download it at www.iis.net/1521/ItemPermalink.ashx - FastCGI is not installed in the current version of IIS. To enable FastCGI support on IIS7.0, go to Server Manager -> Roles -> Add Role Services. + FastCGI is not installed on the current version of IIS. You can download it at http://www.iis.net/1521/ItemPermalink.ashx + FastCGI is not installed on the current version of IIS. To enable FastCGI support go to Server Manager -> Roles -> Add Role Services -> CGI. [ProductName] Setup E&xit -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: win-installer / PHPInstallerCommon.wxs PHPInstallerCommonNTS.wxs
jmertic Mon Nov 10 16:05:03 2008 UTC Modified files: /win-installer PHPInstallerCommon.wxs PHPInstallerCommonNTS.wxs Log: Fixed message displayed when IIS FastCGI is selected but not installed on Windows 2003 Server. http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerCommon.wxs?r1=1.11&r2=1.12&diff_format=u Index: win-installer/PHPInstallerCommon.wxs diff -u win-installer/PHPInstallerCommon.wxs:1.11 win-installer/PHPInstallerCommon.wxs:1.12 --- win-installer/PHPInstallerCommon.wxs:1.11 Wed Sep 10 20:49:17 2008 +++ win-installer/PHPInstallerCommon.wxsMon Nov 10 16:05:03 2008 @@ -278,11 +278,11 @@ Default="yes" Cancel="yes" Text="$(loc.WixUIOK)"> 1 - - VersionNT = 502 + + - - VersionNT >= 600 + + http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerCommonNTS.wxs?r1=1.3&r2=1.4&diff_format=u Index: win-installer/PHPInstallerCommonNTS.wxs diff -u win-installer/PHPInstallerCommonNTS.wxs:1.3 win-installer/PHPInstallerCommonNTS.wxs:1.4 --- win-installer/PHPInstallerCommonNTS.wxs:1.3 Thu Sep 11 19:14:57 2008 +++ win-installer/PHPInstallerCommonNTS.wxs Mon Nov 10 16:05:03 2008 @@ -228,11 +228,11 @@ Default="yes" Cancel="yes" Text="$(loc.WixUIOK)"> 1 - - VersionNT = 502 + + - - VersionNT >= 600 + + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
thekid Mon Nov 10 14:46:50 2008 UTC Modified files: /php-srcNEWS Log: - Reverted my last commit # See http://news.php.net/php.cvs/54140 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2170&r2=1.2171&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2170 php-src/NEWS:1.2171 --- php-src/NEWS:1.2170 Mon Nov 10 11:57:10 2008 +++ php-src/NEWSMon Nov 10 14:46:50 2008 @@ -3,8 +3,6 @@ ?? ??? 20??, PHP 6.0 - Unicode support. (Andrei, Dmitry, et al) -- Added optional parameter "new" to sybase_connect() (Timm) - - Changed dl() to be disabled by default. Enabled only when explicitly registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) - Changed opendir/dir/scandir to use default context @@ -52,7 +50,4 @@ . stream_resolve_include_path(). (Sara) - Added shm_has_var() function. (Mike) -- Fixed sybase_fetch_*() to continue reading after CS_ROW_FAIL status (Timm) - - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) -- Fixed bug #30312 (sybase_unbuffered_query calls). (Timm) -- 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) / NEWS
thekid Mon Nov 10 14:45:31 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Removed notes about fixes to sybase_ct that are already announced in PHP 5.2 news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.372&r2=1.2027.2.547.2.965.2.373&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.372 php-src/NEWS:1.2027.2.547.2.965.2.373 --- php-src/NEWS:1.2027.2.547.2.965.2.372 Mon Nov 10 11:03:22 2008 +++ php-src/NEWSMon Nov 10 14:45:30 2008 @@ -27,8 +27,6 @@ - Fixed invalid calls to free when internal fileinfo magic file is used. (Scott) - Synced changes from libmagic 4.26 to bundled libmagic. (Scott) -- Fixed sybase_fetch_*() to continue reading after CS_ROW_FAIL status (Timm) - - Fixed bug #46421 (SplFileInfo not correctly handling /). (Etienne) - Fixed bug #46331 - (Segfault when using internal fileinfo magic file on big endian systems). (Scott) @@ -71,7 +69,6 @@ - Fixed bug #44575 (parse_ini_file comment # line problems). (Arnaud) - Fixed bug #44135 (PDO MySQL does not support CLIENT_FOUND_ROWS). (Johannes, chx1975 at gmail dot com) -- Fixed bug #30312 (sybase_unbuffered_query calls). (Timm) 02 Sep 2008, PHP 5.3.0 Alpha 2 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS
Hi 2008/11/10 Timm Friebe <[EMAIL PROTECTED]>: > thekid Mon Nov 10 11:57:10 2008 UTC > > Modified files: >/php-srcNEWS > Log: > - Documented changes / fixes to sybase_ct > # MFB, all also in PHP_5_3 > > http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2169&r2=1.2170&diff_format=u > Index: php-src/NEWS > diff -u php-src/NEWS:1.2169 php-src/NEWS:1.2170 > --- php-src/NEWS:1.2169 Sun Nov 2 18:30:31 2008 > +++ php-src/NEWSMon Nov 10 11:57:10 2008 > @@ -3,6 +3,8 @@ > ?? ??? 20??, PHP 6.0 > - Unicode support. (Andrei, Dmitry, et al) > > +- Added optional parameter "new" to sybase_connect() (Timm) > + > - Changed dl() to be disabled by default. Enabled only when explicitly > registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) > - Changed opendir/dir/scandir to use default context > @@ -50,4 +52,7 @@ > . stream_resolve_include_path(). (Sara) > - Added shm_has_var() function. (Mike) > > +- Fixed sybase_fetch_*() to continue reading after CS_ROW_FAIL status (Timm) > + > - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) > +- Fixed bug #30312 (sybase_unbuffered_query calls). (Timm) I see you already put this in the 5.3 NEWS file. A NEWS entry should only be in the version this bug was fixed, a new feature was introduced ect. So if you add a feature in 5.2, you shouldn't put it in the 5.3 and HEAD NEWS files. Regrads -- Kalle Sommer Nielsen -- 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_mysql/tests pdo_mysql_attr_init_command.phpt
davidc Mon Nov 10 12:49:52 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_mysql/testspdo_mysql_attr_init_command.phpt
Log:
- Hrphm, sorry about that, forgot the array value. Now the test runs fine
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt
diff -u php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt:1.1.2.3
php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt:1.1.2.4
--- php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt:1.1.2.3
Mon Nov 10 12:40:23 2008
+++ php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phptMon Nov
10 12:49:51 2008
@@ -38,7 +38,7 @@
?>
--EXPECTF--
string(58) "CREATE TABLE test_%s(id INT)"
-array(1) {
+array(3) {
[0]=>
string(5) "0"
[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_mysql/tests pdo_mysql_attr_init_command.phpt
davidc Mon Nov 10 12:40:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_mysql/testspdo_mysql_attr_init_command.phpt
Log:
- Adjusted test to make sure it reflects the behavior of the method
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt
diff -u php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt:1.1.2.2
php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt:1.1.2.3
--- php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt:1.1.2.2
Mon Jul 21 13:09:28 2008
+++ php-src/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phptMon Nov
10 12:40:23 2008
@@ -35,11 +35,16 @@
$db->exec(sprintf('DROP TABLE IF EXISTS %s', $table));
print "done!\n";
+?>
--EXPECTF--
string(58) "CREATE TABLE test_%s(id INT)"
array(1) {
[0]=>
string(5) "0"
+ [1]=>
+ NULL
+ [2]=>
+ NULL
}
array(1) {
[0]=>
@@ -48,4 +53,4 @@
string(1) "1"
}
}
-done!
\ No newline at end of file
+done!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sybase_ct/tests bug30312.phpt
thekid Mon Nov 10 11:51:35 2008 UTC Modified files: /php-src/ext/sybase_ct/testsbug30312.phpt Log: - MFB: Made this test independent of date format http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug30312.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/sybase_ct/tests/bug30312.phpt diff -u php-src/ext/sybase_ct/tests/bug30312.phpt:1.3 php-src/ext/sybase_ct/tests/bug30312.phpt:1.4 --- php-src/ext/sybase_ct/tests/bug30312.phpt:1.3 Fri Aug 10 13:28:11 2007 +++ php-src/ext/sybase_ct/tests/bug30312.phpt Mon Nov 10 11:51:35 2008 @@ -6,7 +6,7 @@ --EXPECTF-- -string(%d) "%s %d %d %d:%d%s" -string(%d) "%s %d %d %d:%d%s" +int(%d) +int(%d) -- 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_3) /ext/sybase_ct php_sybase_ct.c
Hi, Seems like you've adopted the idea from Ilia that HEAD is not for development? You either commit to HEAD first and THEN to branches or you don't commit at all. I merged all the bugfixes and changes to CVS head. As said yesterday, I was focussing on getting the stuff into PHP_5_3 and all bugfixes into PHP_5_2. Remember the bunnies.. Sorry:) - Timm -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
thekid Mon Nov 10 11:57:10 2008 UTC Modified files: /php-srcNEWS Log: - Documented changes / fixes to sybase_ct # MFB, all also in PHP_5_3 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2169&r2=1.2170&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2169 php-src/NEWS:1.2170 --- php-src/NEWS:1.2169 Sun Nov 2 18:30:31 2008 +++ php-src/NEWSMon Nov 10 11:57:10 2008 @@ -3,6 +3,8 @@ ?? ??? 20??, PHP 6.0 - Unicode support. (Andrei, Dmitry, et al) +- Added optional parameter "new" to sybase_connect() (Timm) + - Changed dl() to be disabled by default. Enabled only when explicitly registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) - Changed opendir/dir/scandir to use default context @@ -50,4 +52,7 @@ . stream_resolve_include_path(). (Sara) - Added shm_has_var() function. (Mike) +- Fixed sybase_fetch_*() to continue reading after CS_ROW_FAIL status (Timm) + - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) +- Fixed bug #30312 (sybase_unbuffered_query calls). (Timm) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sybase_ct/tests test_msghandler.phpt
thekid Mon Nov 10 11:52:52 2008 UTC Modified files: /php-src/ext/sybase_ct/teststest_msghandler.phpt Log: - MFB: Fixed expected warning messages # Changed during migration to parameter parsing API http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_msghandler.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/sybase_ct/tests/test_msghandler.phpt diff -u php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.3 php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.4 --- php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.3Fri Aug 10 13:28:11 2007 +++ php-src/ext/sybase_ct/tests/test_msghandler.phptMon Nov 10 11:52:52 2008 @@ -6,7 +6,7 @@ --EXPECTF-- Nonexistant: -Warning: sybase_set_message_handler(): First argumented is expected to be a valid callback, 'function_does_not_exist' was given in %stest.inc on line %d -bool(false) +Warning: sybase_set_message_handler() expects parameter 1 to be a valid callback, function 'function_does_not_exist' not found or invalid function name in %stest.inc on line %d +NULL Static method: bool(true) Instance method: bool(true) Lambda function: bool(true) Unset: bool(true) Incorrect type: -Warning: sybase_set_message_handler(): First argumented is expected to be either NULL, an array or string, integer given in %stest.inc on line %d -bool(false) +Warning: sybase_set_message_handler() expects parameter 1 to be a valid callback, no array or string given in %stest.inc on line %d +NULL Function:bool(true) >>> Query: select getdate(NULL) *** Caught Sybase Server Message #%d [Severity %d, state %d] at line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sybase_ct/tests test_appname.phpt
thekid Mon Nov 10 11:52:16 2008 UTC
Modified files:
/php-src/ext/sybase_ct/teststest_appname.phpt
Log:
- MFB: Made this test independent of field types in master..sysprocesses
# char on ASE 11, varchar on ASE 15
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_appname.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/sybase_ct/tests/test_appname.phpt
diff -u php-src/ext/sybase_ct/tests/test_appname.phpt:1.2
php-src/ext/sybase_ct/tests/test_appname.phpt:1.3
--- php-src/ext/sybase_ct/tests/test_appname.phpt:1.2 Sun Feb 6 12:59:03 2005
+++ php-src/ext/sybase_ct/tests/test_appname.phpt Mon Nov 10 11:52:16 2008
@@ -6,7 +6,7 @@
- array(2) {
-["hostname"]=>
-string(10) "php.net%s"
-["program_name"]=>
-string(16) "phpt_test%s"
- }
-}
bool(true)
bool(true)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sybase_ct/tests bug29064.phpt
thekid Mon Nov 10 11:51:13 2008 UTC
Modified files:
/php-src/ext/sybase_ct/testsbug29064.phpt
Log:
- Adjusted tests to reality
# We select 123456789.12345679, we should have this returned and not
# something 123456789.123457 (rounded)
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug29064.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/sybase_ct/tests/bug29064.phpt
diff -u php-src/ext/sybase_ct/tests/bug29064.phpt:1.1
php-src/ext/sybase_ct/tests/bug29064.phpt:1.2
--- php-src/ext/sybase_ct/tests/bug29064.phpt:1.1 Sun Jul 11 16:57:24 2004
+++ php-src/ext/sybase_ct/tests/bug29064.phpt Mon Nov 10 11:51:13 2008
@@ -6,7 +6,7 @@
int(123)
["test_real"]=>
-string(16) "123456789.123457"
+string(18) "123456789.12345679"
["test_double"]=>
-string(16) "123456789.123457"
+string(18) "123456789.12345679"
}
[1]=>
array(10) {
@@ -135,9 +135,9 @@
["test_tinyint"]=>
int(255)
["test_real"]=>
-string(17) "-123456789.123457"
+string(19) "-123456789.12345679"
["test_double"]=>
-string(17) "-123456789.123457"
+string(19) "-123456789.12345679"
}
}
bool(true)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sybase_ct/tests test.inc
thekid Mon Nov 10 11:50:28 2008 UTC Modified files: /php-src/ext/sybase_ct/teststest.inc Log: - MFB: Changed source to read host, user and password from environment # E.g. nmake test TESTS=ext/sybase_ct PHP_SYBASE_HOST=db PHP_SYBASE_USER=sa PHP_SYBASE_PASS=*** http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test.inc?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/sybase_ct/tests/test.inc diff -u php-src/ext/sybase_ct/tests/test.inc:1.7 php-src/ext/sybase_ct/tests/test.inc:1.8 --- php-src/ext/sybase_ct/tests/test.inc:1.7Fri Aug 10 13:28:11 2007 +++ php-src/ext/sybase_ct/tests/test.incMon Nov 10 11:50:28 2008 @@ -1,13 +1,13 @@ http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sybase_ct/tests bug30312-withfree.phpt bug43578.phpt test_close.phpt test_close_default.phpt test_close_notopen.phpt test_connection_caching.phpt test_unbuffered_no_full_fe
thekid Mon Nov 10 11:49:49 2008 UTC
Modified files:
/php-src/ext/sybase_ct/testsbug30312-withfree.phpt bug43578.phpt
test_close.phpt
test_close_default.phpt
test_close_notopen.phpt
test_connection_caching.phpt
test_unbuffered_no_full_fetch.phpt
Log:
- MFB: Initial release
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug30312-withfree.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/sybase_ct/tests/bug30312-withfree.phpt
diff -u /dev/null php-src/ext/sybase_ct/tests/bug30312-withfree.phpt:1.2
--- /dev/null Mon Nov 10 11:49:49 2008
+++ php-src/ext/sybase_ct/tests/bug30312-withfree.phpt Mon Nov 10 11:49:49 2008
@@ -0,0 +1,34 @@
+--TEST--
+Sybase-CT bug #30312 (sybase_unbuffered_query calls, with free)
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+int(%d)
+array(2) {
+ [0]=>
+ int(%d)
+ [1]=>
+ int(%d)
+}
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug43578.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/sybase_ct/tests/bug43578.phpt
diff -u /dev/null php-src/ext/sybase_ct/tests/bug43578.phpt:1.2
--- /dev/null Mon Nov 10 11:49:49 2008
+++ php-src/ext/sybase_ct/tests/bug43578.phpt Mon Nov 10 11:49:49 2008
@@ -0,0 +1,65 @@
+--TEST--
+Sybase-CT bug #43578 (Incurred fault #6 - if returned textfield ist empty)
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+bool(true)
+bool(true)
+bool(true)
+>>> Query: select DC_Rights from #Resource where Resource_ID = 122
+<<< Return: resource
+array(0) {
+}
+>>> Query: select DC_Rights from #Resource where Resource_ID = 123
+<<< Return: resource
+array(1) {
+ [0]=>
+ array(1) {
+["DC_Rights"]=>
+NULL
+ }
+}
+>>> Query: select DC_Rights from #Resource where Resource_ID = 124
+<<< Return: resource
+array(1) {
+ [0]=>
+ array(1) {
+["DC_Rights"]=>
+string(1) " "
+ }
+}
+bool(true)
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_close.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/sybase_ct/tests/test_close.phpt
diff -u /dev/null php-src/ext/sybase_ct/tests/test_close.phpt:1.2
--- /dev/null Mon Nov 10 11:49:49 2008
+++ php-src/ext/sybase_ct/tests/test_close.phpt Mon Nov 10 11:49:49 2008
@@ -0,0 +1,25 @@
+--TEST--
+Sybase-CT close
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+resource(%d) of type (sybase-ct link)
+resource(%d) of type (Unknown)
+
+Warning: sybase_query(): %d is not a valid Sybase-Link resource in %s on line
%d
+bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_close_default.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/sybase_ct/tests/test_close_default.phpt
diff -u /dev/null php-src/ext/sybase_ct/tests/test_close_default.phpt:1.2
--- /dev/null Mon Nov 10 11:49:49 2008
+++ php-src/ext/sybase_ct/tests/test_close_default.phpt Mon Nov 10 11:49:49 2008
@@ -0,0 +1,21 @@
+--TEST--
+Sybase-CT close default connection
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+
+Warning: sybase_query(): Sybase: No connection in %s on line %d
+bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_close_notopen.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/sybase_ct/tests/test_close_notopen.phpt
diff -u /dev/null php-src/ext/sybase_ct/tests/test_close_notopen.phpt:1.2
--- /dev/null Mon Nov 10 11:49:49 2008
+++ php-src/ext/sybase_ct/tests/test_close_notopen.phpt Mon Nov 10 11:49:49 2008
@@ -0,0 +1,18 @@
+--TEST--
+Sybase-CT close not open
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+
+Warning: sybase_close(): Sybase: No connection to close in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_connection_caching.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/sybase_ct/tests/test_connection_caching.phpt
diff -u /dev/null php-src/ext/sybase_ct/tests/test_connection_caching.phpt:1.2
--- /dev/null Mon Nov 10 11:49:49 2008
+++ php-src/ext/sybase_ct/tests/test_connection_caching.phptMon Nov 10
11:49:49 2008
@@ -0,0 +1,26 @@
+--TEST--
+Sybase-CT connection caching
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+resource(%d) of type (sybase-ct link)
+resource(%d) of type (sybase-ct link)
+resource(%d) of type (sybase-ct link)
+bool(true)
+bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_unbuffered_no_full_fetch.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/sybase_ct/tests/test_unbuffered_no_full_fetch.phpt
diff -u /dev/null
php-src/ext/sybase_ct/tests/test_unbuffered_no_full_fetch.phpt:1.2
--- /dev/null Mon Nov 10 11:49:49 2008
+++ php-src/ext/sybase_ct/tests/test_unbuffered_no_full_fetch.phpt Mon Nov
10 11:49:49 2008
@@ -0,0 +1,44 @@
+--TEST--
+Sybase-CT unbuffered query without full fetching
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+resource(%d) of type (sybase-ct link)
+resource(%d) of type (sybase-ct result)
+string(4) "name"
+
+Notice: sybase_unbuffered_query()
[PHP-CVS] cvs: php-src /ext/sybase_ct php_sybase_ct.c
thekid Mon Nov 10 11:49:06 2008 UTC
Modified files:
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
- MFB: Added optional parameter "new" to sybase_connect()
- MFB: Fixed crash in sybase_unbuffered_query()
- MFB: Migrated to new parameter parsing API
- MFB: Made sybase_fetch_*() functions also read rows with CS_ROW_FAIL
- MFB: Adjusted function protos to use "resource" instead of "int"
# Forgot the bunnies. Sorry.
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.125&r2=1.126&diff_format=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.125
php-src/ext/sybase_ct/php_sybase_ct.c:1.126
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.125 Sun Nov 2 21:10:11 2008
+++ php-src/ext/sybase_ct/php_sybase_ct.c Mon Nov 10 11:49:06 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.125 2008/11/02 21:10:11 felipe Exp $ */
+/* $Id: php_sybase_ct.c,v 1.126 2008/11/10 11:49:06 thekid Exp $ */
#ifdef HAVE_CONFIG_H
@@ -49,6 +49,7 @@
ZEND_ARG_INFO(0, password)
ZEND_ARG_INFO(0, charset)
ZEND_ARG_INFO(0, appname)
+ ZEND_ARG_INFO(0, new)
ZEND_END_ARG_INFO()
static
@@ -273,6 +274,21 @@
#define efree_n(x) { efree(x); x = NULL; }
#define efree_if(x) if (x) efree_n(x)
+#ifdef PHP_SYBASE_DEBUG
+#define FREE_SYBASE_RESULT(result)
\
+ if (result) {
\
+ fprintf(stderr, "_free_sybase_result(%p) called from line #%d\n",
result, __LINE__); \
+ fflush(stderr);
\
+ _free_sybase_result(result);
\
+ result = NULL;
\
+ }
+#else
+#define FREE_SYBASE_RESULT(result)
\
+ if (result) {
\
+ _free_sybase_result(result);
\
+ result = NULL;
\
+ }
+#endif
static void _free_sybase_result(sybase_result *result)
{
int i, j;
@@ -326,7 +342,7 @@
php_sybase_finish_results(result TSRMLS_CC);
}
- _free_sybase_result(result);
+ FREE_SYBASE_RESULT(result);
}
static void _close_sybase_link(zend_rsrc_list_entry *rsrc TSRMLS_DC)
@@ -339,7 +355,6 @@
zval_ptr_dtor(&sybase_ptr->callback_name);
sybase_ptr->callback_name= NULL;
}
-
zend_hash_apply(&EG(regular_list), (apply_func_t)
_clean_invalid_results TSRMLS_CC);
/* Non-persistent connections will always be connected or we wouldn't
@@ -420,47 +435,55 @@
static int _call_message_handler(zval *callback_name, CS_SERVERMSG *srvmsg
TSRMLS_DC)
{
int handled = 0;
+ zval *msgnumber, *severity, *state, *line, *text, *retval = NULL;
+ zval **args[5];
- if (callback_name) {
- zval *msgnumber, *severity, *state, *line, *text, *retval =
NULL;
- zval **args[5];
-
- MAKE_STD_ZVAL(msgnumber);
- ZVAL_LONG(msgnumber, srvmsg->msgnumber);
- args[0] = &msgnumber;
-
- MAKE_STD_ZVAL(severity);
- ZVAL_LONG(severity, srvmsg->severity);
- args[1] = &severity;
-
- MAKE_STD_ZVAL(state);
- ZVAL_LONG(state, srvmsg->state);
- args[2] = &state;
-
- MAKE_STD_ZVAL(line);
- ZVAL_LONG(line, srvmsg->line);
- args[3] = &line;
-
- MAKE_STD_ZVAL(text);
- ZVAL_STRING(text, srvmsg->text, 1);
- args[4] = &text;
-
- if (call_user_function_ex(EG(function_table), NULL,
callback_name, &retval, 5, args, 0, NULL TSRMLS_CC) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:
Cannot call the messagehandler %s", Z_STRVAL_P(callback_name));
- }
+ /* Border case - empty fcall */
+ if (NULL == callback_name) return 0;
- if (retval) {
- handled= ((Z_TYPE_P(retval) != IS_BOOL) ||
(Z_BVAL_P(retval) != 0));
- zval_ptr_dtor(&retval);
- }
+ /* Build arguments */
+ MAKE_STD_ZVAL(msgnumber);
+ ZVAL_LONG(msgnumber, srvmsg->msgnumber);
+ args[0] = &msgnumber;
+
+ MAKE_STD_ZVAL(severity);
+ ZVAL_LONG(severity, srvmsg->severity);
+ args[1] = &sev
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct php_sybase_ct.c
Seems like you've adopted the idea from Ilia that HEAD is not for
development? You either commit to HEAD first and THEN to branches or you
don't commit at all. Remember the bunnies..
--Jani
Timm Friebe wrote:
thekid Mon Nov 10 10:59:45 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
- Added optional parameter "new" to sybase_connect
# [DOC] If a second call is made to sybase_connect() with the same arguments
# no new link will be established, but instead, the link identifier of the
# already opened link will be returned. The new parameter modifies this
# behavior and makes sybase_connect() always open a new link, even if
# sybase_connect() was called before with the same parameters.
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.103.2.5.2.13.2.12&r2=1.103.2.5.2.13.2.13&diff_format=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.12
php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.13
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.12 Sun Nov 9
11:39:14 2008
+++ php-src/ext/sybase_ct/php_sybase_ct.c Mon Nov 10 10:59:44 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13.2.12 2008/11/09 11:39:14 thekid Exp $ */
+/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13.2.13 2008/11/10 10:59:44 thekid Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -49,6 +49,7 @@
ZEND_ARG_INFO(0, password)
ZEND_ARG_INFO(0, charset)
ZEND_ARG_INFO(0, appname)
+ ZEND_ARG_INFO(0, new)
ZEND_END_ARG_INFO()
static
@@ -753,13 +754,19 @@
{
char *user, *passwd, *host, *charset, *appname;
char *hashed_details;
- int hashed_details_length;
- int len;
+ int hashed_details_length, len;
+ zend_bool new = 0;
sybase_link *sybase_ptr;
host= user= passwd= charset= appname= NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &host, &len, &user, &len,
&passwd, &len, &charset, &len, &appname, &len) == FAILURE) {
- return;
+ if (persistent) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!s!s!s!", &host, &len, &user,
&len, &passwd, &len, &charset, &len, &appname, &len) == FAILURE) {
+ return;
+ }
+ } else {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!s!s!s!b", &host, &len, &user,
&len, &passwd, &len, &charset, &len, &appname, &len, &new) == FAILURE) {
+ return;
+ }
}
hashed_details_length = spprintf(
&hashed_details,
@@ -865,7 +872,7 @@
* if it doesn't, open a new sybase link, add it to the
resource list,
* and add a pointer to it with hashed_details as the key.
*/
- if (zend_hash_find(&EG(regular_list), hashed_details,
hashed_details_length+1, (void **) &index_ptr)==SUCCESS) {
+ if (!new && zend_hash_find(&EG(regular_list), hashed_details,
hashed_details_length+1, (void **) &index_ptr)==SUCCESS) {
int type, link;
void *ptr;
@@ -929,7 +936,7 @@
}
-/* {{{ proto int sybase_connect([string host [, string user [, string password [, string charset [, string appname])
+/* {{{ proto int sybase_connect([string host [, string user [, string password
[, string charset [, string appname [, bool new]])
Open Sybase server connection */
PHP_FUNCTION(sybase_connect)
{
--
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/sybase_ct php_sybase_ct.c
thekid Mon Nov 10 10:59:45 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
- Added optional parameter "new" to sybase_connect
# [DOC] If a second call is made to sybase_connect() with the same arguments
# no new link will be established, but instead, the link identifier of the
# already opened link will be returned. The new parameter modifies this
# behavior and makes sybase_connect() always open a new link, even if
# sybase_connect() was called before with the same parameters.
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.103.2.5.2.13.2.12&r2=1.103.2.5.2.13.2.13&diff_format=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.12
php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.13
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.12 Sun Nov 9
11:39:14 2008
+++ php-src/ext/sybase_ct/php_sybase_ct.c Mon Nov 10 10:59:44 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13.2.12 2008/11/09 11:39:14 thekid Exp $
*/
+/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13.2.13 2008/11/10 10:59:44 thekid Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -49,6 +49,7 @@
ZEND_ARG_INFO(0, password)
ZEND_ARG_INFO(0, charset)
ZEND_ARG_INFO(0, appname)
+ ZEND_ARG_INFO(0, new)
ZEND_END_ARG_INFO()
static
@@ -753,13 +754,19 @@
{
char *user, *passwd, *host, *charset, *appname;
char *hashed_details;
- int hashed_details_length;
- int len;
+ int hashed_details_length, len;
+ zend_bool new = 0;
sybase_link *sybase_ptr;
host= user= passwd= charset= appname= NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &host,
&len, &user, &len, &passwd, &len, &charset, &len, &appname, &len) == FAILURE) {
- return;
+ if (persistent) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s!s!s!s!s!", &host, &len, &user, &len, &passwd, &len, &charset, &len,
&appname, &len) == FAILURE) {
+ return;
+ }
+ } else {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s!s!s!s!s!b", &host, &len, &user, &len, &passwd, &len, &charset, &len,
&appname, &len, &new) == FAILURE) {
+ return;
+ }
}
hashed_details_length = spprintf(
&hashed_details,
@@ -865,7 +872,7 @@
* if it doesn't, open a new sybase link, add it to the
resource list,
* and add a pointer to it with hashed_details as the key.
*/
- if (zend_hash_find(&EG(regular_list), hashed_details,
hashed_details_length+1, (void **) &index_ptr)==SUCCESS) {
+ if (!new && zend_hash_find(&EG(regular_list), hashed_details,
hashed_details_length+1, (void **) &index_ptr)==SUCCESS) {
int type, link;
void *ptr;
@@ -929,7 +936,7 @@
}
-/* {{{ proto int sybase_connect([string host [, string user [, string password
[, string charset [, string appname])
+/* {{{ proto int sybase_connect([string host [, string user [, string password
[, string charset [, string appname [, bool new]])
Open Sybase server connection */
PHP_FUNCTION(sybase_connect)
{
--
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) / NEWS
thekid Mon Nov 10 11:03:22 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Documented sybase_connect()'s new optional parameter 'new' http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.371&r2=1.2027.2.547.2.965.2.372&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.371 php-src/NEWS:1.2027.2.547.2.965.2.372 --- php-src/NEWS:1.2027.2.547.2.965.2.371 Sun Nov 9 11:39:15 2008 +++ php-src/NEWSMon Nov 10 11:03:22 2008 @@ -10,6 +10,7 @@ parameter validation. (Felipe) - Changed openssl info to show the shared library version number. (Scott) +- Added optional parameter "new" to sybase_connect() (Timm) - Added parse_ini_string() function. (grange at lemonde dot fr, Arnaud) - Added str_getcsv() function. (Sara) - Added ability to send user defined HTTP headers with SOAP request. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: SVNROOT / run-conversion.php
On Mon, Nov 10, 2008 at 09:50, Antony Dovgal <[EMAIL PROTECTED]> wrote: > On 24.10.2008 06:45, Gwynne Raskind wrote: >> gwynneFri Oct 24 02:45:27 2008 UTC >> >> Added files: >> /SVNROOT run-conversion.php >> Log: >> initial version of conversion script > > Uhm, could you stop these micro-commits please? > It's starting to overcrowd the CVS log. These commits should probably go to svn-migration@, not php-cvs@ -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: SVNROOT / run-conversion.php
On 24.10.2008 06:45, Gwynne Raskind wrote: > gwynneFri Oct 24 02:45:27 2008 UTC > > Added files: > /SVNROOT run-conversion.php > Log: > initial version of conversion script Uhm, could you stop these micro-commits please? It's starting to overcrowd the CVS log. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
