date:20071010

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /main safe_mode.c

2007-10-10 Thread Antony Dovgal

On 11.10.2007 02:52, Robert Thompson wrote:
> ab5602Wed Oct 10 22:52:59 2007 UTC
> 
>   Modified files:  (Branch: PHP_5_3)
> /php-src/main safe_mode.c 
>   Log:
>   
>   Fix for bug 41899, safe mode and relative paths with Solaris's broken 
> getcwd().

Please do not commit such things without discussing them on the list or in IRC.
Btw, you have problems with whitespaces in the patch.

> @@ -86,7 +86,15 @@
>* If that fails, passthrough and check directory...
>*/
>   if (mode != CHECKUID_ALLOW_ONLY_DIR) {
> - expand_filepath(filename, path TSRMLS_CC);
> +
> +char ftest[MAXPATHLEN];
> +strcpy(ftest,filename);
> +if (VCWD_GETCWD(ftest, sizeof(ftest)) == NULL) {
> +strcpy(path,filename);
> +} else {
> +expand_filepath(filename, path TSRMLS_CC);
> +}
> +
>   ret = VCWD_STAT(path, &sb);
>   if (ret < 0) {
>   if (mode == CHECKUID_DISALLOW_FILE_NOT_EXISTS) {
> 


-- 
Wbr, 
Antony Dovgal

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /ext/standard/tests/strings strcspn_basic.phpt wordwrap_variation3.phpt

2007-10-10 Thread Raghubansh

Hi Marcus, Thats fixed now. Thanks

On 10/10/07, Marcus Boerger <[EMAIL PROTECTED]> wrote:
>
> Hello Raghubansh,
>
> Tuesday, October 9, 2007, 1:58:52 PM, you wrote:
>
> > kraghubaTue Oct  9 11:58:52 2007 UTC
>
> >   Modified files:
> > /php-src/ext/standard/tests/strings wordwrap_variation3.phpt
> > strcspn_basic.phpt
> >   Log:
> >   added unicode output
> >
> >
> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/wordwrap_variation3.phpt?r1=1.2&r2=1.3&diff_format=u
> > Index: php-src/ext/standard/tests/strings/wordwrap_variation3.phpt
> > diff -u php-src/ext/standard/tests/strings/wordwrap_variation3.phpt:1.2
> > php-src/ext/standard/tests/strings/wordwrap_variation3.phpt:1.3
> > --- php-src/ext/standard/tests/strings/wordwrap_variation3.phpt:1.2
> Fri Sep 14 19:09:11 2007
> > +++ php-src/ext/standard/tests/strings/wordwrap_variation3.phpt Tue
> Oct  9 11:58:52 2007
> > @@ -300,3 +300,203 @@
> >  Warning: wordwrap(): Break string cannot be empty in %s on line %d
> >  bool(false)
> >  Done
> > +--UEXPECTF--
> > +--UEXPECTF--
>
> Isn't this duplication causing trouble?
>
> Best regards,
> Marcus
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>


-- 
with Regards,
Raghubansh

[PHP-CVS] cvs: php-src /ext/standard/tests/strings wordwrap_variation3.phpt

2007-10-10 Thread Raghubansh Kumar

kraghubaThu Oct 11 03:17:08 2007 UTC

  Modified files:  
/php-src/ext/standard/tests/strings wordwrap_variation3.phpt 
  Log:
  fix test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/wordwrap_variation3.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/wordwrap_variation3.phpt
diff -u php-src/ext/standard/tests/strings/wordwrap_variation3.phpt:1.3 
php-src/ext/standard/tests/strings/wordwrap_variation3.phpt:1.4
--- php-src/ext/standard/tests/strings/wordwrap_variation3.phpt:1.3 Tue Oct 
 9 11:58:52 2007
+++ php-src/ext/standard/tests/strings/wordwrap_variation3.phpt Thu Oct 11 
03:17:08 2007
@@ -301,7 +301,6 @@
 bool(false)
 Done
 --UEXPECTF--
---UEXPECTF--
 *** Testing wordwrap() : usage variations ***
 
 --- Testing wordwrap() by supplying different values for 'break' argument ---

-- 
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/simplexml simplexml.c

2007-10-10 Thread Marcus Boerger

helly   Thu Oct 11 01:03:19 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/simplexml  simplexml.c 
  Log:
  - MFH debug object helper
  http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.2&r2=1.151.2.22.2.35.2.3&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.2 
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.3
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.2   Sun Oct  7 
05:22:06 2007
+++ php-src/ext/simplexml/simplexml.c   Thu Oct 11 01:03:19 2007
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.151.2.22.2.35.2.2 2007/10/07 05:22:06 davidw Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.35.2.3 2007/10/11 01:03:19 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -136,7 +136,7 @@
 static xmlNodePtr sxe_get_element_by_offset(php_sxe_object *sxe, long offset, 
xmlNodePtr node, long *cnt) /* {{{ */
 {
long nodendx = 0;
-   
+
if (sxe->iter.type == SXE_ITER_NONE) {
if (offset == 0) {
if (cnt) {
@@ -161,7 +161,7 @@
 next_iter:
node = node->next;
}
-   
+
if (cnt) {
*cnt = nodendx;
}
@@ -275,7 +275,7 @@
 
if (sxe->iter.type == SXE_ITER_ATTRLIST) {
attribs = 1;
-   elements = 0;   
+   elements = 0;
node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
attr = (xmlAttrPtr)node;
test = sxe->iter.name != NULL;
@@ -337,7 +337,7 @@
}
} else if (member) {
node = sxe_get_element_by_offset(sxe, 
Z_LVAL_P(member), node, &cnt);
-   } else {
+   } else {
node = NULL;
}
if (node) {
@@ -502,7 +502,7 @@
 
if (sxe->iter.type == SXE_ITER_ATTRLIST) {
attribs = 1;
-   elements = 0;   
+   elements = 0;
node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
attr = (xmlAttrPtr)node;
test = sxe->iter.name != NULL;
@@ -639,7 +639,7 @@
if (!node) {
if (!member || Z_TYPE_P(member) == IS_LONG) {
newnode = 
xmlNewTextChild(mynode->parent, mynode->ns, mynode->name, value ? (xmlChar 
*)Z_STRVAL_P(value) : NULL);
-   } else {
+   } else {
newnode = xmlNewTextChild(mynode, 
mynode->ns, (xmlChar *)Z_STRVAL_P(member), value ? (xmlChar *)Z_STRVAL_P(value) 
: NULL);
}
} else if (!member || Z_TYPE_P(member) == IS_LONG) {
@@ -711,6 +711,9 @@
_node_as_zval(sxe, node, return_value, type, name, sxe->iter.nsprefix, 
sxe->iter.isprefix TSRMLS_CC);
 
sxe = php_sxe_fetch_object(return_value TSRMLS_CC);
+   if (sxe->tmp) {
+   zval_ptr_dtor(&sxe->tmp);
+   }
sxe->tmp = return_value;
Z_SET_ISREF_P(return_value);
 
@@ -752,7 +755,7 @@
 
if (sxe->iter.type == SXE_ITER_ATTRLIST) {
attribs = 1;
-   elements = 0;   
+   elements = 0;
node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
attr = (xmlAttrPtr)node;
test = sxe->iter.name != NULL;
@@ -814,7 +817,7 @@
}
if (node) {
exists = 1;
-if (check_empty == 1 && 
+if (check_empty == 1 &&
(!node->children || 
(node->children->type == XML_TEXT_NODE && !node->children->next &&
(!node->children->content || 
!node->children->content[0] || !xmlStrcmp(node->children->content, "0" ) {
exists = 0;
@@ -882,7 +885,7 @@
 
if (sxe->iter.type == SXE_ITER_ATTRLIST) {
attribs = 1;
-   elements = 0;   
+   elements = 0;
node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
attr = (xmlAttrPtr)node;
test = sxe->iter.name != NULL;
@@ -978,7 +981,7 @@
char*res = estrdup((char*)tmp);
 
xmlFree(tmp);
-   
+
return res;
 }
 
@@ -1038,9 +1041,9 @@
}
 }
 
-/* {{{ sxe_properties_get()
+/* {{{ sxe_get_prop_hash()
  */
-static HashTable * sx

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard var.c

2007-10-10 Thread Marcus Boerger

helly   Thu Oct 11 01:03:03 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   var.c 
  Log:
  - MFH debug object helper
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.203.2.7.2.18.2.1&r2=1.203.2.7.2.18.2.2&diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.203.2.7.2.18.2.1 
php-src/ext/standard/var.c:1.203.2.7.2.18.2.2
--- php-src/ext/standard/var.c:1.203.2.7.2.18.2.1   Sun Oct  7 05:22:07 2007
+++ php-src/ext/standard/var.c  Thu Oct 11 01:03:03 2007
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: var.c,v 1.203.2.7.2.18.2.1 2007/10/07 05:22:07 davidw Exp $ */
+/* $Id: var.c,v 1.203.2.7.2.18.2.2 2007/10/11 01:03:03 helly Exp $ */
 
 
 
@@ -98,6 +98,7 @@
char *class_name;
zend_uint class_name_len;
int (*php_element_dump_func)(zval**, int, va_list, zend_hash_key*);
+   int is_temp;
 
if (level > 1) {
php_printf("%*c", level - 1, ' ');
@@ -129,9 +130,10 @@
}
php_printf("%sarray(%d) {\n", COMMON, 
zend_hash_num_elements(myht));
php_element_dump_func = php_array_element_dump;
+   is_temp = 0;
goto head_done;
case IS_OBJECT:
-   myht = Z_OBJPROP_PP(struc);
+   myht = Z_OBJDEBUG_PP(struc, is_temp);
if (myht && myht->nApplyCount > 1) {
PUTS("*RECURSION*\n");
return;
@@ -144,6 +146,10 @@
 head_done:
if (myht) {
zend_hash_apply_with_arguments(myht, 
(apply_func_args_t) php_element_dump_func, 1, level);
+   if (is_temp) {
+   zend_hash_destroy(myht);
+   efree(myht);
+   }
}
if (level > 1) {
php_printf("%*c", level-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_2) /main safe_mode.c

2007-10-10 Thread Robert Thompson

ab5602  Wed Oct 10 23:54:39 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   safe_mode.c 
  Log:
  
  Fix for bug 41899, safe mode and relative paths with Solaris's broken 
getcwd().
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/safe_mode.c?r1=1.62.2.1.2.10&r2=1.62.2.1.2.11&diff_format=u
Index: php-src/main/safe_mode.c
diff -u php-src/main/safe_mode.c:1.62.2.1.2.10 
php-src/main/safe_mode.c:1.62.2.1.2.11
--- php-src/main/safe_mode.c:1.62.2.1.2.10  Sun Sep 23 15:19:21 2007
+++ php-src/main/safe_mode.cWed Oct 10 23:54:39 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: safe_mode.c,v 1.62.2.1.2.10 2007/09/23 15:19:21 iliaa Exp $ */
+/* $Id: safe_mode.c,v 1.62.2.1.2.11 2007/10/10 23:54:39 ab5602 Exp $ */
 
 #include "php.h"
 
@@ -86,7 +86,15 @@
 * If that fails, passthrough and check directory...
 */
if (mode != CHECKUID_ALLOW_ONLY_DIR) {
-   expand_filepath(filename, path TSRMLS_CC);
+
+char ftest[MAXPATHLEN];
+strcpy(ftest,filename);
+if (VCWD_GETCWD(ftest, sizeof(ftest)) == NULL) {
+strcpy(path,filename);
+} else {
+expand_filepath(filename, path TSRMLS_CC);
+}
+
ret = VCWD_STAT(path, &sb);
if (ret < 0) {
if (mode == CHECKUID_DISALLOW_FILE_NOT_EXISTS) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main network.c php_network.h

2007-10-10 Thread Elizabeth Marie Smith

auroraeosrose   Wed Oct 10 23:23:54 2007 UTC

  Modified files:  
/php-src/main   network.c php_network.h 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.127&r2=1.128&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.127 php-src/main/network.c:1.128
--- php-src/main/network.c:1.127Wed Jul 18 09:04:37 2007
+++ php-src/main/network.c  Wed Oct 10 23:23:54 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: network.c,v 1.127 2007/07/18 09:04:37 jani Exp $ */
+/* $Id: network.c,v 1.128 2007/10/10 23:23:54 auroraeosrose Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -90,6 +90,9 @@
 # define SOCK_ERR INVALID_SOCKET
 # define SOCK_CONN_ERR SOCKET_ERROR
 # define PHP_TIMEOUT_ERROR_VALUE   WSAETIMEDOUT
+
+struct in6_addr in6addr_any = {0}; /* IN6ADDR_ANY_INIT; */
+
 #else
 # define SOCK_ERR -1
 # define SOCK_CONN_ERR -1
http://cvs.php.net/viewvc.cgi/php-src/main/php_network.h?r1=1.58&r2=1.59&diff_format=u
Index: php-src/main/php_network.h
diff -u php-src/main/php_network.h:1.58 php-src/main/php_network.h:1.59
--- php-src/main/php_network.h:1.58 Mon Jan  1 09:29:35 2007
+++ php-src/main/php_network.h  Wed Oct 10 23:23:54 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_network.h,v 1.58 2007/01/01 09:29:35 sebastian Exp $ */
+/* $Id: php_network.h,v 1.59 2007/10/10 23:23:54 auroraeosrose Exp $ */
 
 #ifndef _PHP_NETWORK_H
 #define _PHP_NETWORK_H
@@ -121,12 +121,14 @@
 
 PHPAPI int php_poll2(php_pollfd *ufds, unsigned int nfds, int timeout);
 
+#ifndef POLLIN
 # define POLLIN  0x0001/* There is data to read */
 # define POLLPRI 0x0002/* There is urgent data to read */
 # define POLLOUT 0x0004/* Writing now will not block */
 # define POLLERR 0x0008/* Error condition */
 # define POLLHUP 0x0010/* Hung up */
 # define POLLNVAL0x0020/* Invalid request: fd not open */
+#endif
 
 # ifndef PHP_USE_POLL_2_EMULATION
 #  define PHP_USE_POLL_2_EMULATION 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) /main safe_mode.c

2007-10-10 Thread Robert Thompson

ab5602  Wed Oct 10 22:52:59 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/main   safe_mode.c 
  Log:
  
  Fix for bug 41899, safe mode and relative paths with Solaris's broken 
getcwd().
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/safe_mode.c?r1=1.62.2.1.2.10&r2=1.62.2.1.2.10.2.1&diff_format=u
Index: php-src/main/safe_mode.c
diff -u php-src/main/safe_mode.c:1.62.2.1.2.10 
php-src/main/safe_mode.c:1.62.2.1.2.10.2.1
--- php-src/main/safe_mode.c:1.62.2.1.2.10  Sun Sep 23 15:19:21 2007
+++ php-src/main/safe_mode.cWed Oct 10 22:52:58 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: safe_mode.c,v 1.62.2.1.2.10 2007/09/23 15:19:21 iliaa Exp $ */
+/* $Id: safe_mode.c,v 1.62.2.1.2.10.2.1 2007/10/10 22:52:58 ab5602 Exp $ */
 
 #include "php.h"
 
@@ -86,7 +86,15 @@
 * If that fails, passthrough and check directory...
 */
if (mode != CHECKUID_ALLOW_ONLY_DIR) {
-   expand_filepath(filename, path TSRMLS_CC);
+
+char ftest[MAXPATHLEN];
+strcpy(ftest,filename);
+if (VCWD_GETCWD(ftest, sizeof(ftest)) == NULL) {
+strcpy(path,filename);
+} else {
+expand_filepath(filename, path TSRMLS_CC);
+}
+
ret = VCWD_STAT(path, &sb);
if (ret < 0) {
if (mode == CHECKUID_DISALLOW_FILE_NOT_EXISTS) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard url_scanner_ex.c

2007-10-10 Thread Marcus Boerger

Hello Jani,

  how about requiring 0.12.2 or even 0.12.3?

marcus

Wednesday, October 10, 2007, 11:28:51 AM, you wrote:

> janiWed Oct 10 09:28:51 2007 UTC

>   Modified files:  (Branch: PHP_5_2)
> /php-src/ext/standard   url_scanner_ex.c 
>   Log:
>   - Generated with more recent re2c version
>   



Best regards,
 Marcus

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /ext/standard/tests/strings strcspn_basic.phpt wordwrap_variation3.phpt

2007-10-10 Thread Marcus Boerger

Hello Raghubansh,

Tuesday, October 9, 2007, 1:58:52 PM, you wrote:

> kraghubaTue Oct  9 11:58:52 2007 UTC

>   Modified files:  
> /php-src/ext/standard/tests/strings wordwrap_variation3.phpt 
> strcspn_basic.phpt 
>   Log:
>   added unicode output
>   
> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/wordwrap_variation3.phpt?r1=1.2&r2=1.3&diff_format=u
> Index: php-src/ext/standard/tests/strings/wordwrap_variation3.phpt
> diff -u php-src/ext/standard/tests/strings/wordwrap_variation3.phpt:1.2
> php-src/ext/standard/tests/strings/wordwrap_variation3.phpt:1.3
> --- php-src/ext/standard/tests/strings/wordwrap_variation3.phpt:1.2 Fri 
> Sep 14 19:09:11 2007
> +++ php-src/ext/standard/tests/strings/wordwrap_variation3.phpt Tue Oct  9 
> 11:58:52 2007
> @@ -300,3 +300,203 @@
>  Warning: wordwrap(): Break string cannot be empty in %s on line %d
>  bool(false)
>  Done
> +--UEXPECTF--
> +--UEXPECTF--

Isn't this duplication causing trouble?

Best regards,
 Marcus

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /ext/standard/tests/strings nl2br_error.phpt nl2br_variation1.phpt nl2br_variation2.phpt nl2br_variation3.phpt nl2br_variation4.phpt nl2br_variation5.phpt

2007-10-10 Thread Marcus Boerger

Hello Raghubansh,

Monday, October 8, 2007, 2:55:11 PM, you wrote:

> Hi Marcus,
>> maybe safe a few keystrokes and go with the suggested *_001 instead or
>>*_variation1 style.
> Did you mean that we name the testcases without indicating *variation
> or you mean, we should name the testcases *variation_001.phpt rather than *
> variation1.phpt ?

More or less the latter (name_001.phpt instead of name_variation1.phpt), as
it is shorter :-)

marcus

-- 
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/mysqli/tests mysqli_stmt_field_count.phpt

2007-10-10 Thread Antony Dovgal

On 10.10.2007 19:04, Ulf Wendel wrote:
> uwWed Oct 10 15:04:59 2007 UTC
> 
>   Modified files:  (Branch: PHP_5_3)
> /php-src/ext/mysqli/tests mysqli_stmt_field_count.phpt 
>   Log:
>   Fixing the test. Might the PHP 5.2 run-tests.php have fooled me? I could 
> swear, 
>   I saw this test passing with 5.2 before...

Most likely it's caused by the recent change in '%s' behavior:
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.34&r2=1.226.2.37.2.35

-- 
Wbr, 
Antony Dovgal

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests mysqli_stmt_field_count.phpt

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 15:04:59 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   mysqli_stmt_field_count.phpt 
  Log:
  Fixing the test. Might the PHP 5.2 run-tests.php have fooled me? I could 
swear, 
  I saw this test passing with 5.2 before...
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_field_count.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_stmt_field_count.phpt
diff -u php-src/ext/mysqli/tests/mysqli_stmt_field_count.phpt:1.2.2.2 
php-src/ext/mysqli/tests/mysqli_stmt_field_count.phpt:1.2.2.3
--- php-src/ext/mysqli/tests/mysqli_stmt_field_count.phpt:1.2.2.2   Wed Oct 
10 10:18:50 2007
+++ php-src/ext/mysqli/tests/mysqli_stmt_field_count.phpt   Wed Oct 10 
15:04:59 2007
@@ -88,6 +88,8 @@
 Warning: mysqli_stmt_field_count(): invalid object or resource mysqli_stmt
  in %s on line %d
 
+Warning: mysqli_stmt_bind_param(): Number of variables doesn't match number of 
parameters in prepared statement in %s on line %d
+
 Warning: mysqli_stmt_prepare(): Couldn't fetch mysqli_stmt in %s on line %d
 
 Warning: mysqli_stmt_field_count(): Couldn't fetch mysqli_stmt in %s on 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/odbc php_odbc.c

2007-10-10 Thread Andrey Hristov

andrey  Wed Oct 10 14:32:01 2007 UTC

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  MFB and unify code
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.204&r2=1.205&diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.204 php-src/ext/odbc/php_odbc.c:1.205
--- php-src/ext/odbc/php_odbc.c:1.204   Sun Oct  7 05:15:04 2007
+++ php-src/ext/odbc/php_odbc.c Wed Oct 10 14:32:01 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.204 2007/10/07 05:15:04 davidw Exp $ */
+/* $Id: php_odbc.c,v 1.205 2007/10/10 14:32:01 andrey Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1567,8 +1567,7 @@
result->fetched++;
 
for(i = 0; i < result->numcols; i++) {
-   ALLOC_ZVAL(tmp);
-   Z_SET_REFCOUNT_P(tmp, 1);
+   MAKE_STD_ZVAL(tmp);
Z_TYPE_P(tmp) = IS_STRING;
Z_STRLEN_P(tmp) = 0;
sql_c_type = SQL_C_CHAR;

-- 
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/tests 061.phpt bug31668.phpt

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 14:31:29 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   061.phpt bug31668.phpt 
  Log:
  Version specific EXPECF sections would be wonderful (bug31668.phpt).
  And sometimes it helps to read the commit messages to keep tests up to date:
  we removed mysqli_set_local_infile_handler() from mysqlnd (061.phpt) some 
  time ago.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/061.phpt?r1=1.5.4.1.2.1&r2=1.5.4.1.2.2&diff_format=u
Index: php-src/ext/mysqli/tests/061.phpt
diff -u php-src/ext/mysqli/tests/061.phpt:1.5.4.1.2.1 
php-src/ext/mysqli/tests/061.phpt:1.5.4.1.2.2
--- php-src/ext/mysqli/tests/061.phpt:1.5.4.1.2.1   Wed Oct 10 10:10:14 2007
+++ php-src/ext/mysqli/tests/061.phpt   Wed Oct 10 14:31:28 2007
@@ -1,9 +1,11 @@
 --TEST--
 local infile handler
 --SKIPIF--
-
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug31668.phpt?r1=1.2.4.1.2.1&r2=1.2.4.1.2.2&diff_format=u
Index: php-src/ext/mysqli/tests/bug31668.phpt
diff -u php-src/ext/mysqli/tests/bug31668.phpt:1.2.4.1.2.1 
php-src/ext/mysqli/tests/bug31668.phpt:1.2.4.1.2.2
--- php-src/ext/mysqli/tests/bug31668.phpt:1.2.4.1.2.1  Wed Oct 10 10:10:59 2007
+++ php-src/ext/mysqli/tests/bug31668.phpt  Wed Oct 10 14:31:28 2007
@@ -1,10 +1,12 @@
 --TEST--
 Bug #31668 (multi_query works exactly every other time (multi_query was 
global, now per connection))
 --SKIPIF--
-
+--INI--
+error_reporting = E_ALL & ~E_STRICT
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c

2007-10-10 Thread Andrey Hristov

andrey  Wed Oct 10 14:29:27 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/odbc   php_odbc.c 
  Log:
  Fix ODBC, the GC patch missed this one leading to compilation failure.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.1&r2=1.189.2.4.2.7.2.2&diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.1 
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.2
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.1   Thu Sep 27 18:00:41 2007
+++ php-src/ext/odbc/php_odbc.c Wed Oct 10 14:29:27 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.1 2007/09/27 18:00:41 dmitry Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.2 2007/10/10 14:29:27 andrey Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1573,8 +1573,7 @@
result->fetched++;
 
for(i = 0; i < result->numcols; i++) {
-   ALLOC_ZVAL(tmp);
-   tmp->refcount = 1;
+   MAKE_STD_ZVAL(tmp);
Z_TYPE_P(tmp) = IS_STRING;
Z_STRLEN_P(tmp) = 0;
sql_c_type = SQL_C_CHAR;

-- 
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 streamsfuncs.c

2007-10-10 Thread Jani Taskinen

janiWed Oct 10 12:58:42 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   streamsfuncs.c 
  Log:
  MFH
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.3&r2=1.58.2.6.2.15.2.4&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.3 
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.4
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.3   Wed Oct 10 
12:44:46 2007
+++ php-src/ext/standard/streamsfuncs.c Wed Oct 10 12:58:41 2007
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.3 2007/10/10 12:44:46 jani Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.4 2007/10/10 12:58:41 jani Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -574,6 +574,7 @@
zval **elem;
php_stream *stream;
php_socket_t this_fd;
+   int cnt = 0;
 
if (Z_TYPE_P(stream_array) != IS_ARRAY) {
return 0;
@@ -598,9 +599,10 @@
if (this_fd > *max_fd) {
*max_fd = this_fd;
}
+   cnt++;
}
}
-   return 1;
+   return cnt ? 1 : 0;
 }
 
 static int stream_array_from_fd_set(zval *stream_array, fd_set *fds TSRMLS_DC)
@@ -608,7 +610,8 @@
zval **elem, **dest_elem;
php_stream *stream;
HashTable *new_hash;
-   php_socket_t this_fd, ret = 0;
+   php_socket_t this_fd;
+   int ret = 0;
 
if (Z_TYPE_P(stream_array) != IS_ARRAY) {
return 0;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard streamsfuncs.c

2007-10-10 Thread Jani Taskinen

janiWed Oct 10 12:51:06 2007 UTC

  Modified files:  
/php-src/ext/standard   streamsfuncs.c 
  Log:
  ret is still int
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.107&r2=1.108&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.107 
php-src/ext/standard/streamsfuncs.c:1.108
--- php-src/ext/standard/streamsfuncs.c:1.107   Wed Oct 10 12:44:29 2007
+++ php-src/ext/standard/streamsfuncs.c Wed Oct 10 12:51:06 2007
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: streamsfuncs.c,v 1.107 2007/10/10 12:44:29 jani Exp $ */
+/* $Id: streamsfuncs.c,v 1.108 2007/10/10 12:51:06 jani Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -656,7 +656,8 @@
zval **elem, **dest_elem;
php_stream *stream;
HashTable *new_hash;
-   php_socket_t this_fd, ret = 0;
+   php_socket_t this_fd;
+   int ret = 0;
 
if (Z_TYPE_P(stream_array) != IS_ARRAY) {
return 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/standard streamsfuncs.c

2007-10-10 Thread Jani Taskinen

janiWed Oct 10 12:44:46 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   streamsfuncs.c 
  Log:
  MFH
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.2&r2=1.58.2.6.2.15.2.3&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.2 
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.3
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.2   Sun Oct  7 
05:22:07 2007
+++ php-src/ext/standard/streamsfuncs.c Wed Oct 10 12:44:46 2007
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.2 2007/10/07 05:22:07 davidw Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.3 2007/10/10 12:44:46 jani Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -608,7 +608,7 @@
zval **elem, **dest_elem;
php_stream *stream;
HashTable *new_hash;
-   int this_fd, ret = 0;
+   php_socket_t this_fd, ret = 0;
 
if (Z_TYPE_P(stream_array) != IS_ARRAY) {
return 0;
@@ -1399,8 +1399,8 @@
 
RETURN_BOOL(php_stream_xport_shutdown(stream, (stream_shutdown_t)how 
TSRMLS_CC) == 0);
 }
-#endif
 /* }}} */
+#endif
 
 /*
  * Local variables:

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/standard streamsfuncs.c

2007-10-10 Thread Jani Taskinen

janiWed Oct 10 12:44:30 2007 UTC

  Modified files:  
/php-src/ext/standard   streamsfuncs.c 
  Log:
  - Use correct definition
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.106&r2=1.107&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.106 
php-src/ext/standard/streamsfuncs.c:1.107
--- php-src/ext/standard/streamsfuncs.c:1.106   Sun Oct  7 05:15:06 2007
+++ php-src/ext/standard/streamsfuncs.c Wed Oct 10 12:44:29 2007
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: streamsfuncs.c,v 1.106 2007/10/07 05:15:06 davidw Exp $ */
+/* $Id: streamsfuncs.c,v 1.107 2007/10/10 12:44:29 jani Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -656,7 +656,7 @@
zval **elem, **dest_elem;
php_stream *stream;
HashTable *new_hash;
-   int this_fd, ret = 0;
+   php_socket_t this_fd, ret = 0;
 
if (Z_TYPE_P(stream_array) != IS_ARRAY) {
return 0;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_fetch_assoc.phpt mysql_fetch_field.phpt mysql_fetch_object.phpt mysql_list_fields.phpt mysql_result.phpt

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 10:56:33 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_fetch_assoc.phpt 
mysql_fetch_field.phpt 
mysql_fetch_object.phpt 
mysql_list_fields.phpt mysql_result.phpt 
  Log:
  Test changes for HEAD = synching with 5_3
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_assoc.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_assoc.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.3 
php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.4
--- php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.3  Thu Aug  9 11:53:17 2007
+++ php-src/ext/mysql/tests/mysql_fetch_assoc.phpt  Wed Oct 10 10:56:33 2007
@@ -1,8 +1,8 @@
 --TEST--
 mysql_fetch_assoc()
 --SKIPIF--
-
 --FILE--
@@ -46,6 +46,16 @@
 
 mysql_close($link);
 
+include('table.inc');
+if (!$res = mysql_query("SELECT id, label, id AS _id, CONCAT(label, 'a') 
_label, NULL as _foo FROM test _test ORDER BY id ASC LIMIT 1", $link)) {
+   printf("[009] [%d] %s\n", mysql_errno($link), $mysql_error($link));
+}
+print "[010]\n";
+var_dump(mysql_fetch_assoc($res));
+mysql_free_result($res);
+
+mysql_close($link);
+
 print "done!";
 ?>
 --EXPECTF--
@@ -73,6 +83,19 @@
 }
 
 Warning: mysql_fetch_assoc(): %d is not a valid MySQL result resource in %s on 
line %d
+[010]
+array(5) {
+  ["id"]=>
+  string(1) "1"
+  ["label"]=>
+  string(1) "a"
+  ["_id"]=>
+  string(1) "1"
+  ["_label"]=>
+  string(2) "aa"
+  ["_foo"]=>
+  NULL
+}
 done!
 --UEXPECTF--
 [005]
@@ -99,4 +122,17 @@
 }
 
 Warning: mysql_fetch_assoc(): %d is not a valid MySQL result resource in %s on 
line %d
+[010]
+array(5) {
+  [u"id"]=>
+  unicode(1) "1"
+  [u"label"]=>
+  unicode(1) "a"
+  [u"_id"]=>
+  unicode(1) "1"
+  [u"_label"]=>
+  unicode(2) "aa"
+  [u"_foo"]=>
+  NULL
+}
 done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_field.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_field.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.4 
php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.5
--- php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.4  Thu Aug  9 11:53:17 2007
+++ php-src/ext/mysql/tests/mysql_fetch_field.phpt  Wed Oct 10 10:56:33 2007
@@ -1,8 +1,8 @@
 --TEST--
 mysql_fetch_field()
 --SKIPIF--
-
 --FILE--
@@ -21,7 +21,6 @@
 
require('table.inc');
 
-
$version = mysql_get_server_info($link);
if (!preg_match('@(\d+)\.(\d+)\.(\d+)@ism', $version, $matches))
printf("[003] Cannot get server version\n");
@@ -105,6 +104,32 @@
mysql_free_result($res);
}
 
+   if (!mysql_query("DROP TABLE IF EXISTS test", $link))
+   printf("[013] [%d] %s\n", mysql_errno($link), 
mysql_error($link));
+
+   if (!mysql_query("CREATE TABLE test(id INT DEFAULT 1)"))
+   printf("[014] [%d] %s\n", mysql_errno($link), 
mysql_error($link));
+
+   if (!mysql_query("INSERT INTO test(id) VALUES (2)"))
+   printf("[015] [%d] %s\n", mysql_errno($link), 
mysql_error($link));
+
+   if (!$res = mysql_query("SELECT id FROM test", $link)) {
+   printf("[016] [%d] %s\n", mysql_errno($link), 
mysql_error($link));
+   }
+
+   var_dump(mysql_fetch_field($res));
+   mysql_free_result($res);
+
+   if (!$res = mysql_query("SELECT id FROM test", $link)) {
+   printf("[017] [%d] %s\n", mysql_errno($link), 
mysql_error($link));
+   }
+   $res = mysql_list_fields($db, 'test');
+   while ($tmp = mysql_fetch_field($res))
+   if ($tmp->name == 'id')
+   var_dump($tmp);
+
+   mysql_free_result($res);
+
mysql_close($link);
print "done!";
 ?>
@@ -170,6 +195,62 @@
 Warning: mysql_fetch_field(): Bad field offset in %s on line %d
 
 Warning: mysql_fetch_field(): %d is not a valid MySQL result resource in %s on 
line %d
+object(stdClass)#%d (13) {
+  ["name"]=>
+  string(2) "id"
+  ["table"]=>
+  string(4) "test"
+  ["def"]=>
+  string(0) ""
+  ["max_length"]=>
+  int(1)
+  ["not_null"]=>
+  int(0)
+  ["primary_key"]=>
+  int(0)
+  ["multiple_key"]=>
+  int(0)
+  ["unique_key"]=>
+  int(0)
+  ["numeric"]=>
+  int(1)
+  ["blob"]=>
+  int(0)
+  ["type"]=>
+  string(3) "int"
+  ["unsigned"]=>
+  int(0)
+  ["zerofill"]=>
+  int(0)
+}
+object(stdClass)#%d (13) {
+  ["name"]=>
+  string(2) "id"
+  ["table"]=>
+  string(4) "test"
+  ["def"]=>
+  string(1) "1"
+  ["max_length"]=>
+  int(0)
+  ["not_null"]=>
+  int(0)
+  ["primary_key"]=>
+  int(0)
+  ["multiple_key"]=>
+  int(0)
+  ["unique_key"]=>
+  int(0)
+  ["numeric"]=>
+  int(1)
+  ["blob"]=>
+  int(0)
+  ["type"]=>
+  string(3) "int"
+  ["unsigned"]=>
+  int(0)
+  ["zerofill"]=>
+  int(0)
+}
 done!
 --UEXPECTF--
 object(stdClass)#%d (13) {
@@ -233,4 +314,60 @@
 Warning: mysql_fetch_field(): Bad field o

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_max_links.phpt mysql_max_persistent.phpt mysql_pconn_disable.phpt mysql_pconn_kill.phpt mysql_pconn_max_links.phpt mysql_pconn_reuse.phpt mysql_pconnect.p

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 10:55:52 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_max_links.phpt 
mysql_max_persistent.phpt 
mysql_pconn_disable.phpt 
mysql_pconn_kill.phpt 
mysql_pconn_max_links.phpt 
mysql_pconn_reuse.phpt 
mysql_query_load_data_openbasedir.phpt 
mysql_sql_safe_mode.phpt 
mysql_trace_mode.phpt mysql_pconnect.phpt 
  Log:
  Adding tests to ext/mysql in HEAD = synching with 5_3
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_max_links.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_max_links.phpt
diff -u /dev/null php-src/ext/mysql/tests/mysql_max_links.phpt:1.2
--- /dev/null   Wed Oct 10 10:55:52 2007
+++ php-src/ext/mysql/tests/mysql_max_links.phptWed Oct 10 10:55:52 2007
@@ -0,0 +1,69 @@
+--TEST--
+mysql_[p]connect() - max_links/max_persistent
+--SKIPIF--
+
+--INI--
+mysql.max_links=2
+--FILE--
+ second open connection
+$links[0] = my_connect(50, $host, $user, $passwd, $db, $port, $socket);
+$links[2] = my_connect(60, $host, $user, $passwd, $db, $port, $socket);
+ksort($links);
+var_dump($links);
+
+mysql_close($links[0]);
+mysql_close($links[1]);
+print "done!\n";
+?>
+--EXPECTF--
+Warning: mysql_connect(): Too many open links (2) in %s on line %s
+[030] Cannot connect using host '%s', user '%s', password '', [0] 0
+
+Warning: mysql_connect(): Too many open links (2) in %s on line %s
+[060] Cannot connect using host '%s', user '%s', password '', [0] 0
+array(3) {
+  [0]=>
+  resource(%d) of type (mysql link)
+  [1]=>
+  resource(%d) of type (mysql link)
+  [2]=>
+  bool(false)
+}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_max_persistent.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_max_persistent.phpt
diff -u /dev/null php-src/ext/mysql/tests/mysql_max_persistent.phpt:1.2
--- /dev/null   Wed Oct 10 10:55:52 2007
+++ php-src/ext/mysql/tests/mysql_max_persistent.phpt   Wed Oct 10 10:55:52 2007
@@ -0,0 +1,90 @@
+--TEST--
+mysql_[p]connect() - max_links/max_persistent
+--SKIPIF--
+
+--INI--
+mysql.max_links=2
+mysql.allow_persistent=1
+mysql.max_persistent=1
+--FILE--
+ only open connection
+$links[0] = my_connect(40, $host, $user, $passwd, $db, $port, $socket);
+var_dump($links);
+
+mysql_query('REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest', $links[0]);
+mysql_query('DROP USER pcontest', $links[0]);
+
+mysql_close($links[0]);
+print "done!\n";
+?>
+--EXPECTF--
+Warning: mysql_pconnect(): Too many open persistent links (1) in %s on line %d
+[020] Cannot connect using host '%s', user '%s', password '', [0] 0
+array(1) {
+  [0]=>
+  resource(%d) of type (mysql link persistent)
+}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_pconn_disable.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_pconn_disable.phpt
diff -u /dev/null php-src/ext/mysql/tests/mysql_pconn_disable.phpt:1.2
--- /dev/null   Wed Oct 10 10:55:52 2007
+++ php-src/ext/mysql/tests/mysql_pconn_disable.phptWed Oct 10 10:55:52 2007
@@ -0,0 +1,58 @@
+--TEST--
+mysql_pconnect() - disabling feature
+--SKIPIF--
+
+--INI--
+mysql.allow_persistent=0
+mysql.max_persistent=1
+mysql.max_links=2
+--FILE--
+
+--EXPECTF--
+[001] Can connect to the server.
+[002] Can fetch data using persistent connection! Data = '1'
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_pconn_kill.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_pconn_kill.phpt
diff -u /dev/null php-src/ext/mysql/tests/mysql_pconn_kill.phpt:1.2
--- /dev/null   Wed Oct 10 10:55:52 2007
+++ php-src/ext/mysql/tests/mysql_pconn_kill.phpt   Wed Oct 10 10:55:52 2007
@@ -0,0 +1,106 @@
+--TEST--
+mysql_pconnect() - killing persitent connection
+--SKIPIF--
+
+--INI--
+mysql.allow_persistent=1
+mysql.max_persistent=2
+--FILE--
+
+--EXPECTF--
+bool(true)
+done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_pconn_max_links.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_pconn_max_links.phpt
diff -u /dev/null php-src/ext/mysql/tests/mysql_pconn_max_links.phpt:1.2
--- /dev/null   Wed Oct 10 10:55:52 2007
+++ php-src/ext/mysql/tests/mysql_pconn_max_links.phpt  Wed Oct 10 10:55:52 2007
@@ -0,0 +1,169 @@
+--TEST--
+Persistent connections and mysql.max_persistent
+--SKIPIF--
+
+--INI--
+mysql.max_links=2
+mysql.max_persistent=1
+mysql.allow_persistent=1
+--FILE--
+ 
enabled'), 500);
+   if (!preg_match('@Active Persistent Links\s+=>\s+(\d+)@ismU', $phpinfo, 
$matches))
+   printf("[003] Cannot get # active persistent links from 
phpinfo()");
+   $num_plinks = $matches[1];
+
+

[PHP-CVS] cvs: php-src /ext/mysqli/tests bug42378.phpt mysqli_real_connect_pconn.phpt

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 10:54:03 2007 UTC

  Modified files:  
/php-src/ext/mysqli/tests   bug42378.phpt 
mysqli_real_connect_pconn.phpt 
  Log:
  Should be the last commit for HEAD. Now HEAD and 5_3 should have the latest
  set of ext/mysqli tests. On Linux 32bit we've about 10 tests failing. 
  Before the commit we had about 20 tests failing with HEAD.
  
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug42378.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysqli/tests/bug42378.phpt
diff -u /dev/null php-src/ext/mysqli/tests/bug42378.phpt:1.2
--- /dev/null   Wed Oct 10 10:54:03 2007
+++ php-src/ext/mysqli/tests/bug42378.phpt  Wed Oct 10 10:54:02 2007
@@ -0,0 +1,193 @@
+--TEST--
+SELECT column, FORMAT(...) AS _format
+--SKIPIF--
+
+--INI--
+memory_limit=83886080
+--FILE--
+ $v)
+   $expected[$k] = number_format(round($v), 0, '.', ',');
+   test_format($link, 'FORMAT(col1, 0)', 'test', NULL, array(), 100);
+
+   $expected = create_table($link, 'FLOAT', -1, 1, $engine, 110);
+   foreach ($expected as $k => $v)
+   $expected[$k] = number_format(round($v), 0, '.', ',');
+   test_format($link, 'id AS order_by_col, FORMAT(col1, 0)', 'test', 'id', 
$expected, 120);
+
+   $expected = create_table($link, 'FLOAT UNSIGNED', 0, 1, $engine, 
130);
+   foreach ($expected as $k => $v)
+   $expected[$k] = number_format(round($v), 0, '.', ',');
+   test_format($link, 'id AS order_by_col, FORMAT(col1, 0)', 'test', 'id', 
$expected, 140);
+
+   $expected = create_table($link, 'DECIMAL(5,0)', -1000, 1000, $engine, 
150);
+   foreach ($expected as $k => $v)
+   $expected[$k] = number_format(round($v), 0, '.', ',');
+   test_format($link, 'id AS order_by_col, FORMAT(col1, 0)', 'test', 'id', 
$expected, 160);
+
+   mysqli_close($link);
+   print "done!";
+?>
+--EXPECTF--
+FLOAT
+FORMAT(col1, 0)
+FLOAT
+id AS order_by_col, FORMAT(col1, 0)
+FLOAT UNSIGNED
+id AS order_by_col, FORMAT(col1, 0)
+DECIMAL(5,0)
+id AS order_by_col, FORMAT(col1, 0)
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_real_connect_pconn.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_real_connect_pconn.phpt
diff -u /dev/null php-src/ext/mysqli/tests/mysqli_real_connect_pconn.phpt:1.2
--- /dev/null   Wed Oct 10 10:54:03 2007
+++ php-src/ext/mysqli/tests/mysqli_real_connect_pconn.phpt Wed Oct 10 
10:54:02 2007
@@ -0,0 +1,152 @@
+--TEST--
+mysqli_real_connect() - persistent connections
+--SKIPIF--
+
+--INI--
+mysqli.allow_persistent=1
+mysqli.max_persistent=10
+--FILE--
+num_rows);
+   mysqli_next_result($link);
+   $res = mysqli_store_result($link);
+   var_dump($res->num_rows);
+   }
+
+
+   mysqli_close($link);
+   if (!$link = mysqli_init())
+   printf("[018] mysqli_init() failed\n");
+
+   if (ini_get('open_basedir')) {
+   // CLIENT_LOCAL_FILES should be blocked - but how to test it ?!
+
+   if (!mysqli_real_connect($link, $host, $user, $passwd, $db, 
$port, $socket, 128))
+   printf("[019] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));
+
+   $filename = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 
'mysqli_real_connect_phpt';
+   if (!$fp = fopen($filename, 'w'))
+   printf("[020] Cannot open temporary file %s\n", 
$filename);
+
+   fwrite($fp, '100;z');
+   fclose($fp);
+
+   // how do we test if gets forbidden because of a missing right 
or the flag, this test is partly bogus ?
+   if (mysqli_query($link, "LOAD DATA LOCAL INFILE '$filename' 
INTO TABLE test FIELDS TERMINATED BY ';'"))
+   printf("[021] LOAD DATA INFILE should have been 
forbidden!\n");
+
+   unlink($filename);
+   }
+
+   mysqli_close($link);
+
+   if ($IS_MYSQLND) {
+   ini_set('mysqli.default_host', 'p:' . $host);
+   $link = mysqli_init();
+   if ([EMAIL PROTECTED]($link)) {
+   printf("[022] Usage of mysqli.default_host=p:%s 
(persistent) failed\n", $host) ;
+   } else {
+   if (!$res = mysqli_query($link, "SELECT 
'mysqli.default_host (persistent)' AS 'testing'"))
+   printf("[023] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));
+   $tmp = mysqli_fetch_assoc($res);
+   if ($tmp['testing'] !== 'mysqli.default_host 
(persistent)') {
+   printf("[024] Result looks strange - check 
manually, [%d] %s\n",
+   mysqli_errno($link), 
mysqli_error($link));
+   var_dump($tmp);
+   }
+   mysqli_free_resu

[PHP-CVS] cvs: php-src /ext/mysqli/tests mysqli_constants.phpt mysqli_get_connection_stats.phpt mysqli_options.phpt mysqli_phpinfo.phpt mysqli_real_connect.phpt mysqli_report.phpt mysqli_set_charset.p

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 10:51:34 2007 UTC

  Modified files:  
/php-src/ext/mysqli/tests   mysqli_set_local_infile_default.phpt 

mysqli_set_local_infile_handler_bad_character.phpt 

mysqli_set_local_infile_handler_buffer_overflow.phpt 
mysqli_set_local_infile_handler_closefile.phpt 
mysqli_set_local_infile_handler_close_link.phpt 
mysqli_set_local_infile_handler_kill_link.phpt 

mysqli_set_local_infile_handler_negative_len.phpt 

mysqli_set_local_infile_handler_nested_call.phpt 
mysqli_set_local_infile_handler_new_query.phpt 
mysqli_set_local_infile_handler_nofileop.phpt 
mysqli_set_local_infile_handler.phpt 

mysqli_set_local_infile_handler_replace_buffer.phpt 
mysqli_set_local_infile_handler_short_len.phpt 
mysqli_set_local_infile_handler_unregister.phpt 
mysqli_constants.phpt 
mysqli_get_connection_stats.phpt 
mysqli_options.phpt mysqli_phpinfo.phpt 
mysqli_real_connect.phpt 
mysqli_report.phpt 
mysqli_set_charset.phpt 
mysqli_stmt_attr_set.phpt 
mysqli_stmt_bind_param.phpt 
mysqli_stmt_bind_result_bit.phpt 
mysqli_stmt_bind_result.phpt 
mysqli_stmt_get_warnings.phpt 
mysqli_stmt_init.phpt 
mysqli_stmt_send_long_data.phpt 
  Log:
  More changes = synching HEAD with 5_3
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_default.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_default.phpt
diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_default.phpt:1.2 
php-src/ext/mysqli/tests/mysqli_set_local_infile_default.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_set_local_infile_default.phpt:1.2   Thu Aug 
 9 10:01:20 2007
+++ php-src/ext/mysqli/tests/mysqli_set_local_infile_default.phpt   Wed Oct 
10 10:51:34 2007
@@ -1,18 +1,18 @@
 --TEST--
 mysqli_set_local_infile_default()
 --SKIPIF--
-
+--INI--
+mysqli.allow_local_infile=1
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt?r1=1.2&r2=1.3&diff_format=u
Index: 
php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt
diff -u 
php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt:1.2 
php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt:1.3
--- 
php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt:1.2 
Thu Aug  9 10:01:20 2007
+++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt 
Wed Oct 10 10:51:34 2007
@@ -1,9 +1,9 @@
 --TEST--
 mysqli_set_local_infile_handler() - random ASCII character including \0
 --SKIPIF--
-
+--INI--
+mysqli.allow_local_infile=1
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt?r1=1.2&r2=1.3&diff_format=u
Index: 
php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt
diff -u 
php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt:1.2
 
php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt:1.3
--- 
php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt:1.2
   Thu Aug  9 10:01:20 2007
+++ 
php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt   
Wed Oct 10 10:51:34 2007
@@ -1,18 +1,36 @@
 --TEST--
 mysqli_set_local_infile_handler() - buffer overflow
 --SKIPIF--
-
+--INI--
+mysqli.allow_local_infile=1
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt
diff -u 
php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt:1.2 
php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt:1.2 
Thu Aug  9 10:01:20 2007
+++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt 
Wed Oct 10 10:51:34 2007
@@ -1,9 +1,9 @@
 --TEST--
 mysqli_set_local_infile_handler() - do not use the file pointer
 --SKIPIF--
-
+--INI--
+mysqli.allow_local_infile=1
 --FILE--
 http://cvs.php.net/v

[PHP-CVS] cvs: php-src /ext/mysqli/tests bug29311.phpt bug33263.phpt mysqli_affected_rows_oo.phpt mysqli_autocommit.phpt mysqli_autocommit_oo.phpt mysqli_class_mysqli_interface.phpt mysqli_class_mysql

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 10:49:00 2007 UTC

  Modified files:  
/php-src/ext/mysqli/tests   bug29311.phpt bug33263.phpt 
mysqli_affected_rows_oo.phpt 
mysqli_autocommit_oo.phpt 
mysqli_autocommit.phpt 
mysqli_class_mysqli_interface.phpt 
mysqli_class_mysqli_reflection.phpt 
mysqli_connect.phpt 
mysqli_fetch_all_oo.phpt 
mysqli_fetch_all.phpt 
mysqli_fetch_assoc.phpt 
mysqli_fetch_object.phpt 
  Log:
  Commiting changes into HEAD = synching with 5_3
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug29311.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/bug29311.phpt
diff -u php-src/ext/mysqli/tests/bug29311.phpt:1.4 
php-src/ext/mysqli/tests/bug29311.phpt:1.5
--- php-src/ext/mysqli/tests/bug29311.phpt:1.4  Thu Aug  9 09:43:28 2007
+++ php-src/ext/mysqli/tests/bug29311.phpt  Wed Oct 10 10:49:00 2007
@@ -1,14 +1,14 @@
 --TEST--
 constructor test
 --SKIPIF--
-
 --FILE--
 connect($host, $user, $passwd, $db, $port, 
$socket);
@@ -28,24 +28,24 @@
 
/* class 3 has no constructor */
class mysql3 extends mysqli {
-   
+
}
 
-   $foo[0] = new mysql1(); 
-   $foo[1] = new mysql2(); 
+   $foo[0] = new mysql1();
+   $foo[1] = new mysql2();
$foo[2] = new mysql3($host, $user, $passwd, $db, $port, $socket);
 
 
for ($i=0; $i < 3; $i++) {
if (($result = $foo[$i]->query("SELECT DATABASE()"))) {
$row = $result->fetch_row();
-   printf("%d: %s\n", $i, $row[0]);
+   if ($row[0] != $db)
+   printf("%d: %s\n", $i, $row[0]);
$result->close();
}
$foo[$i]->close();
}
+   print "done!";
 ?>
 --EXPECTF--
-0: test
-1: test
-2: test
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug33263.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqli/tests/bug33263.phpt
diff -u php-src/ext/mysqli/tests/bug33263.phpt:1.5 
php-src/ext/mysqli/tests/bug33263.phpt:1.6
--- php-src/ext/mysqli/tests/bug33263.phpt:1.5  Thu Aug  9 09:43:28 2007
+++ php-src/ext/mysqli/tests/bug33263.phpt  Wed Oct 10 10:49:00 2007
@@ -1,8 +1,8 @@
 --TEST--
-Bug #33263 (mysqli_real_connect in __construct) 
+Bug #33263 (mysqli_real_connect in __construct)
 --SKIPIF--
-
@@ -23,13 +23,16 @@
 
$stmt = $mysql->prepare("SELECT DATABASE()");
$stmt->execute();
-   $stmt->bind_result($db);
+   $stmt->bind_result($database);
$stmt->fetch();
$stmt->close();
 
-   var_dump($db);
+   if ($database != $db)
+   printf("[001] Expecting '%s' got %s/'%s'.\n",
+   gettype($database), $database);
 
$mysql->close();
+   print "done!";
 ?>
 --EXPECTF--
-%s(4) "test"
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_affected_rows_oo.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_affected_rows_oo.phpt
diff -u php-src/ext/mysqli/tests/mysqli_affected_rows_oo.phpt:1.2 
php-src/ext/mysqli/tests/mysqli_affected_rows_oo.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_affected_rows_oo.phpt:1.2   Thu Aug  9 
10:01:19 2007
+++ php-src/ext/mysqli/tests/mysqli_affected_rows_oo.phpt   Wed Oct 10 
10:49:00 2007
@@ -1,7 +1,7 @@
 --TEST--
 mysqli->affected_rows
 --SKIPIF--
-affected_rows))
+   printf("[000a] Expecting NULL, got %s/%s\n", gettype($tmp), 
$tmp);
+
if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) {
printf("[001] Cannot connect to the server using host=%s, 
user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
$host, $user, $db, $port, $socket);
}
 
if (0 !== ($tmp = $mysqli->affected_rows))
-   printf("[002] Expecting int/0, got %s/%s\n", gettype($tmp), 
$tmp);
+   printf("[002] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
 
if (!$mysqli->query('DROP TABLE IF EXISTS test'))
printf("[003] [%d] %s\n", $mysqli->errno, $mysqli->error);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_autocommit_oo.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_autocommit_oo.phpt
diff -u php-src/ext/mysqli/tests/mysqli_autocommit_oo.phpt:1.3 
php-src/ext/mysqli/tests/mysqli_autocommit_oo.phpt:1.4
--- php-src/ext/mysqli/tests/mysqli_autocommit_oo.phpt:1.3  Thu Aug  9 
10:01:19 2007
+++ php-src/ext/mysqli/tests/mysqli_autocommit_oo.phpt  Wed Oct 10 10:49:00 2007
@@ -2,9 +2,10 @@
 mysqli->autocommit()
 --SKIPIF--
 http://c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests mysqli_thread_id.phpt mysqli_thread_safe.phpt mysqli_unclonable.phpt mysqli_use_result.phpt mysqli_warning_count.phpt mysqli_warning_unclonable.phpt

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 10:20:11 2007 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   mysqli_thread_id.phpt 
mysqli_thread_safe.phpt 
mysqli_unclonable.phpt 
mysqli_use_result.phpt 
mysqli_warning_count.phpt 
mysqli_warning_unclonable.phpt 
  Log:
  Last bunch of new tests.
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_thread_id.phpt?view=markup&rev=1.1
Index: php-src/ext/mysqli/tests/mysqli_thread_id.phpt
+++ php-src/ext/mysqli/tests/mysqli_thread_id.phpt
--TEST--
mysqli_thread_id()
--SKIPIF--


--FILE--

--EXPECTF--
Warning: mysqli_thread_id(): Couldn't fetch mysqli in %s on line %d
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_thread_safe.phpt?view=markup&rev=1.1
Index: php-src/ext/mysqli/tests/mysqli_thread_safe.phpt
+++ php-src/ext/mysqli/tests/mysqli_thread_safe.phpt
--TEST--
mysqli_thread_safe()
--SKIPIF--


--FILE--

--EXPECTF--
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_unclonable.phpt?view=markup&rev=1.1
Index: php-src/ext/mysqli/tests/mysqli_unclonable.phpt
+++ php-src/ext/mysqli/tests/mysqli_unclonable.phpt
--TEST--
Trying to clone mysqli object
--SKIPIF--


--FILE--

--EXPECTF--
Fatal error: Trying to clone an uncloneable object of class mysqli in %s on 
line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_use_result.phpt?view=markup&rev=1.1
Index: php-src/ext/mysqli/tests/mysqli_use_result.phpt
+++ php-src/ext/mysqli/tests/mysqli_use_result.phpt
--TEST--
mysqli_use_result()
--SKIPIF--


--FILE--

--EXPECTF--
Warning: mysqli_data_seek(): Function cannot be used with MYSQL_USE_RESULT in 
%s on line %d

Warning: mysqli_use_result(): Couldn't fetch mysqli in %s on line %d
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_warning_count.phpt?view=markup&rev=1.1
Index: php-src/ext/mysqli/tests/mysqli_warning_count.phpt
+++ php-src/ext/mysqli/tests/mysqli_warning_count.phpt
--TEST--
mysqli_warning_count()
--SKIPIF--


--FILE--

--EXPECTF--
Warning: mysqli_warning_count(): Couldn't fetch mysqli in %s on line %d
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_warning_unclonable.phpt?view=markup&rev=1.1
Index: php-src/ext/mysqli/tests/mysqli_warning_unclonable.phpt
+++ php-src/ext/mysqli/tests/mysqli_warning_unclonable.phpt
--TEST--
Trying to clone mysqli_warning object
--SKIPIF--

--FILE--

--EXPECTF--
Fatal error: Trying to clone an uncloneable object of class mysqli_warning in 
%s on line %d

-- 
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/tests mysqli_master_query.phpt mysqli_max_links.phpt mysqli_more_results.phpt mysqli_multi_query.phpt mysqli_mysqli_result_invalid_mode.phpt mysqli_next_res

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 10:17:38 2007 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   mysqli_master_query.phpt 
mysqli_max_links.phpt 
mysqli_more_results.phpt 
mysqli_multi_query.phpt 
mysqli_mysqli_result_invalid_mode.phpt 
mysqli_next_result.phpt 
mysqli_no_reconnect.phpt 
mysqli_num_fields.phpt 
mysqli_num_rows.phpt 
mysqli_options_init_command.phpt 
mysqli_options_openbasedir.phpt 
mysqli_options.phpt 
mysqli_pconn_disabled.phpt 
mysqli_pconnect.phpt 
mysqli_pconn_kill.phpt 
mysqli_pconn_limits.phpt 
mysqli_pconn_max_links.phpt 
mysqli_pconn_reuse.phpt 
mysqli_phpinfo.phpt mysqli_ping.phpt 
mysqli_prepare_no_object.phpt 
mysqli_prepare.phpt 
  Log:
  Adding new tests: mysqli_m*.phpt mysqli_n*.phpt mysqli_o*.phpt mysqli_p*.phpt
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_master_query.phpt?view=markup&rev=1.1
Index: php-src/ext/mysqli/tests/mysqli_master_query.phpt
+++ php-src/ext/mysqli/tests/mysqli_master_query.phpt
--TEST--
mysqli_master_query()
--SKIPIF--

--FILE--

--EXPECTF--
Warning: mysqli_master_query(): Couldn't fetch mysqli in %s on line %d
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_max_links.phpt?view=markup&rev=1.1
Index: php-src/ext/mysqli/tests/mysqli_max_links.phpt
+++ php-src/ext/mysqli/tests/mysqli_max_links.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_more_results.phpt?view=markup&rev=1.1
Index: php-src/ext/mysqli/tests/mysqli_more_results.phpt
+++ php-src/ext/mysqli/tests/mysqli_more_results.phpt
--TEST--
mysqli_more_results()
--SKIPIF--

--FILE--
 41000 && !($ret = 
mysqli_more_results($link)))
printf("[007] Expecting boolean/true, got %s/%s\n", 
gettype($ret), $ret);
do {
$res = mysqli_store_result($link);
mysqli_free_result($res);
if (mysqli_more_results($link))
printf("%d\n", $i++);
} while (mysqli_next_result($link));

if ($strict_on) {
$tmp = ob_get_contents();
ob_end_clean();
if (!preg_match('@Strict Standards: mysqli_next_result\(\): 
There is no next result [EMAIL PROTECTED]', $tmp)) {
printf("[008] Strict Standards warning missing\n");
} else {
$tmp = trim(preg_replace('@Strict Standards: 
mysqli_next_result\(\).*on line [EMAIL PROTECTED]', '', $tmp));
}
print trim($tmp) . "\n";
}

if (!mysqli_multi_query($link, "SELECT 1 AS a; SELECT 1 AS a, 2 AS b; 
SELECT id FROM test ORDER BY id LIMIT 3"))
printf("[009] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));
print "[010]\n";
$i = 1;
if (mysqli_get_server_version($link) > 41000 && !($ret = 
mysqli_more_results($link)))
printf("[011] Expecting boolean/true, got %s/%s\n", 
gettype($ret), $ret);

if ($strict_on)
ob_start();
do {
$res = mysqli_use_result($link);
// NOTE: if you use mysqli_use_result() with 
mysqli_more_results() or any other info function,
// you must fetch all rows before you can loop to the next 
result set!
// See also the MySQL Reference Manual: mysql_use_result()
while ($row = mysqli_fetch_array($res))
;
mysqli_free_result($res);
if (mysqli_more_results($link))
printf("%d\n", $i++);
} while (mysqli_next_result($link));

if ($strict_on) {
$tmp = ob_get_contents();
ob_end_clean();
if (!preg_match('@Strict Standards: mysqli_next_result\(\): 
There is no next result [EMAIL PROTECTED]', $tmp)) {
printf("[008] Strict Standards warning missing\n");
} else {
$tmp = trim(preg_replace('@Strict Standards: 
mysqli_next_result\(\).*on line [EMAIL PROTECTED]', '', $tmp));
}
print trim($tmp) . "\n";
}
mysqli_close($link);

var_dump(mysqli_more_results($link));

print "done!";
?>
--EXPECTF--
[004]
bool(false)
[006]
1
2
[010]
1
2

Warning: mysqli_more_results(): Couldn't fetc

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests bug42378.phpt

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 10:11:27 2007 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   bug42378.phpt 
  Log:
  Test code for bug #42378
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug42378.phpt?view=markup&rev=1.1
Index: php-src/ext/mysqli/tests/bug42378.phpt
+++ php-src/ext/mysqli/tests/bug42378.phpt

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests bug28817.phpt bug29311.phpt bug30967.phpt bug31141.phpt bug31668.phpt bug32405.phpt bug33090.phpt bug33263.phpt bug33491.phpt bug34785.phpt bug34810.p

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 10:10:59 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   bug28817.phpt bug29311.phpt bug30967.phpt 
bug31141.phpt bug31668.phpt bug32405.phpt 
bug33090.phpt bug33263.phpt bug33491.phpt 
bug34785.phpt bug34810.phpt bug35103.phpt 
bug35517.phpt bug35759.phpt bug36420.phpt 
bug36745.phpt bug36802.phpt bug36949.phpt 
bug37090.phpt bug38710.phpt 
  Log:
  Further changes to regression/bug-verification tests.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug28817.phpt?r1=1.2.4.1&r2=1.2.4.1.2.1&diff_format=u
Index: php-src/ext/mysqli/tests/bug28817.phpt
diff -u php-src/ext/mysqli/tests/bug28817.phpt:1.2.4.1 
php-src/ext/mysqli/tests/bug28817.phpt:1.2.4.1.2.1
--- php-src/ext/mysqli/tests/bug28817.phpt:1.2.4.1  Mon May  7 18:02:59 2007
+++ php-src/ext/mysqli/tests/bug28817.phpt  Wed Oct 10 10:10:59 2007
@@ -1,7 +1,10 @@
 --TEST--
 Bug #28817 (problems with properties declared in the class extending MySQLi)
 --SKIPIF--
-
+
 --FILE--
 p_test);
@var_dump($mysql->errno);
 
-   $mysql->connect($host, $user, $passwd);
+   $mysql->connect($host, $user, $passwd, $db, $port, $socket);
$mysql->select_db("nonexistingdb");
 
var_dump($mysql->errno > 0);
 
-   $mysql->close();
+   $mysql->close();
 ?>
 --EXPECTF--
 array(2) {
   [0]=>
-  string(3) "foo"
+  %s(3) "foo"
   [1]=>
-  string(3) "bar"
+  %s(3) "bar"
 }
 NULL
-bool(true)
+bool(true)
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug29311.phpt?r1=1.3&r2=1.3.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/bug29311.phpt
diff -u php-src/ext/mysqli/tests/bug29311.phpt:1.3 
php-src/ext/mysqli/tests/bug29311.phpt:1.3.6.1
--- php-src/ext/mysqli/tests/bug29311.phpt:1.3  Sat Dec  4 08:50:33 2004
+++ php-src/ext/mysqli/tests/bug29311.phpt  Wed Oct 10 10:10:59 2007
@@ -1,48 +1,51 @@
 --TEST--
 constructor test
 --SKIPIF--
-
+
 --FILE--
 connect($host, $user, $passwd, "test");
+   global $host, $user, $passwd, $db, $port, $socket;
+   $this->connect($host, $user, $passwd, $db, $port, 
$socket);
}
}
 
/* class 3 has no constructor */
class mysql3 extends mysqli {
-   
+
}
 
-   $foo[0] = new mysql1(); 
-   $foo[1] = new mysql2(); 
-   $foo[2] = new mysql3($host, $user, $passwd, "test");
+   $foo[0] = new mysql1();
+   $foo[1] = new mysql2();
+   $foo[2] = new mysql3($host, $user, $passwd, $db, $port, $socket);
 
 
for ($i=0; $i < 3; $i++) {
if (($result = $foo[$i]->query("SELECT DATABASE()"))) {
$row = $result->fetch_row();
-   printf("%d: %s\n", $i, $row[0]);
+   if ($row[0] != $db)
+   printf("%d: %s\n", $i, $row[0]);
$result->close();
}
$foo[$i]->close();
}
+   print "done!";
 ?>
 --EXPECTF--
-0: test
-1: test
-2: test
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug30967.phpt?r1=1.4.4.1&r2=1.4.4.1.2.1&diff_format=u
Index: php-src/ext/mysqli/tests/bug30967.phpt
diff -u php-src/ext/mysqli/tests/bug30967.phpt:1.4.4.1 
php-src/ext/mysqli/tests/bug30967.phpt:1.4.4.1.2.1
--- php-src/ext/mysqli/tests/bug30967.phpt:1.4.4.1  Mon May  7 18:03:00 2007
+++ php-src/ext/mysqli/tests/bug30967.phpt  Wed Oct 10 10:10:59 2007
@@ -1,7 +1,10 @@
 --TEST--
 Bug #30967 (problems with properties declared in the class extending the class 
extending MySQLi)
 --SKIPIF--
-
+
 --FILE--
 query("THIS DOES NOT WORK");
printf("%d\n", $mysql->errno);
 
-   $mysql->close();
+   $mysql->close();
 ?>
 --EXPECTF--
 1064
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug31141.phpt?r1=1.1.6.1&r2=1.1.6.1.2.1&diff_format=u
Index: php-src/ext/mysqli/tests/bug31141.phpt
diff -u php-src/ext/mysqli/tests/bug31141.phpt:1.1.6.1 
php-src/ext/mysqli/tests/bug31141.phpt:1.1.6.1.2.1
--- php-src/ext/mysqli/tests/bug31141.phpt:1.1.6.1  Mon May  7 18:03:00 2007
+++ php-src/ext/mysqli/tests/bug31141.phpt  Wed Oct 10 10:10:59 2007
@@ -22,7 +22,7 @@
 --EXPECTF--
 array(2) {
   [0]=>
-  string(3) "foo"
+  %s(3) "foo"
   [1]=>
-  string(3) "bar"
+  %s(3) "bar"
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug31668.phpt?r1=1.2.4.1&r2=1.2.4.1.2.1&diff_format=u
Index: php-src/ext/mysqli/tests/bug31668.phpt
diff -u php-src/ext/mysqli/tests/bug31668.phpt:1.2.4.1 
php-src/ext/mysqli/tests/bug31668.phpt:1.2.4.1.2.1
--- php-src/ext/mysqli/tests/bug31668.phpt:1.2.4.1  Mon May  7 18:03:00 2007
+++ php-src/ext/mysqli/tests/bug31668.phpt  Wed Oct 10 10:10:59 2007
@@ -1

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests 060.phpt 061.phpt 062.phpt 063.phpt 064.phpt 065.phpt 066.phpt 067.phpt 068.phpt 069.phpt 070.phpt 071.phpt 072.phpt 073.phpt 074.phpt

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 10:10:14 2007 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   069.phpt 070.phpt 074.phpt 

  Modified files:  
/php-src/ext/mysqli/tests   060.phpt 061.phpt 062.phpt 063.phpt 
064.phpt 065.phpt 066.phpt 067.phpt 
068.phpt 071.phpt 072.phpt 073.phpt 
  Log:
  Last set of changes to the classical 0*.phpt - 06*.phpt/07*.phpt
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/060.phpt?r1=1.3.2.1&r2=1.3.2.1.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/060.phpt
diff -u php-src/ext/mysqli/tests/060.phpt:1.3.2.1 
php-src/ext/mysqli/tests/060.phpt:1.3.2.1.4.1
--- php-src/ext/mysqli/tests/060.phpt:1.3.2.1   Sat Oct  8 15:08:07 2005
+++ php-src/ext/mysqli/tests/060.phpt   Wed Oct 10 10:10:14 2007
@@ -1,42 +1,45 @@
 --TEST--
 mysqli_fetch_object with classes
 --SKIPIF--
-
+
 --FILE--
 
 --EXPECTF--
@@ -58,3 +61,22 @@
   string(1) "0"
 }
 Done
+--UEXPECTF--
+test_class::__construct(1,2)
+object(test_class)#%d (7) {
+  [u"c1"]=>
+  unicode(1) "0"
+  [u"c2"]=>
+  unicode(5) "35999"
+  [u"c3"]=>
+  NULL
+  [u"c4"]=>
+  unicode(4) "-500"
+  [u"c5"]=>
+  unicode(6) "-32768"
+  [u"c6"]=>
+  unicode(1) "0"
+  [u"c7"]=>
+  unicode(1) "0"
+}
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/061.phpt?r1=1.5.4.1&r2=1.5.4.1.2.1&diff_format=u
Index: php-src/ext/mysqli/tests/061.phpt
diff -u php-src/ext/mysqli/tests/061.phpt:1.5.4.1 
php-src/ext/mysqli/tests/061.phpt:1.5.4.1.2.1
--- php-src/ext/mysqli/tests/061.phpt:1.5.4.1   Tue Dec 12 08:09:40 2006
+++ php-src/ext/mysqli/tests/061.phpt   Wed Oct 10 10:10:14 2007
@@ -1,8 +1,10 @@
 --TEST--
 local infile handler
 --SKIPIF--
-
-
+
 --FILE--
 
 --EXPECT--
 foo-bar
+string-string
+rab-oof
+string-string
+done!
+--UEXPECTF--
+foo-bar
+unicode-unicode
 rab-oof
+unicode-unicode
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/062.phpt?r1=1.1&r2=1.1.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/062.phpt
diff -u php-src/ext/mysqli/tests/062.phpt:1.1 
php-src/ext/mysqli/tests/062.phpt:1.1.6.1
--- php-src/ext/mysqli/tests/062.phpt:1.1   Sun Dec 26 13:16:40 2004
+++ php-src/ext/mysqli/tests/062.phpt   Wed Oct 10 10:10:14 2007
@@ -1,12 +1,15 @@
 --TEST--
-resultset constructor 
+resultset constructor
 --SKIPIF--
-
+
 --FILE--
 real_query("SELECT 'foo' FROM DUAL");
 
@@ -17,9 +20,17 @@
$mysql->close();
 
var_dump($row);
+   print "done!";
 ?>
---EXPECT--
+--EXPECTF--
 array(1) {
   [0]=>
   string(3) "foo"
 }
+done!
+--UEXPECTF--
+array(1) {
+  [0]=>
+  unicode(3) "foo"
+}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/063.phpt?r1=1.1&r2=1.1.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/063.phpt
diff -u php-src/ext/mysqli/tests/063.phpt:1.1 
php-src/ext/mysqli/tests/063.phpt:1.1.6.1
--- php-src/ext/mysqli/tests/063.phpt:1.1   Sun Dec 26 13:16:40 2004
+++ php-src/ext/mysqli/tests/063.phpt   Wed Oct 10 10:10:14 2007
@@ -1,12 +1,15 @@
 --TEST--
 resultset constructor 
 --SKIPIF--
-
+
 --FILE--
 execute();
@@ -19,3 +22,5 @@
 ?>
 --EXPECT--
 string(3) "foo"
+--UEXPECT--
+unicode(3) "foo"
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/064.phpt?r1=1.1&r2=1.1.8.1&diff_format=u
Index: php-src/ext/mysqli/tests/064.phpt
diff -u php-src/ext/mysqli/tests/064.phpt:1.1 
php-src/ext/mysqli/tests/064.phpt:1.1.8.1
--- php-src/ext/mysqli/tests/064.phpt:1.1   Thu May  5 13:02:32 2005
+++ php-src/ext/mysqli/tests/064.phpt   Wed Oct 10 10:10:14 2007
@@ -1,12 +1,15 @@
 --TEST--
 NULL binding 
 --SKIPIF--
-
+
 --FILE--
 execute();
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/065.phpt?r1=1.3.2.1.2.1&r2=1.3.2.1.2.1.2.1&diff_format=u
Index: php-src/ext/mysqli/tests/065.phpt
diff -u php-src/ext/mysqli/tests/065.phpt:1.3.2.1.2.1 
php-src/ext/mysqli/tests/065.phpt:1.3.2.1.2.1.2.1
--- php-src/ext/mysqli/tests/065.phpt:1.3.2.1.2.1   Tue Dec 12 08:09:40 2006
+++ php-src/ext/mysqli/tests/065.phpt   Wed Oct 10 10:10:14 2007
@@ -1,44 +1,55 @@
 --TEST--
-set character set 
+set character set
 --SKIPIF--
-
 --FILE--
 set_charset("latin1")) {
/* 5C should be escaped */
-   $len[0] = strlen($mysql->real_escape_string($esc_str));
-   $charset[0] = $mysql->client_encoding();
-   }
+   if (3 !== ($tmp = strlen($mysql->real_escape_string($esc_str
+   printf("[003] Expecting 3/int got %s/%s\n", 
gettype($tmp), $tmp);
 
-   if ($mysql->set_charset("gbk")) {
-   /* nothing should be escaped, it's a valid gbk character */
-   $len[1] = strlen($mysql->real_escape_string($esc_str));
-   $charset[1] = $mysql->client_encoding();
+   if ('latin1' !== ($tmp = $mysql->client_encoding()))
+   printf("[004] Expecting latin1/string got %s/%s\n", 
gettype($tmp), $tmp);
}
 
+   if ($

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests 040.phpt 041.phpt 042.phpt 043.phpt 044.phpt 045.phpt 046.phpt 047.phpt 048.phpt 049.phpt 050.phpt 051.phpt 052.phpt 053.phpt 054.phpt 055.phpt 056.ph

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 10:08:29 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   040.phpt 041.phpt 042.phpt 043.phpt 
044.phpt 045.phpt 046.phpt 047.phpt 
048.phpt 049.phpt 050.phpt 051.phpt 
052.phpt 053.phpt 054.phpt 055.phpt 
056.phpt 057.phpt 058.phpt 059.phpt 
  Log:
  Changes to 04*.phpt, 05*.phpt.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/040.phpt?r1=1.3&r2=1.3.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/040.phpt
diff -u php-src/ext/mysqli/tests/040.phpt:1.3 
php-src/ext/mysqli/tests/040.phpt:1.3.6.1
--- php-src/ext/mysqli/tests/040.phpt:1.3   Sat Dec  4 08:50:33 2004
+++ php-src/ext/mysqli/tests/040.phpt   Wed Oct 10 10:08:29 2007
@@ -1,16 +1,19 @@
 --TEST--
 function test: mysqli_num_rows()
 --SKIPIF--
-
+
 --FILE--
 
 --EXPECT--
 int(1)
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/041.phpt?r1=1.5&r2=1.5.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/041.phpt
diff -u php-src/ext/mysqli/tests/041.phpt:1.5 
php-src/ext/mysqli/tests/041.phpt:1.5.6.1
--- php-src/ext/mysqli/tests/041.phpt:1.5   Fri Jul  8 08:53:25 2005
+++ php-src/ext/mysqli/tests/041.phpt   Wed Oct 10 10:08:29 2007
@@ -1,15 +1,18 @@
 --TEST--
 function test: mysqli_warning_count()
 --SKIPIF--
-
+
 --FILE--
 
 --EXPECT--
 int(1)
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/042.phpt?r1=1.7.2.1&r2=1.7.2.1.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/042.phpt
diff -u php-src/ext/mysqli/tests/042.phpt:1.7.2.1 
php-src/ext/mysqli/tests/042.phpt:1.7.2.1.4.1
--- php-src/ext/mysqli/tests/042.phpt:1.7.2.1   Sat Oct  8 15:08:07 2005
+++ php-src/ext/mysqli/tests/042.phpt   Wed Oct 10 10:08:29 2007
@@ -1,25 +1,28 @@
 --TEST--
 mysqli_fetch_object
 --SKIPIF--
-
+
 --FILE--
 
 --EXPECTF--
 object(stdClass)#%d (7) {
@@ -60,3 +64,22 @@
   ["c7"]=>
   string(1) "0"
 }
+done!
+--UEXPECTF--
+object(stdClass)#%d (7) {
+  [u"c1"]=>
+  unicode(1) "0"
+  [u"c2"]=>
+  unicode(5) "35999"
+  [u"c3"]=>
+  NULL
+  [u"c4"]=>
+  unicode(4) "-500"
+  [u"c5"]=>
+  unicode(6) "-32768"
+  [u"c6"]=>
+  unicode(1) "0"
+  [u"c7"]=>
+  unicode(1) "0"
+}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/043.phpt?r1=1.5&r2=1.5.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/043.phpt
diff -u php-src/ext/mysqli/tests/043.phpt:1.5 
php-src/ext/mysqli/tests/043.phpt:1.5.6.1
--- php-src/ext/mysqli/tests/043.phpt:1.5   Sat Dec  4 08:50:33 2004
+++ php-src/ext/mysqli/tests/043.phpt   Wed Oct 10 10:08:29 2007
@@ -1,18 +1,21 @@
 --TEST--
 mysqli_bind_param (UPDATE)
 --SKIPIF--
-
+
 --FILE--
 
---EXPECT--
+--EXPECTF--
 array(1) {
   [0]=>
   string(15) "Rasmus is No. 1"
 }
+done!
+--UEXPECF--
+array(1) {
+  [0]=>
+  unicode(15) "Rasmus is No. 1"
+}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/044.phpt?r1=1.3&r2=1.3.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/044.phpt
diff -u php-src/ext/mysqli/tests/044.phpt:1.3 
php-src/ext/mysqli/tests/044.phpt:1.3.6.1
--- php-src/ext/mysqli/tests/044.phpt:1.3   Sat Dec  4 08:50:33 2004
+++ php-src/ext/mysqli/tests/044.phpt   Wed Oct 10 10:08:29 2007
@@ -1,13 +1,16 @@
 --TEST--
 mysqli_get_server_version
 --SKIPIF--
-
+
 --FILE--
 
 --EXPECT--
 int(1)
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/045.phpt?r1=1.6.2.1&r2=1.6.2.1.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/045.phpt
diff -u php-src/ext/mysqli/tests/045.phpt:1.6.2.1 
php-src/ext/mysqli/tests/045.phpt:1.6.2.1.4.1
--- php-src/ext/mysqli/tests/045.phpt:1.6.2.1   Thu Mar 30 20:43:39 2006
+++ php-src/ext/mysqli/tests/045.phpt   Wed Oct 10 10:08:29 2007
@@ -1,14 +1,14 @@
 --TEST--
 mysqli_bind_result (SHOW)
 --SKIPIF--
-
---EXPECT--
+--EXPECTF--
 array(2) {
   [0]=>
   string(4) "port"
   [1]=>
-  string(4) "3306"
+  string(%d) "%s"
+}
+done!
+--UEXPECTF--
+array(2) {
+  [0]=>
+  unicode(4) "port"
+  [1]=>
+  unicode(%d) "%s"
 }
+done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/046.phpt?r1=1.5&r2=1.5.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/046.phpt
diff -u php-src/ext/mysqli/tests/046.phpt:1.5 
php-src/ext/mysqli/tests/046.phpt:1.5.6.1
--- php-src/ext/mysqli/tests/046.phpt:1.5   Sat Dec  4 08:50:33 2004
+++ php-src/ext/mysqli/tests/046.phpt   Wed Oct 10 10:08:29 2007
@@ -1,15 +1,18 @@
 --TEST--
 mysqli_stmt_affected_rows (delete)
 --SKIPIF--
-
+
 --FILE--
 
 --EXPECT--
 bool(true)
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/047.phpt?r1=1.8.4.1&r2=1.8.4.1.2.1&diff_format=u
Index: php-src/ext/mysqli/tests/047.phpt
diff -u php-src/ext/mysqli/tests/047.phpt:1.8.4.1 
php-src/ext/mysqli/tests/047.phpt:1.8.4.1.2.1
--- php-src/ext/mysqli/tests/047.phpt:1.8.4.1   Tue Jul 11 23:45:28 20

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests 020.phpt 021.phpt 022.phpt 023.phpt 024.phpt 025.phpt 026.phpt 027.phpt 028.phpt 029.phpt 030.phpt 031.phpt 032.phpt 033.phpt 034.phpt 035.phpt 036.ph

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 10:07:46 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   020.phpt 021.phpt 022.phpt 023.phpt 
024.phpt 025.phpt 026.phpt 027.phpt 
028.phpt 029.phpt 030.phpt 031.phpt 
032.phpt 033.phpt 034.phpt 035.phpt 
036.phpt 037.phpt 038.phpt 039.phpt 
  Log:
  Changes to 02*.phpt, 03*.phpt
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/020.phpt?r1=1.6.2.1&r2=1.6.2.1.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/020.phpt
diff -u php-src/ext/mysqli/tests/020.phpt:1.6.2.1 
php-src/ext/mysqli/tests/020.phpt:1.6.2.1.4.1
--- php-src/ext/mysqli/tests/020.phpt:1.6.2.1   Sat Oct  8 15:08:07 2005
+++ php-src/ext/mysqli/tests/020.phpt   Wed Oct 10 10:07:46 2007
@@ -1,44 +1,51 @@
 --TEST--
 mysqli bind_param/bind_result date
 --SKIPIF--
-
+
 --FILE--
 
---EXPECT--
+--EXPECTF--
 array(7) {
   [0]=>
-  string(10) "2002-01-02"
+  %s(10) "2002-01-02"
   [1]=>
-  string(8) "12:49:00"
+  %s(8) "12:49:00"
   [2]=>
-  string(19) "2002-01-02 17:46:59"
+  %s(19) "2002-01-02 17:46:59"
   [3]=>
   int(2010)
   [4]=>
-  string(19) "2010-07-10 00:00:00"
+  %s(19) "2010-07-10 00:00:00"
   [5]=>
-  string(19) "-00-00 00:00:00"
+  %s(19) "-00-00 00:00:00"
   [6]=>
-  string(19) "1999-12-29 00:00:00"
+  %s(19) "1999-12-29 00:00:00"
 }
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/021.phpt?r1=1.5&r2=1.5.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/021.phpt
diff -u php-src/ext/mysqli/tests/021.phpt:1.5 
php-src/ext/mysqli/tests/021.phpt:1.5.6.1
--- php-src/ext/mysqli/tests/021.phpt:1.5   Sat Dec  4 08:50:33 2004
+++ php-src/ext/mysqli/tests/021.phpt   Wed Oct 10 10:07:46 2007
@@ -1,18 +1,21 @@
 --TEST--
-mysqli bind_param+bind_result char/text 
+mysqli bind_param+bind_result char/text
 --SKIPIF--
-
+
 --FILE--
 
---EXPECT--
+--EXPECTF--
 array(2) {
   [0]=>
   string(10) "1234567890"
   [1]=>
-  string(14) "this is a test"
+  %s(14) "this is a test"
+}
+done!
+--UEXPECTF--
+array(2) {
+  [0]=>
+  unicode(10) "1234567890"
+  [1]=>
+  %s(14) "this is a test"
 }
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/022.phpt?r1=1.5&r2=1.5.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/022.phpt
diff -u php-src/ext/mysqli/tests/022.phpt:1.5 
php-src/ext/mysqli/tests/022.phpt:1.5.6.1
--- php-src/ext/mysqli/tests/022.phpt:1.5   Sat Dec  4 08:50:33 2004
+++ php-src/ext/mysqli/tests/022.phpt   Wed Oct 10 10:07:46 2007
@@ -1,18 +1,21 @@
 --TEST--
-mysqli bind_param/bind_result char/text long 
+mysqli bind_param/bind_result char/text long
 --SKIPIF--
-
+
 --FILE--
 
---EXPECT--
+--EXPECTF--
 array(2) {
   [0]=>
   string(10) "1234567890"
   [1]=>
-  string(13) "32K String ok"
+  %s(13) "32K String ok"
+}
+done!
+--UEXPECTF--
+array(2) {
+  [0]=>
+  unicode(10) "1234567890"
+  [1]=>
+  %s(13) "32K String ok"
 }
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/023.phpt?r1=1.5.2.1&r2=1.5.2.1.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/023.phpt
diff -u php-src/ext/mysqli/tests/023.phpt:1.5.2.1 
php-src/ext/mysqli/tests/023.phpt:1.5.2.1.4.1
--- php-src/ext/mysqli/tests/023.phpt:1.5.2.1   Sat Oct  8 15:08:07 2005
+++ php-src/ext/mysqli/tests/023.phpt   Wed Oct 10 10:07:46 2007
@@ -1,25 +1,28 @@
 --TEST--
 mysqli bind_param/bind_prepare fetch long values
 --SKIPIF--
-
+
 --FILE--
 
 --EXPECT--
 array(7) {
@@ -63,3 +68,4 @@
   [6]=>
   int(0)
 }
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/024.phpt?r1=1.5.2.1&r2=1.5.2.1.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/024.phpt
diff -u php-src/ext/mysqli/tests/024.phpt:1.5.2.1 
php-src/ext/mysqli/tests/024.phpt:1.5.2.1.4.1
--- php-src/ext/mysqli/tests/024.phpt:1.5.2.1   Sat Oct  8 15:08:07 2005
+++ php-src/ext/mysqli/tests/024.phpt   Wed Oct 10 10:07:46 2007
@@ -1,25 +1,28 @@
 --TEST--
 mysqli bind_param/bind_result short values
 --SKIPIF--
-
+
 --FILE--
 
 --EXPECT--
 array(7) {
@@ -64,3 +68,4 @@
   [6]=>
   int(0)
 }
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/025.phpt?r1=1.5.2.1&r2=1.5.2.1.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/025.phpt
diff -u php-src/ext/mysqli/tests/025.phpt:1.5.2.1 
php-src/ext/mysqli/tests/025.phpt:1.5.2.1.4.1
--- php-src/ext/mysqli/tests/025.phpt:1.5.2.1   Sat Oct  8 15:08:07 2005
+++ php-src/ext/mysqli/tests/025.phpt   Wed Oct 10 10:07:46 2007
@@ -1,25 +1,28 @@
 --TEST--
 mysqli bind_param/bind_result tinyint values
 --SKIPIF--
-
+
 --FILE--
 
 --EXPECT--
 array(7) {
@@ -68,3 +73,4 @@
   [6]=>
   int(0)
 }
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/026.phpt?r1=1.6.2.1&r2=1.6.2.1.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/026.phpt
diff -u php-src/ext/mysqli/tests/026.phpt:1.6.2.1

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 10:07:08 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   010.phpt 011.phpt 012.phpt 013.phpt 
014.phpt 015.phpt 016.phpt 017.phpt 
018.phpt 019.phpt 
  Log:
  Changes to all 01*.phpt tests
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/010.phpt?r1=1.5.2.1&r2=1.5.2.1.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/010.phpt
diff -u php-src/ext/mysqli/tests/010.phpt:1.5.2.1 
php-src/ext/mysqli/tests/010.phpt:1.5.2.1.4.1
--- php-src/ext/mysqli/tests/010.phpt:1.5.2.1   Sat Oct  8 15:08:07 2005
+++ php-src/ext/mysqli/tests/010.phpt   Wed Oct 10 10:07:08 2007
@@ -3,26 +3,32 @@
 --INI--
 precision=12
 --SKIPIF--
-
+
 --FILE--
 
 --EXPECT--
 array(7) {
@@ -57,3 +64,4 @@
   [6]=>
   float(88914608000)
 }
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/011.phpt?r1=1.5&r2=1.5.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/011.phpt
diff -u php-src/ext/mysqli/tests/011.phpt:1.5 
php-src/ext/mysqli/tests/011.phpt:1.5.6.1
--- php-src/ext/mysqli/tests/011.phpt:1.5   Sat Dec  4 08:50:33 2004
+++ php-src/ext/mysqli/tests/011.phpt   Wed Oct 10 10:07:08 2007
@@ -3,27 +3,34 @@
 --INI--
 precision=12
 --SKIPIF--
-
+
 --FILE--
 
---EXPECT--
+--EXPECTF--
 array(8) {
   [0]=>
   int(19)
@@ -55,3 +63,24 @@
   [7]=>
   string(11) "mysql rulez"
 }
+done!
+--UEXPECTF--
+array(8) {
+  [0]=>
+  int(19)
+  [1]=>
+  int(2999)
+  [2]=>
+  int(3999)
+  [3]=>
+  int(499)
+  [4]=>
+  float(2345.60009766)
+  [5]=>
+  float(5678.89563)
+  [6]=>
+  string(6) "foobar"
+  [7]=>
+  unicode(11) "mysql rulez"
+}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/012.phpt?r1=1.5&r2=1.5.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/012.phpt
diff -u php-src/ext/mysqli/tests/012.phpt:1.5 
php-src/ext/mysqli/tests/012.phpt:1.5.6.1
--- php-src/ext/mysqli/tests/012.phpt:1.5   Sat Dec  4 08:50:33 2004
+++ php-src/ext/mysqli/tests/012.phpt   Wed Oct 10 10:07:08 2007
@@ -3,27 +3,32 @@
 --INI--
 precision=12
 --SKIPIF--
-
+
 --FILE--
 
---EXPECT--
+--EXPECTF--
 array(8) {
   [0]=>
   int(120)
@@ -56,3 +62,24 @@
   [7]=>
   string(3) "6.7"
 }
+done!
+--UEXPECTF--
+array(8) {
+  [0]=>
+  int(120)
+  [1]=>
+  int(2999)
+  [2]=>
+  int(3999)
+  [3]=>
+  int(54)
+  [4]=>
+  float(2.5990463)
+  [5]=>
+  float(58.89)
+  [6]=>
+  string(3) "206"
+  [7]=>
+  unicode(3) "6.7"
+}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/013.phpt?r1=1.4.2.1.2.1&r2=1.4.2.1.2.1.2.1&diff_format=u
Index: php-src/ext/mysqli/tests/013.phpt
diff -u php-src/ext/mysqli/tests/013.phpt:1.4.2.1.2.1 
php-src/ext/mysqli/tests/013.phpt:1.4.2.1.2.1.2.1
--- php-src/ext/mysqli/tests/013.phpt:1.4.2.1.2.1   Tue Jul 18 00:09:01 2006
+++ php-src/ext/mysqli/tests/013.phpt   Wed Oct 10 10:07:08 2007
@@ -1,52 +1,60 @@
 --TEST--
 mysqli fetch mixed / mysql_query (may fail when using 4.1 library with 5.x 
server)
 --SKIPIF--
-
+
 --FILE--
  40100 && 
mysqli_get_client_version() < 5 &&
- mysqli_get_server_version($link) > 5)
+mysqli_get_server_version($link) > 5)
echo "error (4.1 library with 5.x server)";
else
echo "error";
 
mysqli_close($link);
+   print "done!";
 ?>
 --EXPECTF--
 ok
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/014.phpt?r1=1.8.2.2&r2=1.8.2.2.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/014.phpt
diff -u php-src/ext/mysqli/tests/014.phpt:1.8.2.2 
php-src/ext/mysqli/tests/014.phpt:1.8.2.2.4.1
--- php-src/ext/mysqli/tests/014.phpt:1.8.2.2   Thu Mar 30 20:43:39 2006
+++ php-src/ext/mysqli/tests/014.phpt   Wed Oct 10 10:07:08 2007
@@ -1,12 +1,17 @@
 --TEST--
-mysqli autocommit/commit/rollback 
+mysqli autocommit/commit/rollback
 --SKIPIF--
 
---EXPECT--
+--EXPECTF--
 Num_of_rows=1
 array(2) {
   [0]=>
@@ -67,3 +95,19 @@
   [1]=>
   string(4) "egon"
 }
+done!
+--UEXPECTF--
+Num_of_rows=1
+array(2) {
+  [0]=>
+  unicode(1) "1"
+  [1]=>
+  unicode(6) "foobar"
+}
+array(2) {
+  [0]=>
+  unicode(1) "2"
+  [1]=>
+  unicode(4) "egon"
+}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/015.phpt?r1=1.4.2.1&r2=1.4.2.1.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/015.phpt
diff -u php-src/ext/mysqli/tests/015.phpt:1.4.2.1 
php-src/ext/mysqli/tests/015.phpt:1.4.2.1.4.1
--- php-src/ext/mysqli/tests/015.phpt:1.4.2.1   Thu Mar 30 20:43:39 2006
+++ php-src/ext/mysqli/tests/015.phpt   Wed Oct 10 10:07:08 2007
@@ -1,15 +1,16 @@
 --TEST--
-mysqli autocommit/commit/rollback with myisam 
+mysqli autocommit/commit/rollback with innodb
 --SKIPIF--
-
---EXPECT--
+--EXPECTF--
 array(2) {
   [0]=>
-  string(1) "2"
+  string(1) "1"
   [1]=>
-  string(4) "egon"
+  string(6) "foobar"
 }
 array(2) {
   [0]=>
@@ -67,3 +69,18 @@

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt 009.phpt

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 10:06:53 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   001.phpt 002.phpt 003.phpt 004.phpt 
005.phpt 006.phpt 007.phpt 008.phpt 
009.phpt 
  Log:
  Changes to existing tests: 0*.phpt
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/001.phpt?r1=1.6&r2=1.6.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/001.phpt
diff -u php-src/ext/mysqli/tests/001.phpt:1.6 
php-src/ext/mysqli/tests/001.phpt:1.6.6.1
--- php-src/ext/mysqli/tests/001.phpt:1.6   Fri Jan  7 14:59:59 2005
+++ php-src/ext/mysqli/tests/001.phpt   Wed Oct 10 10:06:53 2007
@@ -1,47 +1,63 @@
 --TEST--
 mysqli connect
 --SKIPIF--
-
-
+
 --FILE--
 
---EXPECT--
-string(5) "1"
+--EXPECTF--
+%s(4) ""
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/002.phpt?r1=1.4.2.1&r2=1.4.2.1.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/002.phpt
diff -u php-src/ext/mysqli/tests/002.phpt:1.4.2.1 
php-src/ext/mysqli/tests/002.phpt:1.4.2.1.4.1
--- php-src/ext/mysqli/tests/002.phpt:1.4.2.1   Fri Mar 24 09:32:24 2006
+++ php-src/ext/mysqli/tests/002.phpt   Wed Oct 10 10:06:53 2007
@@ -1,30 +1,38 @@
 --TEST--
-mysqli bind_result 1 
+mysqli bind_result 1
 --SKIPIF--
-
+
 --FILE--
 query("CREATE SCHEMA test");
+   if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+  printf("[001] [%d] %s\n", mysqli_connect_errno(), 
mysqli_connect_error());
 
-   mysqli_select_db($link, "test");
-   $rc = mysqli_query($link,"DROP TABLE IF EXISTS test_fetch_null");
+   if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null"))
+   printf("[002] Cannot drop table, [%d] %s\n", 
mysqli_errno($link), mysqli_error($link));
 
-   $rc = mysqli_query($link,"CREATE TABLE test_fetch_null(col1 tinyint, 
col2 smallint,
-   col3 int, col4 bigint, 
-   col5 float, col6 double,
-   col7 date, col8 time, 
-   col9 varbinary(10), 
-   col10 varchar(50),
-   col11 char(20))");
-  
-   $rc = mysqli_query($link,"INSERT INTO test_fetch_null(col1,col10, 
col11) VALUES(1,'foo1', 1000),(2,'foo2', 88),(3,'foo3', 389789)");
+   $rc = mysqli_query($link,"CREATE TABLE test_fetch_null(col1 tinyint, 
col2 smallint,
+   col3 int, col4 bigint,
+   col5 float, col6 double,
+   col7 date, col8 time,
+   col9 varbinary(10),
+   col10 varchar(50),
+   col11 char(20)) ENGINE=" . $engine);
+
+   if (!$rc)
+   printf("[003] Cannot create table, [%d] %s\n", 
mysqli_errno($link), mysqli_error($link));
+
+   $rc = mysqli_query($link, "INSERT INTO test_fetch_null(col1,col10, 
col11) VALUES(1,'foo1', 1000),(2,'foo2', 88),(3,'foo3', 389789)");
+   if (!$rc)
+   printf("[004] Cannot insert records, [%d] %s\n", 
mysqli_errno($link), mysqli_error($link));
 
-   $stmt = mysqli_prepare($link, "SELECT col1, col2, col3, col4, col5, 
col6, col7, col8, col9, col10, col11 from test_fetch_null");
-   mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8, $c9, 
$c10, $c11); 
+   $stmt = mysqli_prepare($link, "SELECT col1, col2, col3, col4, col5, 
col6, col7, col8, col9, col10, col11 from test_fetch_null ORDER BY col1");
+   mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8, $c9, 
$c10, $c11);
mysqli_execute($stmt);
 
mysqli_fetch($stmt);
@@ -35,8 +43,9 @@
 
mysqli_stmt_close($stmt);
mysqli_close($link);
+   print "done!";
 ?>
---EXPECT--
+--EXPECTF--
 array(11) {
   [0]=>
   int(1)
@@ -61,3 +70,30 @@
   [10]=>
   string(4) "1000"
 }
+done!
+--UEXPECTF--
+array(11) {
+  [0]=>
+  int(1)
+  [1]=>
+  NULL
+  [2]=>
+  NULL
+  [3]=>
+  NULL
+  [4]=>
+  NULL
+  [5]=>
+  NULL
+  [6]=>
+  NULL
+  [7]=>
+  NULL
+  [8]=>
+  NULL
+  [9]=>
+  unicode(4) "foo1"
+  [10]=>
+  unicode(4) "1000"
+}
+done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/003.phpt?r1=1.5.2.1&r2=1.5.2.1.4.1&diff_format=u
Index: php-src/ext/mysqli/tests/003.phpt
diff -u php-src/ext/mysqli/tests/003.phpt:1.5.2.1 
php-src/ext/mysqli/tests/003.phpt:1.5.2.1.4.1
--- php-src/ext/mysqli/tests/003.phpt:1.5.2.1   Sat Oct  8 15:08:07 2005
+++ php-src/ext/mysqli/tests/003.phpt   Wed Oct 10 10:06:53 2007
@@ -1,35 +1,44 @@
 --TEST--
 mysqli connect
 --SKIPIF--
-
+
 --FILE--
 
---EXPECT--
+--EXPECTF--
 array(7) {
   [0]=>
   string(10) "2002-01-02"
@@ -56,3 +66,22 @@
   [6]=>
   string(19) "1999-12-29 00:00:00"
 }
+done!
+--UEXPECTF--
+array(7) {
+  [0]=>
+  unicode(10) "2002-01-02"
+  [1]=>
+  unicode(8) "12:49:0

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests connect.inc local_infile_tools.inc reflection_tools.inc skipif.inc skipifconnectfailure.inc skipifemb.inc skipifnotemb.inc skipifunicode.inc table.inc

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 10:04:46 2007 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   local_infile_tools.inc 
reflection_tools.inc 
skipifconnectfailure.inc 
skipifunicode.inc table.inc 

  Modified files:  
/php-src/ext/mysqli/tests   connect.inc skipifemb.inc skipif.inc 
skipifnotemb.inc 
  Log:
  Starting to merge updated set of tests into 5.3. 
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/connect.inc?r1=1.6.2.1.2.2&r2=1.6.2.1.2.2.2.1&diff_format=u
Index: php-src/ext/mysqli/tests/connect.inc
diff -u php-src/ext/mysqli/tests/connect.inc:1.6.2.1.2.2 
php-src/ext/mysqli/tests/connect.inc:1.6.2.1.2.2.2.1
--- php-src/ext/mysqli/tests/connect.inc:1.6.2.1.2.2Tue Jul 11 23:43:55 2006
+++ php-src/ext/mysqli/tests/connect.incWed Oct 10 10:04:46 2007
@@ -1,25 +1,54 @@
 embedded) {
-   $host = "localhost";
-   $user = "root";
-   $passwd = "";
+   $driver= new mysqli_driver;
+
+   $host  = getenv("MYSQL_TEST_HOST") ? getenv("MYSQL_TEST_HOST") 
: "localhost";
+   $port  = getenv("MYSQL_TEST_PORT") ? getenv("MYSQL_TEST_PORT") 
: 3306;
+   $user  = getenv("MYSQL_TEST_USER") ? getenv("MYSQL_TEST_USER") 
: "root";
+   $passwd= getenv("MYSQL_TEST_PASSWD")   ? 
getenv("MYSQL_TEST_PASSWD") : "";
+   $db= getenv("MYSQL_TEST_DB")   ? getenv("MYSQL_TEST_DB") : 
"phptest";
+   $engine= getenv("MYSQL_TEST_ENGINE")   ? 
getenv("MYSQL_TEST_ENGINE") : "MyISAM";
+   $socket= getenv("MYSQL_TEST_SOCKET")   ? 
getenv("MYSQL_TEST_SOCKET") : null;
+
+   /* Development setting: test experimal features and/or feature requests 
that never worked before? */
+   $TEST_EXPERIMENTAL = (in_array(getenv("MYSQL_TEST_EXPERIMENTAL"), 
array(0, 1))) ?
+   ((1 == getenv("MYSQL_TEST_EXPERIMENTAL")) ? 
true : false) :
+   false;
+
+   $IS_MYSQLND = stristr(mysqli_get_client_info(), "mysqlnd");
+   if (!$IS_MYSQLND) {
+   $MYSQLND_VERSION = NULL;
} else {
-   $path =  dirname(__FILE__);
-   $host = ":embedded";
-   $user = $passwd = NULL;
-   $args = array(
-   "--datadir=$path", 
-   "--innodb_data_home_dir=$path",
-   
"--innodb_data_file_path=ibdata1:10M:autoextend",
-   "--log-error=$path/testrun.log",
-"--init-connect='CREATE DATABASE IF 
NOT EXISTS test;'"
-   );
-   $driver->embedded_server_start(TRUE, $args, NULL);
+   if (preg_match('@Revision:\s+(\d+)[EMAIL PROTECTED]', 
mysqli_get_client_info(), $matches)) {
+   $MYSQLND_VERSION = (int)$matches[1];
+   } else {
+   $MYSQLND_VERSION = -1;
+   }
}
 
-?>
+   if (!function_exists('sys_get_temp_dir')) {
+   function sys_get_temp_dir() {
+
+   if (!empty($_ENV['TMP']))
+   return realpath( $_ENV['TMP'] );
+   if (!empty($_ENV['TMPDIR']))
+   return realpath( $_ENV['TMPDIR'] );
+   if (!empty($_ENV['TEMP']))
+   return realpath( $_ENV['TEMP'] );
+
+   $temp_file = tempnam(md5(uniqid(rand(), TRUE)), '');
+   if ($temp_file) {
+   $temp_dir = realpath(dirname($temp_file));
+   unlink($temp_file);
+   return $temp_dir;
+   }
+   return FALSE;
+   }
+   }
+?>
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/skipifemb.inc?r1=1.1&r2=1.1.6.1&diff_format=u
Index: php-src/ext/mysqli/tests/skipifemb.inc
diff -u php-src/ext/mysqli/tests/skipifemb.inc:1.1 
php-src/ext/mysqli/tests/skipifemb.inc:1.1.6.1
--- php-src/ext/mysqli/tests/skipifemb.inc:1.1  Fri Jan  7 14:59:59 2005
+++ php-src/ext/mysqli/tests/skipifemb.inc  Wed Oct 10 10:04:46 2007
@@ -1,5 +1,5 @@
 embedded) 
-die("skip test doesn't run with embedded server");
-?>
+   $driver = new mysqli_driver();
+   if ($driver->embedded)
+   die("skip test doesn't run with embedded server");
+?>
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/skipif.inc?r1=1.5.4.1&r2=1.5.4.1.2.1&diff_format=u
Index: php-src/ext/mysqli/tests/skipif.inc
diff -u php-src/ext/mysqli/tests/skipif.inc:1.5.4.1 
php-src/ext/mysqli/tests/skipif.inc:1.5.4.1.2.1
--- php-src/ext/mysqli/tests/skipif.i

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql/tests mysql_list_dbs.phpt mysql_list_fields.phpt mysql_list_processes.phpt mysql_list_tables.phpt mysql_query.phpt mysql_query_load_data_openbasedir.phpt mys

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 09:56:48 2007 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/mysql/testsmysql_list_dbs.phpt mysql_list_fields.phpt 
mysql_list_processes.phpt 
mysql_list_tables.phpt mysql_query.phpt 
mysql_query_load_data_openbasedir.phpt 
mysql_real_escape_string.phpt 
mysql_result.phpt mysql_select_db.phpt 
mysql_set_charset.phpt 
mysql_sql_safe_mode.phpt mysql_stat.phpt 
mysql_tablename.phpt mysql_thread_id.phpt 
mysql_trace_mode.phpt 
mysql_unbuffered_query.phpt 
  Log:
  And the last set of new tests for ext/mysql. "new" does not really mean new.
  We've checked them into HEAD/PHP6 before already.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_list_dbs.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_list_dbs.phpt
+++ php-src/ext/mysql/tests/mysql_list_dbs.phpt
--TEST--
mysql_list_dbs()
--SKIPIF--

--FILE--

--EXPECTF--
done!

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_list_fields.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_list_fields.phpt
+++ php-src/ext/mysql/tests/mysql_list_fields.phpt
--TEST--
mysql_list_fields()
--SKIPIF--

--FILE--

--EXPECTF--
done!

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_list_processes.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_list_processes.phpt
+++ php-src/ext/mysql/tests/mysql_list_processes.phpt
--TEST--
mysql_list_processes()
--SKIPIF--

--FILE--

--EXPECTF--
done!

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_list_tables.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_list_tables.phpt
+++ php-src/ext/mysql/tests/mysql_list_tables.phpt
--TEST--
mysql_list_tables()
--SKIPIF--

--FILE--
 $tlist)
foreach ($tlist as $k => $table)
$list1[] = $table;

foreach ($tables_query as $k => $tlist)
foreach ($tlist as $k => $table)
$list2[] = $table;

if ($list1 !== $list2) {
printf("[009] Got different results for mysql_list_tables() and SHOW 
TABLES\n");
var_dump($list1);
var_dump($list2);
}

if (!in_array('test', $list1))
printf("[010] Table lists seem to be wrong. Check manually.\n");

mysql_close($link);

print "done!\n";
?>
--EXPECTF--
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_query.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_query.phpt
+++ php-src/ext/mysql/tests/mysql_query.phpt
--TEST--
mysql_query()
--SKIPIF--


--FILE--

--EXPECTF--
array(1) {
  ["valid"]=>
  string(30) "this is sql but with semicolon"
}
array(1) {
  ["p_version"]=>
  string(%d) "%s"
}
array(1) {
  ["f_version"]=>
  string(%d) "%s"
}

Warning: mysql_query(): %d is not a valid MySQL-Link resource in %s on line %d
done! 
--UEXPECTF--
array(1) {
  [u"valid"]=>
  unicode(30) "this is sql but with semicolon"
}
array(1) {
  [u"p_version"]=>
  unicode(%d) "%s"
}
array(1) {
  [u"f_version"]=>
  unicode(%d) "%s"
}

Warning: mysql_query(): %d is not a valid MySQL-Link resource in %s on line %d
done! 

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
+++ php-src/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_real_escape_string.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_real_escape_string.phpt
+++ php-src/ext/mysql/tests/mysql_real_escape_string.phpt
--TEST--
mysql_real_escape_string()
--SKIPIF--


--FILE--

--EXPECTF--
string(31) "Am I a unicode string in PHP 6?"
string(2) "\\"
string(2) "\""
string(2) "\'"
string(2) "\n"
string(2) "\r"
string(8) "foo\0bar"
done!
--UEXPECTF--
unicode(31) "Am I a unicode string in PHP 6?"
unicode(2) "\\"
unicode(2) "\""
unicode(2) "\'"
unicode(2) "\n"
unicode(2) "\r"
unicode(8) "foo\0bar"
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_result.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_result.phpt
+++ php-src/ext/mysql/tests/mysql_result.phpt
--TEST--
mysql_result()
--SKIPIF--


--FILE--

--EXPECTF--
Warning: mysql_result(): Unable to jump to row -1 on MySQL result index %d in 
%s on line %d
bool(false)

Warning: mysql_result(): Unable to jump to row 2 on MySQL result index %d in %s 
on line %d
bool(false)

Warning: mysql_result(): Bad column offset specified in %s on line %d
bool(false)

Warning: mysql_result(): Bad column offset specified in %s on line %d
bool(false)
string(1) "1"
string(1) "a"

Warning: mysql_result(): %d is not a valid MySQL result resource in %s on line 
%d
bool(false)
done!
--UEXPECTF--
Warning: mysql_re

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql/tests mysql_max_links.phpt mysql_max_persistent.phpt mysql_num_fields.phpt mysql_num_rows.phpt mysql_pconn_disable.phpt mysql_pconn_kill.phpt mysql_pconn_max

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 09:55:28 2007 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/mysql/testsmysql_max_links.phpt 
mysql_max_persistent.phpt 
mysql_num_fields.phpt mysql_num_rows.phpt 
mysql_pconn_disable.phpt 
mysql_pconn_kill.phpt 
mysql_pconn_max_links.phpt 
mysql_pconn_reuse.phpt mysql_pconnect.phpt 
mysql_phpinfo.phpt mysql_ping.phpt 
  Log:
  Second last set of new tests for ext/mysql
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_max_links.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_max_links.phpt
+++ php-src/ext/mysql/tests/mysql_max_links.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_max_persistent.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_max_persistent.phpt
+++ php-src/ext/mysql/tests/mysql_max_persistent.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_num_fields.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_num_fields.phpt
+++ php-src/ext/mysql/tests/mysql_num_fields.phpt
--TEST--
mysql_num_fields()
--SKIPIF--


--FILE--

--EXPECTF--
Warning: mysql_num_fields(): %d is not a valid MySQL result resource in %s on 
line %d
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_num_rows.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_num_rows.phpt
+++ php-src/ext/mysql/tests/mysql_num_rows.phpt
--TEST--
mysql_num_rows()
--SKIPIF--


--FILE--

--EXPECTF--
Warning: mysql_num_rows(): supplied argument is not a valid MySQL result 
resource in %s on line %d

Warning: mysql_free_result(): supplied argument is not a valid MySQL result 
resource in %s on line %d

Warning: mysql_num_rows(): %d is not a valid MySQL result resource in %s on 
line %d
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_pconn_disable.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_pconn_disable.phpt
+++ php-src/ext/mysql/tests/mysql_pconn_disable.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_pconn_kill.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_pconn_kill.phpt
+++ php-src/ext/mysql/tests/mysql_pconn_kill.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_pconn_max_links.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_pconn_max_links.phpt
+++ php-src/ext/mysql/tests/mysql_pconn_max_links.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_pconn_reuse.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_pconn_reuse.phpt
+++ php-src/ext/mysql/tests/mysql_pconn_reuse.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_pconnect.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_pconnect.phpt
+++ php-src/ext/mysql/tests/mysql_pconnect.phpt
--TEST--
mysql_pconnect()
--SKIPIF--


--FILE--

--EXPECTF--
Warning: mysql_pconnect(): Access denied for user '%s'@'%s' (using password: 
YES) in %s on line %d
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_phpinfo.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_phpinfo.phpt
+++ php-src/ext/mysql/tests/mysql_phpinfo.phpt
--TEST--
phpinfo() mysql section
--SKIPIF--

--FILE--
 $entry)
if (!stristr($phpinfo, $entry))
printf("[012] Could not find entry for '%s'\n", $entry);
}

print "done!";
?>
--EXPECTF--
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_ping.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_ping.phpt
+++ php-src/ext/mysql/tests/mysql_ping.phpt
--TEST--
mysql_ping()
--SKIPIF--

--FILE--

--EXPECTF--
bool(true)
bool(true)

Warning: mysql_ping(): %d is not a valid MySQL-Link resource in %s on line %d
done!

-- 
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/mysql/tests mysql_data_seek.phpt mysql_db_name.phpt mysql_db_query.phpt mysql_drop_db.phpt mysql_get_client_info.phpt mysql_get_host_info.phpt mysql_get_proto_info

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 09:53:34 2007 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/mysql/testsmysql_data_seek.phpt mysql_db_name.phpt 
mysql_db_query.phpt mysql_drop_db.phpt 
mysql_get_client_info.phpt 
mysql_get_host_info.phpt 
mysql_get_proto_info.phpt 
mysql_get_server_info.phpt mysql_info.phpt 
mysql_insert_id.phpt 
  Log:
  Next set of new tests - more to follow. Trying to find reasonable commit 
size...
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_data_seek.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_data_seek.phpt
+++ php-src/ext/mysql/tests/mysql_data_seek.phpt
--TEST--
mysql_data_seek()
--SKIPIF--


--FILE--

--EXPECTF--
Warning: mysql_data_seek(): Offset 4 is invalid for MySQL result index %d (or 
the query data is unbuffered) in %s on line %d

Warning: mysql_data_seek(): Offset -1 is invalid for MySQL result index %d (or 
the query data is unbuffered) in %s on line %d

Warning: mysql_data_seek(): Offset 3 is invalid for MySQL result index %d (or 
the query data is unbuffered) in %s on line %d

Warning: mysql_data_seek(): %d is not a valid MySQL result resource in %s on 
line %d
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_db_name.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_db_name.phpt
+++ php-src/ext/mysql/tests/mysql_db_name.phpt
--TEST--
mysql_db_name()
--SKIPIF--

--FILE--

--EXPECTF--
Warning: mysql_db_name(): Unable to jump to row -1 on MySQL result index %d in 
%s on line %d

Warning: mysql_db_name(): Unable to jump to row %d on MySQL result index %d in 
%s on line %d

Warning: mysql_db_name(): %d is not a valid MySQL result resource in %s on line 
%d
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_db_query.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_db_query.phpt
+++ php-src/ext/mysql/tests/mysql_db_query.phpt
--TEST--
mysql_db_query()
--SKIPIF--

--FILE--

--EXPECTF--
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_drop_db.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_drop_db.phpt
+++ php-src/ext/mysql/tests/mysql_drop_db.phpt
--TEST--
mysql_drop_db()
--SKIPIF--

--FILE--

--EXPECTF--
done!

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_get_client_info.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_get_client_info.phpt
+++ php-src/ext/mysql/tests/mysql_get_client_info.phpt
--TEST--
mysql_get_client_info()
--SKIPIF--


--FILE--

--EXPECTF--
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_get_host_info.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_get_host_info.phpt
+++ php-src/ext/mysql/tests/mysql_get_host_info.phpt
--TEST--
mysql_get_host_info()
--SKIPIF--

--FILE--

--EXPECTF--
done!

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_get_proto_info.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_get_proto_info.phpt
+++ php-src/ext/mysql/tests/mysql_get_proto_info.phpt
--TEST--
mysql_get_proto_info()
--SKIPIF--


--FILE--

--EXPECTF--
done!

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_get_server_info.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_get_server_info.phpt
+++ php-src/ext/mysql/tests/mysql_get_server_info.phpt
--TEST--
mysql_get_server_info()
--SKIPIF--


--FILE--

--EXPECTF--
done!

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_info.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_info.phpt
+++ php-src/ext/mysql/tests/mysql_info.phpt
--TEST--
mysql_info()
--SKIPIF--


--FILE--
= 100', 
$link))
printf("[011] [%d] %s\n", mysql_errno($link), mysql_error($link));

if (!is_string($tmp = mysql_info($link)) || ('' == $tmp))
printf("[012] Expecting string/any_non_empty, got %s/%s\n", 
gettype($tmp), $tmp);

if (ini_get('unicode.semantics') && !is_unicode($tmp)) {
printf("[013] Expecting Unicode!\n");
var_inspect($info);
}

if (!is_string($def_tmp = mysql_info()) || ('' == $def_tmp))
printf("[014] Expecting string/any_non_empty, got %s/%s\n", 
gettype($def_tmp), $def_tmp);  

if ($def_tmp !== $tmp) {
printf("[015] Results differ for default link and specified link, [%d] 
%s\n",
mysql_errno(), mysql_error());
var_inspect($tmp);
var_inspect($def_tmp);
}

// NOTE: no LOAD DATA INFILE test

print "done!";
?>
--EXPECTF--
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_insert_id.phpt?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/mysql_insert_id.phpt
+++ php-src/ext/mysql/tests/mysql_insert_id.phpt
--TEST--
mysql_insert_id()
--SKIPIF--


--FILE--

--EXPECTF--
Warning: mysql_insert_id(): %d is not a valid MySQL-Lin

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql/tests skipifconnectfailure.inc table.inc

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 09:49:38 2007 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/mysql/teststable.inc skipifconnectfailure.inc 
  Log:
  New tests use more helper files.
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/table.inc?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/table.inc
+++ php-src/ext/mysql/tests/table.inc

http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/skipifconnectfailure.inc?view=markup&rev=1.1
Index: php-src/ext/mysql/tests/skipifconnectfailure.inc
+++ php-src/ext/mysql/tests/skipifconnectfailure.inc


-- 
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/mysql/tests 001.phpt 002.phpt 003.phpt connect.inc skipif.inc

2007-10-10 Thread Ulf Wendel

uw  Wed Oct 10 09:47:21 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysql/tests001.phpt 002.phpt 003.phpt connect.inc 
skipif.inc 
  Log:
  Starting to merge the latest set of tests from the mysqlnd development
  tree into the PHP 5_3 tree.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/001.phpt?r1=1.3.2.1&r2=1.3.2.1.4.1&diff_format=u
Index: php-src/ext/mysql/tests/001.phpt
diff -u php-src/ext/mysql/tests/001.phpt:1.3.2.1 
php-src/ext/mysql/tests/001.phpt:1.3.2.1.4.1
--- php-src/ext/mysql/tests/001.phpt:1.3.2.1Mon Feb  6 14:25:07 2006
+++ php-src/ext/mysql/tests/001.phptWed Oct 10 09:47:21 2007
@@ -4,22 +4,30 @@
 
 --FILE--
 
 --EXPECT--
 string(2) "11"
+done!
+--UEXPECTF--
+unicode(2) "11"
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/002.phpt?r1=1.1&r2=1.1.8.1&diff_format=u
Index: php-src/ext/mysql/tests/002.phpt
diff -u php-src/ext/mysql/tests/002.phpt:1.1 
php-src/ext/mysql/tests/002.phpt:1.1.8.1
--- php-src/ext/mysql/tests/002.phpt:1.1Mon Jan 12 02:31:08 2004
+++ php-src/ext/mysql/tests/002.phptWed Oct 10 09:47:21 2007
@@ -4,14 +4,13 @@
 
 --FILE--
 
 --EXPECTF--
 resource(%d) of type (mysql link)
 bool(true)
 bool(true)
 bool(true)
-bool(true)
 resource(%d) of type (mysql result)
 array(3) {
   ["col1"]=>
@@ -51,3 +51,27 @@
   ["col3"]=>
   string(3) "bar"
 }
+done!
+--UEXPECTF--
+resource(%d) of type (mysql link)
+bool(true)
+bool(true)
+bool(true)
+resource(%d) of type (mysql result)
+array(3) {
+  [u"col1"]=>
+  unicode(1) "1"
+  [u"col2"]=>
+  unicode(3) "foo"
+  [u"col3"]=>
+  unicode(3) "bar"
+}
+array(3) {
+  [u"col1"]=>
+  unicode(1) "2"
+  [u"col2"]=>
+  unicode(3) "foo"
+  [u"col3"]=>
+  unicode(3) "bar"
+}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/003.phpt?r1=1.1&r2=1.1.8.1&diff_format=u
Index: php-src/ext/mysql/tests/003.phpt
diff -u php-src/ext/mysql/tests/003.phpt:1.1 
php-src/ext/mysql/tests/003.phpt:1.1.8.1
--- php-src/ext/mysql/tests/003.phpt:1.1Mon Jan 12 02:34:55 2004
+++ php-src/ext/mysql/tests/003.phptWed Oct 10 09:47:21 2007
@@ -4,8 +4,7 @@
 
 --FILE--
 
-==DONE==
 --EXPECTF--
-string(3) "one"
-string(3) "two"
-string(5) "three"
 ==stdClass==
 object(stdClass)#%d (1) {
   ["a"]=>
@@ -81,4 +79,35 @@
   ["a"]=>
   string(5) "three"
 }
-==DONE==
+done!
+--UEXPECTF--
+==stdClass==
+object(stdClass)#%d (1) {
+  [u"a"]=>
+  unicode(3) "one"
+}
+object(stdClass)#%d (1) {
+  [u"a"]=>
+  unicode(3) "two"
+}
+object(stdClass)#%d (1) {
+  [u"a"]=>
+  unicode(5) "three"
+}
+==class24==
+class24::__construct
+object(class24)#%d (1) {
+  [u"a"]=>
+  unicode(3) "one"
+}
+class24::__construct
+object(class24)#%d (1) {
+  [u"a"]=>
+  unicode(3) "two"
+}
+class24::__construct
+object(class24)#%d (1) {
+  [u"a"]=>
+  unicode(5) "three"
+}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/connect.inc?r1=1.1&r2=1.1.8.1&diff_format=u
Index: php-src/ext/mysql/tests/connect.inc
diff -u php-src/ext/mysql/tests/connect.inc:1.1 
php-src/ext/mysql/tests/connect.inc:1.1.8.1
--- php-src/ext/mysql/tests/connect.inc:1.1 Mon Jan 12 02:31:08 2004
+++ php-src/ext/mysql/tests/connect.inc Wed Oct 10 09:47:21 2007
@@ -1,10 +1,64 @@
 
+/* wrapper to simplify test porting */
+function my_mysql_connect($host, $user, $passwd, $db, $port, $socket) {
+
+   if ($socket)
+   $host = sprintf("%s:%s", $host, $socket);
+   else if ($port)
+   $host = sprintf("%s:%s", $host, $port);
+
+   if (!$link = mysql_connect($host, $user, $passwd, true)) {
+   printf("[000-a] Cannot connect using host '%s', user '%s', 
password '', [%d] %s\n",
+   $host, $user, $passwd,
+   mysql_errno(), mysql_error());
+   return false;
+   }
+
+   if (!mysql_select_db($db, $link)) {
+   printf("[000-b] [%d] %s\n", mysql_errno($link), 
mysql_error($link));
+   return false;
+   }
+
+   return $link;
+}
+
+/*
+Default values are "localhost", "root", database "phptest" and empty password.
+Change the MYSQL_TEST_* environment values if you want to use another 
configuration.
+*/
+
+$host  = getenv("MYSQL_TEST_HOST") ? getenv("MYSQL_TEST_HOST") 
: "localhost";
+$port  = getenv("MYSQL_TEST_PORT") ? getenv("MYSQL_TEST_PORT") 
: 3306;
+$user  = getenv("MYSQL_TEST_USER") ? getenv("MYSQL_TEST_USER") 
: "root";
+$passwd= getenv("MYSQL_TEST_PASSWD")   ? getenv("MYSQL_TEST_PASSWD")   
: "";
+$db= getenv("MYSQL_TEST_DB")   ? 
getenv("MYSQL_TEST_DB")   : "test";
+$engine= getenv("MYSQL_TEST_ENGINE")   ? getenv("MYSQL_TEST_ENGINE")   
: "MyISAM";
+$socket= getenv("MYSQL_TEST_SOCKET")   ? getenv("MYSQL_TEST_SOCKET")   
: null;
+
+/* Development setting: test experimal features

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard url_scanner_ex.c

2007-10-10 Thread Jani Taskinen

janiWed Oct 10 09:28:51 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   url_scanner_ex.c 
  Log:
  - Generated with more recent re2c version
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.c?r1=1.95.2.4.2.4&r2=1.95.2.4.2.5&diff_format=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.95.2.4.2.4 
php-src/ext/standard/url_scanner_ex.c:1.95.2.4.2.5
--- php-src/ext/standard/url_scanner_ex.c:1.95.2.4.2.4  Wed Oct 10 00:35:52 2007
+++ php-src/ext/standard/url_scanner_ex.c   Wed Oct 10 09:28:51 2007
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.11.0 on Tue Oct  9 20:35:35 2007 */
+/* Generated by re2c 0.12.1 on Wed Oct 10 12:28:46 2007 */
 #line 1 "ext/standard/url_scanner_ex.re"
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.c,v 1.95.2.4.2.4 2007/10/10 00:35:52 iliaa Exp $ */
+/* $Id: url_scanner_ex.c,v 1.95.2.4.2.5 2007/10/10 09:28:51 jani Exp $ */
 
 #include "php.h"
 
@@ -109,48 +109,78 @@
q = (p = url->c) + url->len;
 
 scan:
-
-#line 114 "ext/standard/url_scanner_ex.c"
 {
-   YYCTYPE yych;
-
-   if(YYLIMIT == YYCURSOR) YYFILL(1);
-   yych = *YYCURSOR;
-   switch(yych) {
-   case '#':   goto yy6;
-   case ':':   goto yy2;
-   case '?':   goto yy4;
-   default:goto yy8;
-   }
-yy2:
-   ++YYCURSOR;
+   static const unsigned char yybm[] = {
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128,   0, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128,   0, 128, 128, 128, 128,   0, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   };
+
+#line 149 "ext/standard/url_scanner_ex.c"
+   {
+   YYCTYPE yych;
+
+   if(YYLIMIT == YYCURSOR) YYFILL(1);
+   yych = *YYCURSOR;
+   if(yybm[0+yych] & 128) {
+   goto yy8;
+   }
+   if(yych <= '9') goto yy6;
+   if(yych >= ';') goto yy4;
+   ++YYCURSOR;
 #line 116 "ext/standard/url_scanner_ex.re"
-   { smart_str_append(dest, url); return; }
-#line 130 "ext/standard/url_scanner_ex.c"
+   { smart_str_append(dest, url); return; }
+#line 163 "ext/standard/url_scanner_ex.c"
 yy4:
-   ++YYCURSOR;
+   ++YYCURSOR;
 #line 117 "ext/standard/url_scanner_ex.re"
-   { sep = separator; goto scan; }
-#line 135 "ext/standard/url_scanner_ex.c"
+   { sep = separator; goto scan; }
+#line 168 "ext/standard/url_scanner_ex.c"
 yy6:
-   ++YYCURSOR;
+   ++YYCURSOR;
 #line 118 "ext/standard/url_scanner_ex.re"
-   { bash = p - 1; goto done; }
-#line 140 "ext/standard/url_scanner_ex.c"
+   { bash = p - 1; goto done; }
+#line 173 "ext/standard/url_scanner_ex.c"
 yy8:
-   ++YYCURSOR;
-   if(YYLIMIT == YYCURSOR) YYFILL(1);
-   yych = *YYCURSOR;
-   switch(yych) {
-   case '#':
-   case ':':
-   case '?':   goto yy10;
-   default:goto yy8;
-   }
-yy10:
+   ++YYCURSOR;
+   if(YYLIMIT == YYCURSOR) YYFILL(1);
+   yych = *YYCURSOR;
+   if(yybm[0+yych] & 128) {
+

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c

2007-10-10 Thread Jani Taskinen

janiWed Oct 10 09:28:25 2007 UTC

  Modified files:  
/php-src/ext/standard   url_scanner_ex.c 
  Log:
  - Generated with more recent re2c version
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.c?r1=1.107&r2=1.108&diff_format=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.107 
php-src/ext/standard/url_scanner_ex.c:1.108
--- php-src/ext/standard/url_scanner_ex.c:1.107 Wed Oct 10 00:36:25 2007
+++ php-src/ext/standard/url_scanner_ex.c   Wed Oct 10 09:28:25 2007
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.11.0 on Tue Oct  9 20:36:17 2007 */
+/* Generated by re2c 0.12.1 on Wed Oct 10 12:27:56 2007 */
 #line 1 "ext/standard/url_scanner_ex.re"
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.c,v 1.107 2007/10/10 00:36:25 iliaa Exp $ */
+/* $Id: url_scanner_ex.c,v 1.108 2007/10/10 09:28:25 jani Exp $ */
 
 #include "php.h"
 
@@ -109,48 +109,78 @@
q = (p = url->c) + url->len;
 
 scan:
-
-#line 114 "ext/standard/url_scanner_ex.c"
 {
-   YYCTYPE yych;
-
-   if(YYLIMIT == YYCURSOR) YYFILL(1);
-   yych = *YYCURSOR;
-   switch(yych) {
-   case '#':   goto yy6;
-   case ':':   goto yy2;
-   case '?':   goto yy4;
-   default:goto yy8;
-   }
-yy2:
-   ++YYCURSOR;
+   static const unsigned char yybm[] = {
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128,   0, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128,   0, 128, 128, 128, 128,   0, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   };
+
+#line 149 "ext/standard/url_scanner_ex.c"
+   {
+   YYCTYPE yych;
+
+   if(YYLIMIT == YYCURSOR) YYFILL(1);
+   yych = *YYCURSOR;
+   if(yybm[0+yych] & 128) {
+   goto yy8;
+   }
+   if(yych <= '9') goto yy6;
+   if(yych >= ';') goto yy4;
+   ++YYCURSOR;
 #line 116 "ext/standard/url_scanner_ex.re"
-   { smart_str_append(dest, url); return; }
-#line 130 "ext/standard/url_scanner_ex.c"
+   { smart_str_append(dest, url); return; }
+#line 163 "ext/standard/url_scanner_ex.c"
 yy4:
-   ++YYCURSOR;
+   ++YYCURSOR;
 #line 117 "ext/standard/url_scanner_ex.re"
-   { sep = separator; goto scan; }
-#line 135 "ext/standard/url_scanner_ex.c"
+   { sep = separator; goto scan; }
+#line 168 "ext/standard/url_scanner_ex.c"
 yy6:
-   ++YYCURSOR;
+   ++YYCURSOR;
 #line 118 "ext/standard/url_scanner_ex.re"
-   { bash = p - 1; goto done; }
-#line 140 "ext/standard/url_scanner_ex.c"
+   { bash = p - 1; goto done; }
+#line 173 "ext/standard/url_scanner_ex.c"
 yy8:
-   ++YYCURSOR;
-   if(YYLIMIT == YYCURSOR) YYFILL(1);
-   yych = *YYCURSOR;
-   switch(yych) {
-   case '#':
-   case ':':
-   case '?':   goto yy10;
-   default:goto yy8;
-   }
-yy10:
+   ++YYCURSOR;
+   if(YYLIMIT == YYCURSOR) YYFILL(1);
+   yych = *YYCURSOR;
+   if(yybm[0+yych] & 128) {
+   goto yy8;
+   }
 #line 119 "ext/standard/url_sc

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard url_scanner_ex.c

2007-10-10 Thread Jani Taskinen

janiWed Oct 10 09:27:13 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   url_scanner_ex.c 
  Log:
  - Generated with a bit more recent re2c version
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.c?r1=1.95.2.4.2.3.2.1&r2=1.95.2.4.2.3.2.2&diff_format=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.95.2.4.2.3.2.1 
php-src/ext/standard/url_scanner_ex.c:1.95.2.4.2.3.2.2
--- php-src/ext/standard/url_scanner_ex.c:1.95.2.4.2.3.2.1  Wed Oct 10 
00:34:40 2007
+++ php-src/ext/standard/url_scanner_ex.c   Wed Oct 10 09:27:13 2007
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.11.0 on Tue Oct  9 20:28:45 2007 */
+/* Generated by re2c 0.12.1 on Wed Oct 10 12:26:17 2007 */
 #line 1 "ext/standard/url_scanner_ex.re"
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.c,v 1.95.2.4.2.3.2.1 2007/10/10 00:34:40 iliaa Exp $ */
+/* $Id: url_scanner_ex.c,v 1.95.2.4.2.3.2.2 2007/10/10 09:27:13 jani Exp $ */
 
 #include "php.h"
 
@@ -109,48 +109,78 @@
q = (p = url->c) + url->len;
 
 scan:
-
-#line 114 "ext/standard/url_scanner_ex.c"
 {
-   YYCTYPE yych;
-
-   if(YYLIMIT == YYCURSOR) YYFILL(1);
-   yych = *YYCURSOR;
-   switch(yych) {
-   case '#':   goto yy6;
-   case ':':   goto yy2;
-   case '?':   goto yy4;
-   default:goto yy8;
-   }
-yy2:
-   ++YYCURSOR;
+   static const unsigned char yybm[] = {
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128,   0, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128,   0, 128, 128, 128, 128,   0, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   128, 128, 128, 128, 128, 128, 128, 128, 
+   };
+
+#line 149 "ext/standard/url_scanner_ex.c"
+   {
+   YYCTYPE yych;
+
+   if(YYLIMIT == YYCURSOR) YYFILL(1);
+   yych = *YYCURSOR;
+   if(yybm[0+yych] & 128) {
+   goto yy8;
+   }
+   if(yych <= '9') goto yy6;
+   if(yych >= ';') goto yy4;
+   ++YYCURSOR;
 #line 116 "ext/standard/url_scanner_ex.re"
-   { smart_str_append(dest, url); return; }
-#line 130 "ext/standard/url_scanner_ex.c"
+   { smart_str_append(dest, url); return; }
+#line 163 "ext/standard/url_scanner_ex.c"
 yy4:
-   ++YYCURSOR;
+   ++YYCURSOR;
 #line 117 "ext/standard/url_scanner_ex.re"
-   { sep = separator; goto scan; }
-#line 135 "ext/standard/url_scanner_ex.c"
+   { sep = separator; goto scan; }
+#line 168 "ext/standard/url_scanner_ex.c"
 yy6:
-   ++YYCURSOR;
+   ++YYCURSOR;
 #line 118 "ext/standard/url_scanner_ex.re"
-   { bash = p - 1; goto done; }
-#line 140 "ext/standard/url_scanner_ex.c"
+   { bash = p - 1; goto done; }
+#line 173 "ext/standard/url_scanner_ex.c"
 yy8:
-   ++YYCURSOR;
-   if(YYLIMIT == YYCURSOR) YYFILL(1);
-   yych = *YYCURSOR;
-   switch(yych) {
-   case '#':
-   case ':':
-   case '?':   goto yy10;
-   default:goto yy8;
-   }
-yy10:
+   ++YYCURSOR;
+   if(YYLIMIT == YYCURSOR) YYFILL(1);
+   yych = *YYCURSOR;
+   if

43 matches

Mail list logo