[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/embed php_embed.c
helly Tue Mar 25 22:05:22 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/embed php_embed.c
Log:
MFH:
- Fix memory leak found by Osman
- Merge strlen to sizof change from CLI
http://cvs.php.net/viewvc.cgi/php-src/sapi/embed/php_embed.c?r1=1.11.2.1.2.5.2.2&r2=1.11.2.1.2.5.2.3&diff_format=u
Index: php-src/sapi/embed/php_embed.c
diff -u php-src/sapi/embed/php_embed.c:1.11.2.1.2.5.2.2
php-src/sapi/embed/php_embed.c:1.11.2.1.2.5.2.3
--- php-src/sapi/embed/php_embed.c:1.11.2.1.2.5.2.2 Tue Mar 18 22:23:21 2008
+++ php-src/sapi/embed/php_embed.c Tue Mar 25 22:05:22 2008
@@ -15,7 +15,7 @@
| Author: Edin Kadribasic <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_embed.c,v 1.11.2.1.2.5.2.2 2008/03/18 22:23:21 rasmus Exp $ */
+/* $Id: php_embed.c,v 1.11.2.1.2.5.2.3 2008/03/25 22:05:22 helly Exp $ */
#include "php_embed.h"
@@ -24,13 +24,13 @@
#include
#endif
-#define HARDCODED_INI \
- "html_errors=0\n" \
- "register_argc_argv=1\n"\
- "implicit_flush=1\n"\
- "output_buffering=0\n" \
- "max_execution_time=0\n"\
- "max_input_time=-1\n"
+const char HARDCODED_INI[] =
+ "html_errors=0\n"
+ "register_argc_argv=1\n"
+ "implicit_flush=1\n"
+ "output_buffering=0\n"
+ "max_execution_time=0\n"
+ "max_input_time=-1\n\0";
static char* php_embed_read_cookies(TSRMLS_D)
{
@@ -146,7 +146,6 @@
#ifdef ZTS
void ***tsrm_ls = NULL;
#endif
- int ini_entries_len = 0;
#ifdef HAVE_SIGNAL_H
#if defined(SIGPIPE) && defined(SIG_IGN)
@@ -159,26 +158,24 @@
#endif
#endif
-#ifdef PHP_WIN32
- _fmode = _O_BINARY; /*sets default for file streams to
binary */
- setmode(_fileno(stdin), O_BINARY); /* make the stdio mode be
binary */
- setmode(_fileno(stdout), O_BINARY); /* make the stdio mode be
binary */
- setmode(_fileno(stderr), O_BINARY); /* make the stdio mode be
binary */
-#endif
-
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
tsrm_ls = ts_resource(0);
*ptsrm_ls = tsrm_ls;
#endif
- ini_entries_len = strlen(HARDCODED_INI);
- php_embed_module.ini_entries = malloc(ini_entries_len+2);
- memcpy(php_embed_module.ini_entries, HARDCODED_INI, ini_entries_len+1);
- php_embed_module.ini_entries[ini_entries_len+1] = 0;
-
sapi_startup(&php_embed_module);
+#ifdef PHP_WIN32
+ _fmode = _O_BINARY; /*sets default for file streams to
binary */
+ setmode(_fileno(stdin), O_BINARY); /* make the stdio mode be
binary */
+ setmode(_fileno(stdout), O_BINARY); /* make the stdio mode be
binary */
+ setmode(_fileno(stderr), O_BINARY); /* make the stdio mode be
binary */
+#endif
+
+ php_embed_module.ini_entries = malloc(sizeof(HARDCODED_INI));
+ memcpy(php_embed_module.ini_entries, HARDCODED_INI, sizeof(HARDCODED_INI));
+
if (argv) {
php_embed_module.executable_location = argv[0];
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/embed php_embed.c
helly Tue Mar 25 22:04:58 2008 UTC
Modified files:
/php-src/sapi/embed php_embed.c
Log:
- Fix memory leak found by Osman
- Merge strlen to sizof change from CLI
http://cvs.php.net/viewvc.cgi/php-src/sapi/embed/php_embed.c?r1=1.24&r2=1.25&diff_format=u
Index: php-src/sapi/embed/php_embed.c
diff -u php-src/sapi/embed/php_embed.c:1.24 php-src/sapi/embed/php_embed.c:1.25
--- php-src/sapi/embed/php_embed.c:1.24 Wed Mar 19 16:37:49 2008
+++ php-src/sapi/embed/php_embed.c Tue Mar 25 22:04:58 2008
@@ -15,7 +15,7 @@
| Author: Edin Kadribasic <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_embed.c,v 1.24 2008/03/19 16:37:49 rasmus Exp $ */
+/* $Id: php_embed.c,v 1.25 2008/03/25 22:04:58 helly Exp $ */
#include "php_embed.h"
#include
@@ -25,13 +25,13 @@
#include
#endif
-#define HARDCODED_INI \
- "html_errors=0\n" \
- "register_argc_argv=1\n"\
- "implicit_flush=1\n"\
- "output_buffering=0\n" \
- "max_execution_time=0\n"\
- "max_input_time=-1\n"
+const char HARDCODED_INI[] =
+ "html_errors=0\n"
+ "register_argc_argv=1\n"
+ "implicit_flush=1\n"
+ "output_buffering=0\n"
+ "max_execution_time=0\n"
+ "max_input_time=-1\n\0";
static char* php_embed_read_cookies(TSRMLS_D)
{
@@ -158,7 +158,6 @@
#ifdef ZTS
void ***tsrm_ls = NULL;
#endif
- int ini_entries_len = 0;
#ifdef HAVE_SIGNAL_H
#if defined(SIGPIPE) && defined(SIG_IGN)
@@ -171,6 +170,14 @@
#endif
#endif
+#ifdef ZTS
+ tsrm_startup(1, 1, 0, NULL);
+ tsrm_ls = ts_resource(0);
+ *ptsrm_ls = tsrm_ls;
+#endif
+
+ sapi_startup(&php_embed_module);
+
#ifdef PHP_WIN32
_fmode = _O_BINARY; /*sets default for file streams to
binary */
setmode(_fileno(stdin), O_BINARY); /* make the stdio mode be
binary */
@@ -178,21 +185,11 @@
setmode(_fileno(stderr), O_BINARY); /* make the stdio mode be
binary */
#endif
-#ifdef ZTS
- tsrm_startup(1, 1, 0, NULL);
- tsrm_ls = ts_resource(0);
- *ptsrm_ls = tsrm_ls;
-#endif
+ php_embed_module.ini_entries = malloc(sizeof(HARDCODED_INI));
+ memcpy(php_embed_module.ini_entries, HARDCODED_INI, sizeof(HARDCODED_INI));
php_embed_module.additional_functions = additional_functions;
- ini_entries_len = strlen(HARDCODED_INI);
- php_embed_module.ini_entries = malloc(ini_entries_len+2);
- memcpy(php_embed_module.ini_entries, HARDCODED_INI, ini_entries_len+1);
- php_embed_module.ini_entries[ini_entries_len+1] = 0;
-
- sapi_startup(&php_embed_module);
-
if (argv) {
php_embed_module.executable_location = argv[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) /sapi/cli php_cli.c
helly Tue Mar 25 21:58:29 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cli php_cli.c
Log:
- MFH Use sizeof rather than strlen and cleanup
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.22.2.7&r2=1.129.2.13.2.22.2.8&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.7
php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.8
--- php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.7 Tue Mar 18 22:23:21 2008
+++ php-src/sapi/cli/php_cli.c Tue Mar 25 21:58:29 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.129.2.13.2.22.2.7 2008/03/18 22:23:21 rasmus Exp $ */
+/* $Id: php_cli.c,v 1.129.2.13.2.22.2.8 2008/03/25 21:58:29 helly Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -111,13 +111,13 @@
#define PHP_MODE_REFLECTION_EXT_INFO11
#define PHP_MODE_SHOW_INI_CONFIG12
-#define HARDCODED_INI \
- "html_errors=0\n" \
- "register_argc_argv=1\n"\
- "implicit_flush=1\n"\
- "output_buffering=0\n" \
- "max_execution_time=0\n"\
- "max_input_time=-1\n"
+const char HARDCODED_INI[] =
+ "html_errors=0\n"
+ "register_argc_argv=1\n"
+ "implicit_flush=1\n"
+ "output_buffering=0\n"
+ "max_execution_time=0\n"
+ "max_input_time=-1\n\0";
static char *php_optarg = NULL;
static int php_optind = 1;
@@ -659,10 +659,9 @@
setmode(_fileno(stderr), O_BINARY); /* make the stdio mode
be binary */
#endif
- ini_entries_len = strlen(HARDCODED_INI);
- cli_sapi_module.ini_entries = malloc(ini_entries_len+2);
- memcpy(cli_sapi_module.ini_entries, HARDCODED_INI, ini_entries_len+1);
- cli_sapi_module.ini_entries[ini_entries_len+1] = 0;
+ ini_entries_len = sizeof(HARDCODED_INI)-2;
+ cli_sapi_module.ini_entries = malloc(sizeof(HARDCODED_INI));
+ memcpy(cli_sapi_module.ini_entries, HARDCODED_INI,
sizeof(HARDCODED_INI));
while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind,
0, 2))!=-1) {
switch (c) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cli php_cli.c
helly Tue Mar 25 21:58:03 2008 UTC
Modified files:
/php-src/sapi/cli php_cli.c
Log:
- Use sizeof rather than strlen and cleanup
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.187&r2=1.188&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.187 php-src/sapi/cli/php_cli.c:1.188
--- php-src/sapi/cli/php_cli.c:1.187Wed Mar 19 16:37:49 2008
+++ php-src/sapi/cli/php_cli.c Tue Mar 25 21:58:03 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.187 2008/03/19 16:37:49 rasmus Exp $ */
+/* $Id: php_cli.c,v 1.188 2008/03/25 21:58:03 helly Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -115,13 +115,13 @@
PHP_MODE_SHOW_INI_CONFIG
};
-#define HARDCODED_INI \
- "html_errors=0\n" \
- "register_argc_argv=1\n"\
- "implicit_flush=1\n"\
- "output_buffering=0\n" \
- "max_execution_time=0\n"\
- "max_input_time=-1\n"
+const char HARDCODED_INI[] =
+ "html_errors=0\n"
+ "register_argc_argv=1\n"
+ "implicit_flush=1\n"
+ "output_buffering=0\n"
+ "max_execution_time=0\n"
+ "max_input_time=-1\n\0";
static char *php_optarg = NULL;
static int php_optind = 1;
@@ -671,10 +671,9 @@
setmode(_fileno(stderr), O_BINARY); /* make the stdio mode
be binary */
#endif
- ini_entries_len = strlen(HARDCODED_INI);
- cli_sapi_module.ini_entries = malloc(ini_entries_len+2);
- memcpy(cli_sapi_module.ini_entries, HARDCODED_INI, ini_entries_len+1);
- cli_sapi_module.ini_entries[ini_entries_len+1] = 0;
+ ini_entries_len = sizeof(HARDCODED_INI)-2;
+ cli_sapi_module.ini_entries = malloc(sizeof(HARDCODED_INI));
+ memcpy(cli_sapi_module.ini_entries, HARDCODED_INI,
sizeof(HARDCODED_INI));
while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind,
0, 2))!=-1) {
switch (c) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
andrey Tue Mar 25 20:00:19 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: Fix typo, thank Jani :) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.150&r2=1.2027.2.547.2.965.2.151&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.150 php-src/NEWS:1.2027.2.547.2.965.2.151 --- php-src/NEWS:1.2027.2.547.2.965.2.150 Tue Mar 25 18:30:56 2008 +++ php-src/NEWSTue Mar 25 20:00:18 2008 @@ -151,7 +151,7 @@ (Nuno, Scott) - Fixed bug #43960 (strtotime() returns timestamp in the future when given a bogus string). -- Fixed bug #43832 (mysqi_get_charset() doesn't expose charset comment). +- Fixed bug #43832 (mysqli_get_charset() doesn't expose charset comment). (Andrey) - Fixed bug #43808 (date_create never fails (even when it should)). (Derick) - Fixed bug #43527 (DateTime created from a timestamp reports environment -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
andrey Tue Mar 25 18:30:56 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: news entry http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.149&r2=1.2027.2.547.2.965.2.150&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.149 php-src/NEWS:1.2027.2.547.2.965.2.150 --- php-src/NEWS:1.2027.2.547.2.965.2.149 Thu Mar 20 18:12:58 2008 +++ php-src/NEWSTue Mar 25 18:30:56 2008 @@ -151,6 +151,8 @@ (Nuno, Scott) - Fixed bug #43960 (strtotime() returns timestamp in the future when given a bogus string). +- Fixed bug #43832 (mysqi_get_charset() doesn't expose charset comment). + (Andrey) - Fixed bug #43808 (date_create never fails (even when it should)). (Derick) - Fixed bug #43527 (DateTime created from a timestamp reports environment timezone). (Derick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_nonapi.c /ext/mysqli/tests mysqli_stmt_datatype_change.phpt /ext/mysqlnd mysqlnd_charset.c mysqlnd_ps.c mysqlnd_structs.h
andrey Tue Mar 25 18:28:13 2008 UTC
Modified files:
/php-src/ext/mysqli mysqli_nonapi.c
/php-src/ext/mysqli/tests mysqli_stmt_datatype_change.phpt
/php-src/ext/mysqlndmysqlnd_charset.c mysqlnd_ps.c
mysqlnd_structs.h
Log:
MFB : Fix for Bug #43832 mysqi_get_charset() doesn't expose charset comment
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.82&r2=1.83&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.82
php-src/ext/mysqli/mysqli_nonapi.c:1.83
--- php-src/ext/mysqli/mysqli_nonapi.c:1.82 Tue Mar 18 16:58:42 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Tue Mar 25 18:28:12 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli_nonapi.c,v 1.82 2008/03/18 16:58:42 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.83 2008/03/25 18:28:12 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -706,7 +706,7 @@
{
MY_MYSQL*mysql;
zval*mysql_link;
- char*name = NULL, *collation =
NULL, *dir = NULL;
+ const char *name = NULL, *collation =
NULL, *dir = NULL, *comment = NULL;
uintminlength, maxlength, number,
state;
#if !defined(MYSQLI_USE_MYSQLND)
MY_CHARSET_INFO cs;
@@ -730,6 +730,7 @@
maxlength = cs.mbmaxlen;
number = cs.number;
state = cs.state;
+ comment = cs.comment;
#else
cs = mysql->mysql->charset;
name = cs->name;
@@ -737,25 +738,14 @@
minlength = cs->char_minlen;
maxlength = cs->char_maxlen;
number = cs->nr;
+ comment = cs->comment;
state = 1; /* all charsets are compiled in */
#endif
if (UG(unicode)) {
- UChar *ustr = NULL;
- int ulen;
-
- zend_string_to_unicode(UG(utf8_conv), &ustr, &ulen, (name) ?
name : "",
- (name) ?
strlen(name) : 0 TSRMLS_CC);
- add_property_unicodel(return_value, "charset", ustr, ulen, 1);
- efree(ustr);
- zend_string_to_unicode(UG(utf8_conv), &ustr, &ulen, (collation)
? collation : "",
- (collation) ?
strlen(collation) : 0 TSRMLS_CC);
- add_property_unicodel(return_value, "collation", ustr, ulen, 1);
- efree(ustr);
- zend_string_to_unicode(UG(utf8_conv), &ustr, &ulen, (dir) ? dir
: "",
- (dir) ?
strlen(dir) : 0 TSRMLS_CC);
- add_property_unicodel(return_value, "dir", ustr, ulen, 1);
- efree(ustr);
+ add_property_utf8_string(return_value, "charset", (name) ?
(char *)name : "", 1);
+ add_property_utf8_string(return_value, "collation", (collation)
? (char *)collation : "", 1);
+ add_property_utf8_string(return_value, "dir", (dir) ? (char
*)dir : "", 1);
} else {
add_property_string(return_value, "charset", (name) ? (char
*)name : "", 1);
add_property_string(return_value, "collation",(collation) ?
(char *)collation : "", 1);
@@ -765,6 +755,11 @@
add_property_long(return_value, "max_length", maxlength);
add_property_long(return_value, "number", number);
add_property_long(return_value, "state", state);
+ if (UG(unicode)) {
+ add_property_utf8_string(return_value, "comment", (comment) ?
(char *)comment : "", 1);
+ } else {
+ add_property_string(return_value, "comment", (comment) ? (char
*)comment : "", 1);
+ }
}
/* }}} */
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
diff -u php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt:1.1
php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt:1.2
--- php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt:1.1 Thu Mar
20 13:25:49 2008
+++ php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt Tue Mar 25
18:28:13 2008
@@ -1,5 +1,5 @@
--TEST--
-mysqli_stmt_bind_param() - playing with references
+Playing with datatype change between prepare and execute
--SKIPIF--
query("create table type_change(a int, b char(10))");
$c1->query("insert into type_change values (1, 'one'), (2, 'two')");
$s1 = $c1->prepare("select a from type_change order by a");
- var_dump($s1);
var_dump($s1->execute(), $s1->bind_result($col1));
echo "
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_nonapi.c /ext/mysqli/tests mysqli_stmt_datatype_change.phpt /ext/mysqlnd mysqlnd_charset.c mysqlnd_ps.c mysqlnd_structs.h
andrey Tue Mar 25 18:27:17 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli_nonapi.c
/php-src/ext/mysqli/tests mysqli_stmt_datatype_change.phpt
/php-src/ext/mysqlndmysqlnd_charset.c mysqlnd_ps.c
mysqlnd_structs.h
Log:
Small updates & a fix for
Bug #43832 mysqi_get_charset() doesn't expose charset comment
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.7.2.5.2.9&r2=1.54.2.7.2.5.2.10&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.9
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.10
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.9 Tue Mar 18 16:57:31 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Tue Mar 25 18:27:17 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.9 2008/03/18 16:57:31 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.10 2008/03/25 18:27:17 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -687,7 +687,7 @@
{
MY_MYSQL*mysql;
zval*mysql_link;
- char*name = NULL, *collation =
NULL, *dir = NULL;
+ const char *name = NULL, *collation =
NULL, *dir = NULL, *comment = NULL;
uintminlength, maxlength, number,
state;
#if !defined(MYSQLI_USE_MYSQLND)
MY_CHARSET_INFO cs;
@@ -711,6 +711,7 @@
maxlength = cs.mbmaxlen;
number = cs.number;
state = cs.state;
+ comment = cs.comment;
#else
cs = mysql->mysql->charset;
name = cs->name;
@@ -718,6 +719,7 @@
minlength = cs->char_minlen;
maxlength = cs->char_maxlen;
number = cs->nr;
+ comment = cs->comment;
state = 1; /* all charsets are compiled in */
#endif
@@ -728,6 +730,7 @@
add_property_long(return_value, "max_length", maxlength);
add_property_long(return_value, "number", number);
add_property_long(return_value, "state", state);
+ add_property_string(return_value, "comment", (comment) ? (char
*)comment : "", 1);
}
/* }}} */
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
diff -u php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt:1.1.2.2
php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt:1.1.2.3
--- php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt:1.1.2.2 Thu Mar
20 14:03:30 2008
+++ php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt Tue Mar 25
18:27:17 2008
@@ -1,5 +1,5 @@
--TEST--
-mysqli_stmt_bind_param() - playing with references
+Playing with datatype change between prepare and execute
--SKIPIF--
query("create table type_change(a int, b char(10))");
$c1->query("insert into type_change values (1, 'one'), (2, 'two')");
$s1 = $c1->prepare("select a from type_change order by a");
- var_dump($s1);
var_dump($s1->execute(), $s1->bind_result($col1));
echo " Row 1\n";
var_dump($s1->fetch());
@@ -58,26 +57,6 @@
echo "done!";
?>
--EXPECTF--
-object(mysqli_stmt)#%d (%d) {
- ["affected_rows"]=>
- int(0)
- ["insert_id"]=>
- int(0)
- ["num_rows"]=>
- int(0)
- ["param_count"]=>
- int(0)
- ["field_count"]=>
- int(1)
- ["errno"]=>
- int(0)
- ["error"]=>
- string(0) ""
- ["sqlstate"]=>
- string(5) "0"
- ["id"]=>
- int(1)
-}
bool(true)
bool(true)
Row 1
@@ -104,26 +83,6 @@
done!
--UEXPECTF--
-object(mysqli_stmt)#%d (%d) {
- [u"affected_rows"]=>
- int(0)
- [u"insert_id"]=>
- int(0)
- [u"num_rows"]=>
- int(0)
- [u"param_count"]=>
- int(0)
- [u"field_count"]=>
- int(1)
- [u"errno"]=>
- int(0)
- [u"error"]=>
- unicode(0) ""
- [u"sqlstate"]=>
- unicode(5) "0"
- [u"id"]=>
- int(1)
-}
bool(true)
bool(true)
Row 1
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_charset.c?r1=1.2.2.5&r2=1.2.2.6&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_charset.c
diff -u php-src/ext/mysqlnd/mysqlnd_charset.c:1.2.2.5
php-src/ext/mysqlnd/mysqlnd_charset.c:1.2.2.6
--- php-src/ext/mysqlnd/mysqlnd_charset.c:1.2.2.5 Wed Jan 23 19:11:28 2008
+++ php-src/ext/mysqlnd/mysqlnd_charset.c Tue Mar 25 18:27:17 2008
@@ -295,136 +295,136 @@
/* {{{ mysqlnd_charsets */
const MYSQLND_CHARSET mysqlnd_charsets[] =
{
- { 1, "big5","big5_chinese_ci", 1, 2, mysqlnd_mbcharlen_big5,
check_mb_big5},
- { 3, "dec8", "dec8_swedisch_ci", 1, 1, NULL, NULL},
- { 4, "cp850", "cp850_general_ci", 1, 1, NULL, NULL},
- { 6,
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/oci8 oci8_statement.c
sixdTue Mar 25 17:38:07 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/oci8 oci8_statement.c Log: revert stmt release on connection error change (and sync with PHP 6) http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_statement.c?r1=1.7.2.14.2.28.2.6&r2=1.7.2.14.2.28.2.7&diff_format=u Index: php-src/ext/oci8/oci8_statement.c diff -u php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.28.2.6 php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.28.2.7 --- php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.28.2.6 Sat Mar 22 01:27:50 2008 +++ php-src/ext/oci8/oci8_statement.c Tue Mar 25 17:38:07 2008 @@ -25,7 +25,7 @@ +--+ */ -/* $Id: oci8_statement.c,v 1.7.2.14.2.28.2.6 2008/03/22 01:27:50 sixd Exp $ */ +/* $Id: oci8_statement.c,v 1.7.2.14.2.28.2.7 2008/03/25 17:38:07 sixd Exp $ */ #ifdef HAVE_CONFIG_H @@ -82,7 +82,7 @@ connection->errcode = php_oci_error(connection->err, connection->errcode TSRMLS_CC); #if HAVE_OCI_STMT_PREPARE2 - PHP_OCI_CALL(OCIStmtRelease, (statement->stmt, statement->err, NULL, 0, OCI_STRLS_CACHE_DELETE)); + PHP_OCI_CALL(OCIStmtRelease, (statement->stmt, statement->err, NULL, 0, statement->errcode ? OCI_STRLS_CACHE_DELETE : OCI_DEFAULT)); PHP_OCI_CALL(OCIHandleFree,(statement->err, OCI_HTYPE_ERROR)); #else PHP_OCI_CALL(OCIHandleFree,(statement->stmt, OCI_HTYPE_STMT)); -- 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/oci8 oci8_lob.c /ext/oci8/tests lob_028.phpt
sixdTue Mar 25 17:20:27 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/oci8 oci8_lob.c /php-src/ext/oci8/tests lob_028.phpt Log: Remove trailing period from error thus syncing with PHP 6 http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_lob.c?r1=1.7.2.6.2.14.2.5&r2=1.7.2.6.2.14.2.6&diff_format=u Index: php-src/ext/oci8/oci8_lob.c diff -u php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.14.2.5 php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.14.2.6 --- php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.14.2.5Sat Mar 22 01:27:50 2008 +++ php-src/ext/oci8/oci8_lob.c Tue Mar 25 17:20:27 2008 @@ -25,7 +25,7 @@ +--+ */ -/* $Id: oci8_lob.c,v 1.7.2.6.2.14.2.5 2008/03/22 01:27:50 sixd Exp $ */ +/* $Id: oci8_lob.c,v 1.7.2.6.2.14.2.6 2008/03/25 17:20:27 sixd Exp $ */ @@ -62,7 +62,7 @@ /* these three are allowed */ break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown descriptor type %ld.", type); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown descriptor type %ld", type); return NULL; break; } http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/lob_028.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/oci8/tests/lob_028.phpt diff -u php-src/ext/oci8/tests/lob_028.phpt:1.1.2.2 php-src/ext/oci8/tests/lob_028.phpt:1.1.2.2.2.1 --- php-src/ext/oci8/tests/lob_028.phpt:1.1.2.2 Tue Dec 12 09:33:33 2006 +++ php-src/ext/oci8/tests/lob_028.phpt Tue Mar 25 17:20:27 2008 @@ -70,15 +70,15 @@ resource(%d) of type (oci8 descriptor) } -Warning: oci_new_descriptor(): Unknown descriptor type %d. in %s on line %d +Warning: oci_new_descriptor(): Unknown descriptor type %d in %s on line %d NULL -Warning: oci_new_descriptor(): Unknown descriptor type %d. in %s on line %d +Warning: oci_new_descriptor(): Unknown descriptor type %d in %s on line %d NULL -Warning: oci_new_descriptor(): Unknown descriptor type %d. in %s on line %d +Warning: oci_new_descriptor(): Unknown descriptor type %d in %s on line %d NULL -Warning: oci_new_descriptor(): Unknown descriptor type %d. in %s on line %d +Warning: oci_new_descriptor(): Unknown descriptor type %d in %s on line %d NULL 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) /main logos.h
johannesTue Mar 25 17:17:56 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main logos.h
Log:
- MFH: New egg
http://cvs.php.net/viewvc.cgi/php-src/main/logos.h?r1=1.14.2.3.2.2.2.1&r2=1.14.2.3.2.2.2.2&diff_format=u
Index: php-src/main/logos.h
diff -u php-src/main/logos.h:1.14.2.3.2.2.2.1
php-src/main/logos.h:1.14.2.3.2.2.2.2
--- php-src/main/logos.h:1.14.2.3.2.2.2.1 Mon Dec 31 07:17:17 2007
+++ php-src/main/logos.hTue Mar 25 17:17:56 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: logos.h,v 1.14.2.3.2.2.2.1 2007/12/31 07:17:17 sebastian Exp $ */
+/* $Id: logos.h,v 1.14.2.3.2.2.2.2 2008/03/25 17:17:56 johannes Exp $ */
#define CONTEXT_TYPE_IMAGE_GIF "Content-Type: image/gif"
@@ -494,383 +494,587 @@
static const unsigned char php_egg_logo[] = {
71, 73, 70, 56, 57, 97, 120, 0, 67, 0,
- 247, 0, 0, 0, 255, 0, 107, 114, 178, 0,
- 0, 0, 31, 31, 31, 255, 255, 255, 106, 113,
- 176, 63, 63, 63, 127, 127, 127, 106, 112, 174,
- 191, 191, 191, 105, 111, 171, 223, 223, 223, 239,
- 239, 239, 144, 149, 197, 106, 111, 173, 245, 246,
- 250, 105, 110, 170, 218, 219, 235, 47, 47, 47,
- 162, 166, 206, 35, 36, 40, 153, 158, 202, 95,
-95, 95, 175, 175, 175, 88, 93, 141, 159, 159,
- 159, 116, 122, 182, 125, 131, 187, 143, 143, 143,
-38, 38, 41, 104, 108, 167, 171, 175, 211, 105,
- 109, 168, 102, 102, 153, 104, 108, 165, 45, 46,
-58, 181, 184, 216, 111, 111, 111, 134, 140, 192,
- 102, 108, 168, 79, 79, 79, 199, 202, 226, 40,
-41, 49, 92, 98, 150, 53, 53, 63, 236, 237,
- 245, 130, 130, 171, 122, 122, 160, 104, 107, 163,
-50, 51, 67, 45, 45, 52, 207, 207, 207, 69,
-72, 104, 15, 15, 15, 61, 61, 74, 227, 228,
- 240, 59, 62, 86, 103, 106, 162, 107, 107, 139,
-73, 77, 113, 102, 103, 156, 54, 56, 76, 97,
- 103, 159, 137, 137, 182, 35, 35, 38, 190, 193,
- 221, 145, 145, 193, 103, 105, 159, 78, 82, 122,
-76, 76, 95, 147, 148, 200, 92, 92, 117, 105,
- 105, 156, 103, 105, 160, 150, 150, 202, 64, 67,
-95, 114, 114, 149, 108, 108, 159, 143, 143, 194,
-84, 84, 106, 140, 140, 191, 102, 104, 157, 48,
-48, 61, 27, 29, 42, 114, 114, 165, 83, 88,
- 132, 153, 153, 204, 121, 126, 186, 127, 127, 178,
- 208, 210, 230, 149, 149, 200, 146, 146, 197, 141,
- 143, 197, 55, 55, 67, 144, 145, 199, 133, 133,
- 184, 124, 124, 175, 110, 115, 171, 130, 133, 191,
-88, 91, 137, 86, 92, 144, 154, 156, 172, 87,
-92, 139, 85, 86, 125, 118, 123, 184, 121, 122,
- 172, 124, 128, 187, 82, 86, 130, 39, 39, 46,
-99, 99, 128, 69, 69, 85, 97, 101, 153, 75,
-75, 107, 115, 121, 182, 135, 138, 194, 101, 107,
- 165, 82, 84, 101, 102, 102, 140, 53, 57, 89,
-69, 71, 101, 137, 137, 188, 109, 116, 179, 130,
- 130, 182, 57, 57, 76, 93, 99, 155, 117, 117,
- 168, 62, 63, 86, 84, 84, 122, 79, 79, 114,
- 112, 117, 177, 58, 58, 71, 127, 131, 189, 106,
- 106, 150, 76, 76, 101, 134, 135, 187, 20, 20,
-31, 66, 71, 111, 125, 129, 182, 172, 173, 180,
-86, 88, 131, 229, 230, 234, 108, 112, 171, 100,
- 105, 161, 161, 165, 203, 53, 53, 70, 95, 97,
- 146, 58, 60, 81, 217, 219, 234, 195, 196, 208,
-82, 85, 125, 112, 118, 181, 82, 82, 106, 114,
- 117, 175, 154, 157, 195, 134, 134, 179, 111, 111,
- 162, 6, 7, 11, 110, 111, 146, 93, 93, 138,
-77, 79, 116, 115, 119, 179, 103, 108, 161, 60,
-64, 100, 98, 98, 145, 40, 40, 47, 51, 51,
-63, 69, 69, 95, 73, 78, 122, 197, 198, 202,
-54, 54, 58, 13, 14, 22, 108, 114, 174, 149,
- 152, 184, 101, 108, 167, 88, 88, 130, 106, 108,
- 162, 86, 91, 141, 84, 84, 116, 86, 86, 90,
- 129, 131, 186, 132, 135, 181, 160, 163, 183, 211,
- 212, 224, 91, 91, 123, 109, 109, 117, 104, 104,
- 135, 86, 86, 115, 90, 92, 108, 81, 83, 122,
- 103, 106, 130, 70, 70, 99, 121, 126, 170, 139,
- 139, 186, 73, 74, 94, 109, 109, 148, 139, 140,
- 189, 135, 138, 162, 176, 179, 199, 115, 115, 115,
- 106, 106, 144, 59, 63, 98, 67, 69, 96, 241,
- 241, 241, 102, 105, 149, 120, 120, 162, 68, 68,
-90, 89, 89, 115, 51, 52, 79, 113, 113, 152,
-33, 35, 55, 189, 190, 215, 79, 79, 104, 213,
- 214, 218, 94, 95, 142, 163, 164, 176, 86, 89,
- 133, 112, 112, 156, 80, 81, 118, 63, 65, 90,
- 102, 103, 124, 126, 129, 157, 72, 72, 98, 150,
- 150, 154, 72, 74, 100, 112, 112, 151, 138, 139,
- 192, 122, 125, 180, 49,
[PHP-CVS] cvs: php-src /main logos.h
johannesTue Mar 25 17:17:43 2008 UTC
Modified files:
/php-src/main logos.h
Log:
- New egg
http://cvs.php.net/viewvc.cgi/php-src/main/logos.h?r1=1.20&r2=1.21&diff_format=u
Index: php-src/main/logos.h
diff -u php-src/main/logos.h:1.20 php-src/main/logos.h:1.21
--- php-src/main/logos.h:1.20 Mon Dec 31 07:12:18 2007
+++ php-src/main/logos.hTue Mar 25 17:17:42 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: logos.h,v 1.20 2007/12/31 07:12:18 sebastian Exp $ */
+/* $Id: logos.h,v 1.21 2008/03/25 17:17:42 johannes Exp $ */
#define CONTEXT_TYPE_IMAGE_GIF "Content-Type: image/gif"
@@ -494,383 +494,587 @@
static const unsigned char php_egg_logo[] = {
71, 73, 70, 56, 57, 97, 120, 0, 67, 0,
- 247, 0, 0, 0, 255, 0, 107, 114, 178, 0,
- 0, 0, 31, 31, 31, 255, 255, 255, 106, 113,
- 176, 63, 63, 63, 127, 127, 127, 106, 112, 174,
- 191, 191, 191, 105, 111, 171, 223, 223, 223, 239,
- 239, 239, 144, 149, 197, 106, 111, 173, 245, 246,
- 250, 105, 110, 170, 218, 219, 235, 47, 47, 47,
- 162, 166, 206, 35, 36, 40, 153, 158, 202, 95,
-95, 95, 175, 175, 175, 88, 93, 141, 159, 159,
- 159, 116, 122, 182, 125, 131, 187, 143, 143, 143,
-38, 38, 41, 104, 108, 167, 171, 175, 211, 105,
- 109, 168, 102, 102, 153, 104, 108, 165, 45, 46,
-58, 181, 184, 216, 111, 111, 111, 134, 140, 192,
- 102, 108, 168, 79, 79, 79, 199, 202, 226, 40,
-41, 49, 92, 98, 150, 53, 53, 63, 236, 237,
- 245, 130, 130, 171, 122, 122, 160, 104, 107, 163,
-50, 51, 67, 45, 45, 52, 207, 207, 207, 69,
-72, 104, 15, 15, 15, 61, 61, 74, 227, 228,
- 240, 59, 62, 86, 103, 106, 162, 107, 107, 139,
-73, 77, 113, 102, 103, 156, 54, 56, 76, 97,
- 103, 159, 137, 137, 182, 35, 35, 38, 190, 193,
- 221, 145, 145, 193, 103, 105, 159, 78, 82, 122,
-76, 76, 95, 147, 148, 200, 92, 92, 117, 105,
- 105, 156, 103, 105, 160, 150, 150, 202, 64, 67,
-95, 114, 114, 149, 108, 108, 159, 143, 143, 194,
-84, 84, 106, 140, 140, 191, 102, 104, 157, 48,
-48, 61, 27, 29, 42, 114, 114, 165, 83, 88,
- 132, 153, 153, 204, 121, 126, 186, 127, 127, 178,
- 208, 210, 230, 149, 149, 200, 146, 146, 197, 141,
- 143, 197, 55, 55, 67, 144, 145, 199, 133, 133,
- 184, 124, 124, 175, 110, 115, 171, 130, 133, 191,
-88, 91, 137, 86, 92, 144, 154, 156, 172, 87,
-92, 139, 85, 86, 125, 118, 123, 184, 121, 122,
- 172, 124, 128, 187, 82, 86, 130, 39, 39, 46,
-99, 99, 128, 69, 69, 85, 97, 101, 153, 75,
-75, 107, 115, 121, 182, 135, 138, 194, 101, 107,
- 165, 82, 84, 101, 102, 102, 140, 53, 57, 89,
-69, 71, 101, 137, 137, 188, 109, 116, 179, 130,
- 130, 182, 57, 57, 76, 93, 99, 155, 117, 117,
- 168, 62, 63, 86, 84, 84, 122, 79, 79, 114,
- 112, 117, 177, 58, 58, 71, 127, 131, 189, 106,
- 106, 150, 76, 76, 101, 134, 135, 187, 20, 20,
-31, 66, 71, 111, 125, 129, 182, 172, 173, 180,
-86, 88, 131, 229, 230, 234, 108, 112, 171, 100,
- 105, 161, 161, 165, 203, 53, 53, 70, 95, 97,
- 146, 58, 60, 81, 217, 219, 234, 195, 196, 208,
-82, 85, 125, 112, 118, 181, 82, 82, 106, 114,
- 117, 175, 154, 157, 195, 134, 134, 179, 111, 111,
- 162, 6, 7, 11, 110, 111, 146, 93, 93, 138,
-77, 79, 116, 115, 119, 179, 103, 108, 161, 60,
-64, 100, 98, 98, 145, 40, 40, 47, 51, 51,
-63, 69, 69, 95, 73, 78, 122, 197, 198, 202,
-54, 54, 58, 13, 14, 22, 108, 114, 174, 149,
- 152, 184, 101, 108, 167, 88, 88, 130, 106, 108,
- 162, 86, 91, 141, 84, 84, 116, 86, 86, 90,
- 129, 131, 186, 132, 135, 181, 160, 163, 183, 211,
- 212, 224, 91, 91, 123, 109, 109, 117, 104, 104,
- 135, 86, 86, 115, 90, 92, 108, 81, 83, 122,
- 103, 106, 130, 70, 70, 99, 121, 126, 170, 139,
- 139, 186, 73, 74, 94, 109, 109, 148, 139, 140,
- 189, 135, 138, 162, 176, 179, 199, 115, 115, 115,
- 106, 106, 144, 59, 63, 98, 67, 69, 96, 241,
- 241, 241, 102, 105, 149, 120, 120, 162, 68, 68,
-90, 89, 89, 115, 51, 52, 79, 113, 113, 152,
-33, 35, 55, 189, 190, 215, 79, 79, 104, 213,
- 214, 218, 94, 95, 142, 163, 164, 176, 86, 89,
- 133, 112, 112, 156, 80, 81, 118, 63, 65, 90,
- 102, 103, 124, 126, 129, 157, 72, 72, 98, 150,
- 150, 154, 72, 74, 100, 112, 112, 151, 138, 139,
- 192, 122, 125, 180, 49, 50, 64, 78, 78, 110,
- 119, 119, 157, 125, 126, 174, 77, 81, 119, 125,
- 126, 180, 56, 56,
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/array bug42177.phpt
dmitry Tue Mar 25 07:01:23 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/array bug42177.phpt Log: Fixed test (removed leaks becaue of cyrcular references) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug42177.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/array/bug42177.phpt diff -u php-src/ext/standard/tests/array/bug42177.phpt:1.1.2.1 php-src/ext/standard/tests/array/bug42177.phpt:1.1.2.2 --- php-src/ext/standard/tests/array/bug42177.phpt:1.1.2.1 Wed Mar 12 19:13:00 2008 +++ php-src/ext/standard/tests/array/bug42177.phpt Tue Mar 25 07:01:22 2008 @@ -19,6 +19,7 @@ $a2 = array( 'key1' => &$a1 ); $a1 = array_merge_recursive( $a1, $a2 ); $a1 = array_merge_recursive( $a1, $a2 ); +$a1['key1'] = null; unset( $a1, $a2 ); $x = 'foo'; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
