[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
stasSat Nov 29 00:49:59 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: report fix http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1340&r2=1.2027.2.547.2.1341&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1340 php-src/NEWS:1.2027.2.547.2.1341 --- php-src/NEWS:1.2027.2.547.2.1340Fri Nov 28 11:56:50 2008 +++ php-src/NEWSSat Nov 29 00:49:58 2008 @@ -1,6 +1,9 @@ PHPNEWS ||| ?? Dec 2008, PHP 5.2.7 +- Fixed missing initialization of BG(page_uid) and BG(page_gid), + reported by Maksymilian Arciemowicz. (Stas) + - Fixed bug #46366 (bad cwd with / as pathinfo). (Dmitry) 27 Nov 2008, PHP 5.2.7RC5 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
stasSat Nov 29 00:47:51 2008 UTC Modified files: /php-src/ext/standard basic_functions.c Log: MFB: init BG(page_uid) and BG(page_gid) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.941&r2=1.942&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.941 php-src/ext/standard/basic_functions.c:1.942 --- php-src/ext/standard/basic_functions.c:1.941Wed Nov 26 04:08:07 2008 +++ php-src/ext/standard/basic_functions.c Sat Nov 29 00:47:51 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.941 2008/11/26 04:08:07 lbarnaud Exp $ */ +/* $Id: basic_functions.c,v 1.942 2008/11/29 00:47:51 stas Exp $ */ #include "php.h" #include "php_streams.h" @@ -3440,6 +3440,8 @@ #endif BG(incomplete_class) = incomplete_class_entry; + BG(page_uid) = -1; + BG(page_gid) = -1; } /* }}} */ @@ -3743,6 +3745,8 @@ PHP_RSHUTDOWN(user_filters)(SHUTDOWN_FUNC_ARGS_PASSTHRU); + BG(page_uid) = -1; + BG(page_gid) = -1; return SUCCESS; } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache mod_php.c
stasSat Nov 29 00:46:27 2008 UTC
Modified files:
/php-src/sapi/apachemod_php.c
Log:
MFB: init server context before config variables are processed
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php.c?r1=1.11&r2=1.12&diff_format=u
Index: php-src/sapi/apache/mod_php.c
diff -u php-src/sapi/apache/mod_php.c:1.11 php-src/sapi/apache/mod_php.c:1.12
--- php-src/sapi/apache/mod_php.c:1.11 Tue Nov 25 00:33:10 2008
+++ php-src/sapi/apache/mod_php.c Sat Nov 29 00:46:27 2008
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: mod_php.c,v 1.11 2008/11/25 00:33:10 stas Exp $ */
+/* $Id: mod_php.c,v 1.12 2008/11/29 00:46:27 stas Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -606,6 +606,8 @@
return OK;
}
+ SG(server_context) = r;
+
zend_first_try {
/* Make sure file exists */
@@ -663,8 +665,6 @@
/* Init timeout */
hard_timeout("send", r);
- SG(server_context) = r;
-
php_save_umask();
add_common_vars(r);
add_cgi_vars(r);
--
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/apache mod_php5.c
stasSat Nov 29 00:45:31 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/apachemod_php5.c
Log:
MFB: init server context before config variables are processed
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php5.c?r1=1.19.2.7.2.13.2.9&r2=1.19.2.7.2.13.2.10&diff_format=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.19.2.7.2.13.2.9
php-src/sapi/apache/mod_php5.c:1.19.2.7.2.13.2.10
--- php-src/sapi/apache/mod_php5.c:1.19.2.7.2.13.2.9Mon Nov 24 22:23:11 2008
+++ php-src/sapi/apache/mod_php5.c Sat Nov 29 00:45:31 2008
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: mod_php5.c,v 1.19.2.7.2.13.2.9 2008/11/24 22:23:11 stas Exp $ */
+/* $Id: mod_php5.c,v 1.19.2.7.2.13.2.10 2008/11/29 00:45:31 stas Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -613,6 +613,8 @@
return OK;
}
+ SG(server_context) = r;
+
zend_first_try {
/* Make sure file exists */
@@ -670,8 +672,6 @@
/* Init timeout */
hard_timeout("send", r);
- SG(server_context) = r;
-
php_save_umask();
add_common_vars(r);
add_cgi_vars(r);
--
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 basic_functions.c
stasSat Nov 29 00:44:33 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard basic_functions.c Log: MFB: init BG(page_uid) and BG(page_gid) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.76&r2=1.725.2.31.2.64.2.77&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.76 php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.77 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.76 Wed Nov 26 04:08:19 2008 +++ php-src/ext/standard/basic_functions.c Sat Nov 29 00:44:33 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.76 2008/11/26 04:08:19 lbarnaud Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.77 2008/11/29 00:44:33 stas Exp $ */ #include "php.h" #include "php_streams.h" @@ -3458,6 +3458,8 @@ #endif BG(incomplete_class) = incomplete_class_entry; + BG(page_uid) = -1; + BG(page_gid) = -1; } /* }}} */ @@ -3766,6 +3768,8 @@ PHP_RSHUTDOWN(user_filters)(SHUTDOWN_FUNC_ARGS_PASSTHRU); + BG(page_uid) = -1; + BG(page_gid) = -1; return SUCCESS; } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard basic_functions.c
stasFri Nov 28 23:27:47 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard basic_functions.c Log: properly initialize BG(page_uid) and BG(page_gid) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.78&r2=1.725.2.31.2.79&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.78 php-src/ext/standard/basic_functions.c:1.725.2.31.2.79 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.78 Wed Nov 26 04:08:30 2008 +++ php-src/ext/standard/basic_functions.c Fri Nov 28 23:27:46 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.78 2008/11/26 04:08:30 lbarnaud Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.79 2008/11/28 23:27:46 stas Exp $ */ #include "php.h" #include "php_streams.h" @@ -3917,6 +3917,8 @@ memset(&BG(mblen_state), 0, sizeof(BG(mblen_state))); #endif BG(incomplete_class) = incomplete_class_entry; + BG(page_uid) = -1; + BG(page_gid) = -1; } @@ -4220,6 +4222,8 @@ PHP_RSHUTDOWN(user_filters)(SHUTDOWN_FUNC_ARGS_PASSTHRU); + BG(page_uid) = -1; + BG(page_gid) = -1; return SUCCESS; } -- 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) /sapi/apache mod_php5.c
stasFri Nov 28 23:22:39 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/apachemod_php5.c
Log:
init SG(server_context) before processing configs
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php5.c?r1=1.19.2.7.2.15&r2=1.19.2.7.2.16&diff_format=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.19.2.7.2.15
php-src/sapi/apache/mod_php5.c:1.19.2.7.2.16
--- php-src/sapi/apache/mod_php5.c:1.19.2.7.2.15Mon Nov 24 22:18:25 2008
+++ php-src/sapi/apache/mod_php5.c Fri Nov 28 23:22:39 2008
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: mod_php5.c,v 1.19.2.7.2.15 2008/11/24 22:18:25 stas Exp $ */
+/* $Id: mod_php5.c,v 1.19.2.7.2.16 2008/11/28 23:22:39 stas Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -597,6 +597,8 @@
return OK;
}
+ SG(server_context) = r;
+
zend_first_try {
/* Make sure file exists */
@@ -654,8 +656,6 @@
/* Init timeout */
hard_timeout("send", r);
- SG(server_context) = r;
-
php_save_umask();
add_common_vars(r);
add_cgi_vars(r);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_embedded.c
johannesFri Nov 28 20:38:20 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli_embedded.c
Log:
MFH: Change to zend_parse_parameters
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_embedded.c?r1=1.4.2.1.2.2.2.2&r2=1.4.2.1.2.2.2.3&diff_format=u
Index: php-src/ext/mysqli/mysqli_embedded.c
diff -u php-src/ext/mysqli/mysqli_embedded.c:1.4.2.1.2.2.2.2
php-src/ext/mysqli/mysqli_embedded.c:1.4.2.1.2.2.2.3
--- php-src/ext/mysqli/mysqli_embedded.c:1.4.2.1.2.2.2.2Mon Dec 31
07:17:10 2007
+++ php-src/ext/mysqli/mysqli_embedded.cFri Nov 28 20:38:20 2008
@@ -32,36 +32,35 @@
PHP_FUNCTION(mysqli_embedded_server_start)
{
#ifdef HAVE_EMBEDDED_MYSQLI
+ long start;
+ zval *args;
+ zval *grps;
+
int argc = 0;
char **arguments;
char **groups;
- zval **args, **grps, **start;
HashPosition pos;
int index, rc;
- if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &start, &args,
&grps) == FAILURE) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "laa", &start,
&args, &grps) == FAILURE) {
+ return;
}
- convert_to_long_ex(start);
- convert_to_array_ex(args);
- convert_to_array_ex(grps);
-
- if (!Z_LVAL_PP(start)) {
+ if (!start) {
mysql_server_init(-1,NULL, NULL);
RETURN_TRUE;
}
/* get arguments */
- if ((argc = zend_hash_num_elements(HASH_OF(*args {
+ if ((argc = zend_hash_num_elements(HASH_OF(args {
arguments = safe_emalloc(sizeof(char *), argc + 1, 0);
arguments[0] = NULL;
- zend_hash_internal_pointer_reset_ex(HASH_OF(*args), &pos);
+ zend_hash_internal_pointer_reset_ex(HASH_OF(args), &pos);
- for (index = 0;; zend_hash_move_forward_ex(HASH_OF(*args),
&pos)) {
+ for (index = 0;; zend_hash_move_forward_ex(HASH_OF(args),
&pos)){
zval **item;
- if (zend_hash_get_current_data_ex(HASH_OF(*args), (void
**) &item, &pos) == FAILURE) {
+ if (zend_hash_get_current_data_ex(HASH_OF(args), (void
**) &item, &pos) == FAILURE) {
break;
}
@@ -73,16 +72,16 @@
}
/* get groups */
- if ((zend_hash_num_elements(HASH_OF(*grps {
- groups = safe_emalloc(sizeof(char *),
zend_hash_num_elements(HASH_OF(*grps)) + 1, 0);
+ if ((zend_hash_num_elements(HASH_OF(grps {
+ groups = safe_emalloc(sizeof(char *),
zend_hash_num_elements(HASH_OF(grps)) + 1, 0);
groups[0] = NULL;
- zend_hash_internal_pointer_reset_ex(HASH_OF(*grps), &pos);
+ zend_hash_internal_pointer_reset_ex(HASH_OF(grps), &pos);
- for (index = 0;; zend_hash_move_forward_ex(HASH_OF(*grps),
&pos)) {
+ for (index = 0;; zend_hash_move_forward_ex(HASH_OF(grps),
&pos)){
zval ** item;
- if (zend_hash_get_current_data_ex(HASH_OF(*grps), (void
**) &item, &pos) == FAILURE) {
+ if (zend_hash_get_current_data_ex(HASH_OF(grps), (void
**) &item, &pos) == FAILURE) {
break;
}
--
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_embedded.c
johannesFri Nov 28 20:36:48 2008 UTC
Modified files:
/php-src/ext/mysqli mysqli_embedded.c
Log:
Change to zend_parse_parameters
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_embedded.c?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/mysqli/mysqli_embedded.c
diff -u php-src/ext/mysqli/mysqli_embedded.c:1.9
php-src/ext/mysqli/mysqli_embedded.c:1.10
--- php-src/ext/mysqli/mysqli_embedded.c:1.9Mon Dec 31 07:12:11 2007
+++ php-src/ext/mysqli/mysqli_embedded.cFri Nov 28 20:36:48 2008
@@ -34,36 +34,35 @@
PHP_FUNCTION(mysqli_embedded_server_start)
{
#ifdef HAVE_EMBEDDED_MYSQLI
+ long start;
+ zval *args;
+ zval *grps;
+
int argc = 0;
char **arguments;
char **groups;
- zval **args, **grps, **start;
HashPosition pos;
int index, rc;
- if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &start, &args,
&grps) == FAILURE) {
- ZEND_WRONG_PARAM_COUNT();
- }
-
- convert_to_long_ex(start);
- convert_to_array_ex(args);
- convert_to_array_ex(grps);
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "laa", &start,
&args, &grps) == FAILURE) {
+ return;
+ }
- if (!Z_LVAL_PP(start)) {
+ if (!start) {
mysql_server_init(-1,NULL, NULL);
RETURN_TRUE;
}
/* get arguments */
- if ((argc = zend_hash_num_elements(HASH_OF(*args {
+ if ((argc = zend_hash_num_elements(HASH_OF(args {
arguments = safe_emalloc(sizeof(char *), argc + 1, 0);
arguments[0] = NULL;
- zend_hash_internal_pointer_reset_ex(HASH_OF(*args), &pos);
+ zend_hash_internal_pointer_reset_ex(HASH_OF(args), &pos);
- for (index = 0;; zend_hash_move_forward_ex(HASH_OF(*args),
&pos)) {
+ for (index = 0;; zend_hash_move_forward_ex(HASH_OF(args),
&pos)){
zval **item;
- if (zend_hash_get_current_data_ex(HASH_OF(*args), (void
**) &item, &pos) == FAILURE) {
+ if (zend_hash_get_current_data_ex(HASH_OF(args), (void
**) &item, &pos) == FAILURE) {
break;
}
@@ -79,12 +78,12 @@
groups = safe_emalloc(sizeof(char *),
zend_hash_num_elements(HASH_OF(*grps)) + 1, 0);
groups[0] = NULL;
- zend_hash_internal_pointer_reset_ex(HASH_OF(*grps), &pos);
+ zend_hash_internal_pointer_reset_ex(HASH_OF(grps), &pos);
- for (index = 0;; zend_hash_move_forward_ex(HASH_OF(*grps),
&pos)) {
+ for (index = 0;; zend_hash_move_forward_ex(HASH_OF(grps),
&pos)){
zval ** item;
- if (zend_hash_get_current_data_ex(HASH_OF(*grps), (void
**) &item, &pos) == FAILURE) {
+ if (zend_hash_get_current_data_ex(HASH_OF(grps), (void
**) &item, &pos) == FAILURE) {
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysql php_mysql.c /ext/mysql/tests mysql_affected_rows.phpt mysql_close.phpt mysql_data_seek.phpt mysql_db_name.phpt mysql_errno.phpt mysql_error.phpt mysql_fetch_field.ph
johannesFri Nov 28 20:21:35 2008 UTC
Modified files:
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysql/testsmysql_affected_rows.phpt mysql_close.phpt
mysql_data_seek.phpt mysql_db_name.phpt
mysql_errno.phpt mysql_error.phpt
mysql_fetch_field.phpt
mysql_fetch_lengths.phpt
mysql_field_flags.phpt
mysql_field_len.phpt mysql_field_name.phpt
mysql_field_table.phpt
mysql_field_type.phpt
mysql_free_result.phpt
mysql_get_host_info.phpt
mysql_get_proto_info.phpt
mysql_get_server_info.phpt
mysql_insert_id.phpt mysql_list_dbs.phpt
mysql_list_tables.phpt
mysql_num_fields.phpt mysql_num_rows.phpt
mysql_tablename.phpt
Log:
New param parsing for ext/mysql
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.269&r2=1.270&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.269 php-src/ext/mysql/php_mysql.c:1.270
--- php-src/ext/mysql/php_mysql.c:1.269 Thu Nov 27 19:02:44 2008
+++ php-src/ext/mysql/php_mysql.c Fri Nov 28 20:21:35 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.269 2008/11/27 19:02:44 dmitry Exp $ */
+/* $Id: php_mysql.c,v 1.270 2008/11/28 20:21:35 johannes Exp $ */
/* TODO:
*
@@ -1011,34 +1011,26 @@
Close a MySQL connection */
PHP_FUNCTION(mysql_close)
{
- zval **mysql_link=NULL;
- int id;
+ zval *mysql_link=NULL;
php_mysql_conn *mysql;
- switch (ZEND_NUM_ARGS()) {
- case 0:
- id = MySG(default_link);
- break;
- case 1:
- if (zend_get_parameters_ex(1, &mysql_link)==FAILURE) {
- RETURN_FALSE;
- }
- id = -1;
- break;
- default:
- WRONG_PARAM_COUNT;
- break;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link)
== FAILURE) {
+ return;
}
-
- ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id,
"MySQL-Link", le_link, le_plink);
- if (id==-1) { /* explicit resource number */
+ if (mysql_link) {
+ ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, -1,
"MySQL-Link", le_link, le_plink);
+ } else {
+ ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, NULL,
MySG(default_link), "MySQL-Link", le_link, le_plink);
+ }
+
+ if (mysql_link) { /* explicit resource number */
PHPMY_UNBUFFERED_QUERY_CHECK();
- zend_list_delete(Z_RESVAL_PP(mysql_link));
+ zend_list_delete(Z_RESVAL_P(mysql_link));
}
- if (id!=-1
- || (mysql_link && Z_RESVAL_PP(mysql_link)==MySG(default_link)))
{
+ if (!mysql_link
+ || (mysql_link && Z_RESVAL_P(mysql_link)==MySG(default_link))) {
PHPMY_UNBUFFERED_QUERY_CHECK();
zend_list_delete(MySG(default_link));
MySG(default_link) = -1;
@@ -1094,27 +1086,20 @@
Returns a string describing the type of connection in use, including the
server host name */
PHP_FUNCTION(mysql_get_host_info)
{
- zval **mysql_link;
- int id;
+ zval *mysql_link = NULL;
+ int id = -1;
php_mysql_conn *mysql;
- switch(ZEND_NUM_ARGS()) {
- case 0:
- id =
php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
- CHECK_LINK(id);
- break;
- case 1:
- if (zend_get_parameters_ex(1,&mysql_link)==FAILURE) {
- RETURN_FALSE;
- }
- id = -1;
- break;
- default:
- WRONG_PARAM_COUNT;
- break;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link)
== FAILURE) {
+ return;
}
- ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id,
"MySQL-Link", le_link, le_plink);
+ if (!mysql_link) {
+ id =
php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+ CHECK_LINK(id);
+ }
+
+ ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id,
"MySQL-Link", le_l
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
mattwil Fri Nov 28 19:07:10 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: MFH: Updated description to match docs http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.24&r2=1.231.2.10.2.25&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.24 php-src/php.ini-dist:1.231.2.10.2.25 --- php-src/php.ini-dist:1.231.2.10.2.24Thu Nov 13 19:06:59 2008 +++ php-src/php.ini-distFri Nov 28 19:07:09 2008 @@ -336,7 +336,7 @@ log_errors_max_len = 1024 ; Do not log repeated messages. Repeated errors must occur in same file on same -; line until ignore_repeated_source is set true. +; line unless ignore_repeated_source is set true. ignore_repeated_errors = Off ; Ignore source of message when ignoring repeated messages. When this setting http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.26&r2=1.179.2.11.2.27&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.26 php-src/php.ini-recommended:1.179.2.11.2.27 --- php-src/php.ini-recommended:1.179.2.11.2.26 Thu Nov 13 19:06:59 2008 +++ php-src/php.ini-recommended Fri Nov 28 19:07:09 2008 @@ -387,7 +387,7 @@ log_errors_max_len = 1024 ; Do not log repeated messages. Repeated errors must occur in same file on same -; line until ignore_repeated_source is set true. +; line unless ignore_repeated_source is set true. ignore_repeated_errors = Off ; Ignore source of message when ignoring repeated messages. When this setting -- 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) / php.ini-dist php.ini-recommended
mattwil Fri Nov 28 19:06:10 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-dist php.ini-recommended Log: MFH: Updated description to match docs http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.22.2.11&r2=1.231.2.10.2.22.2.12&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.22.2.11 php-src/php.ini-dist:1.231.2.10.2.22.2.12 --- php-src/php.ini-dist:1.231.2.10.2.22.2.11 Thu Nov 13 19:06:28 2008 +++ php-src/php.ini-distFri Nov 28 19:06:10 2008 @@ -347,7 +347,7 @@ log_errors_max_len = 1024 ; Do not log repeated messages. Repeated errors must occur in same file on same -; line until ignore_repeated_source is set true. +; line unless ignore_repeated_source is set true. ignore_repeated_errors = Off ; Ignore source of message when ignoring repeated messages. When this setting http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.23.2.12&r2=1.179.2.11.2.23.2.13&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.23.2.12 php-src/php.ini-recommended:1.179.2.11.2.23.2.13 --- php-src/php.ini-recommended:1.179.2.11.2.23.2.12Thu Nov 13 19:06:28 2008 +++ php-src/php.ini-recommended Fri Nov 28 19:06:10 2008 @@ -399,7 +399,7 @@ log_errors_max_len = 1024 ; Do not log repeated messages. Repeated errors must occur in same file on same -; line until ignore_repeated_source is set true. +; line unless ignore_repeated_source is set true. ignore_repeated_errors = Off ; Ignore source of message when ignoring repeated messages. When this setting -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended
mattwil Fri Nov 28 19:05:43 2008 UTC Modified files: /php-srcphp.ini-dist php.ini-recommended Log: Updated description to match docs http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.281&r2=1.282&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.281 php-src/php.ini-dist:1.282 --- php-src/php.ini-dist:1.281 Thu Nov 13 19:05:36 2008 +++ php-src/php.ini-distFri Nov 28 19:05:42 2008 @@ -297,7 +297,7 @@ log_errors_max_len = 1024 ; Do not log repeated messages. Repeated errors must occur in same file on same -; line until ignore_repeated_source is set true. +; line unless ignore_repeated_source is set true. ignore_repeated_errors = Off ; Ignore source of message when ignoring repeated messages. When this setting http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.231&r2=1.232&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.231 php-src/php.ini-recommended:1.232 --- php-src/php.ini-recommended:1.231 Thu Nov 13 19:05:36 2008 +++ php-src/php.ini-recommended Fri Nov 28 19:05:42 2008 @@ -336,7 +336,7 @@ log_errors_max_len = 1024 ; Do not log repeated messages. Repeated errors must occur in same file on same -; line until ignore_repeated_source is set true. +; line unless ignore_repeated_source is set true. ignore_repeated_errors = Off ; Ignore source of message when ignoring repeated messages. When this setting -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/imap/tests clean.inc imap_include.inc skipif.inc
zoe Fri Nov 28 17:41:03 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/imap/tests imap_include.inc clean.inc skipif.inc
Log:
Committing include files required for tests. Tests and bug reports to follow.
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/imap_include.inc?view=markup&rev=1.1
Index: php-src/ext/imap/tests/imap_include.inc
+++ php-src/ext/imap/tests/imap_include.inc
name == $mailbox) {
exit ("TEST FAILED : Mailbox '$mailbox' already
exists\n");
}
}
}
if (imap_createmailbox($imap_stream, $mailbox) === false) {
return false;
}
// Add number of test msgs requested
if ($message_count > 0) {
populate_mailbox($imap_stream, $mailbox, $message_count,
$msg_type);
}
return $mailbox;
}
/**
* Populate a mailbox with generic emails
*
* @param resource $imap_stream
* @param string $mailbox
*/
function populate_mailbox($imap_stream, $mailbox, $message_count, $msg_type =
"simple"){
global $users, $domain;
for($i = 1; $i <= $message_count; $i++) {
if ($msg_type == "simple") {
$msg = "From: [EMAIL PROTECTED]"
. "To: [EMAIL PROTECTED]"
. "Subject: test$i\r\n"
. "\r\n"
. "$i: this is a test message, please
ignore\r\n";
} else {
$envelope["from"]= "[EMAIL PROTECTED]";
$envelope["to"] = "[EMAIL PROTECTED]";
$envelope["subject"] = "Test msg $i";
$part1["type"] = TYPEMULTIPART;
$part1["subtype"] = "mixed";
$part2["type"] = TYPETEXT;
$part2["subtype"] = "plain";
$part2["description"] = "imap_mail_compose() function";
$part2["contents.data"] = "message
1:xx";
$part3["type"] = TYPETEXT;
$part3["subtype"] = "plain";
$part3["description"] = "Example";
$part3["contents.data"] = "message
2:yy";
$part4["type"] = TYPETEXT;
$part4["subtype"] = "plain";
$part4["description"] = "Return Values";
$part4["contents.data"] = "message
3:zz";
$body[1] = $part1;
$body[2] = $part2;
$body[3] = $part3;
$body[4] = $part4;
$msg = imap_mail_compose($envelope, $body);
}
imap_append($imap_stream, $mailbox, $msg);
}
}
/**
* Get the mailbox name from a mailbox decription, i.e strip off server
details.
*
* @param string mailbox complete mailbox name
* @return mailbox name
*/
function get_mailbox_name($mailbox){
if (preg_match('/\{.*?\}(.*)/', $mailbox, $match) != 1) {
echo "Unrecpognized mailbox name\n";
return false;
}
return $match[1];
}
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/clean.inc?view=markup&rev=1.1
Index: php-src/ext/imap/tests/clean.inc
+++ php-src/ext/imap/tests/clean.inc
Nmsgs; $i++) {
imap_delete($imap_stream, $i);
}
$mailboxes = imap_getmailboxes($imap_stream, $server, '*');
foreach($mailboxes as $value) {
// Only delete mailboxes with our prefix
if (preg_match('/\{.*?\}INBOX\.(.+)/', $value->name, $match) == 1) {
if (strlen($match[1]) >= strlen($mailbox_prefix)
&& substr_compare($match[1], $mailbox_prefix, 0,
strlen($mailbox_prefix)) == 0) {
imap_deletemailbox($imap_stream, $value->name);
}
}
}
imap_close($imap_stream, CL_EXPUNGE);
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/skipif.inc?view=markup&rev=1.1
Index: php-src/ext/imap/tests/skipif.inc
+++ php-src/ext/imap/tests/skipif.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/imap/tests clean.inc imap_include.inc skipif.inc
zoe Fri Nov 28 17:40:14 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/imap/tests skipif.inc imap_include.inc clean.inc
Log:
Committing include files required for tests. Tests and bug reports to follow.
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/skipif.inc?view=markup&rev=1.1
Index: php-src/ext/imap/tests/skipif.inc
+++ php-src/ext/imap/tests/skipif.inc
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/imap_include.inc?view=markup&rev=1.1
Index: php-src/ext/imap/tests/imap_include.inc
+++ php-src/ext/imap/tests/imap_include.inc
name == $mailbox) {
exit ("TEST FAILED : Mailbox '$mailbox' already
exists\n");
}
}
}
if (imap_createmailbox($imap_stream, $mailbox) === false) {
return false;
}
// Add number of test msgs requested
if ($message_count > 0) {
populate_mailbox($imap_stream, $mailbox, $message_count,
$msg_type);
}
return $mailbox;
}
/**
* Populate a mailbox with generic emails
*
* @param resource $imap_stream
* @param string $mailbox
*/
function populate_mailbox($imap_stream, $mailbox, $message_count, $msg_type =
"simple"){
global $users, $domain;
for($i = 1; $i <= $message_count; $i++) {
if ($msg_type == "simple") {
$msg = "From: [EMAIL PROTECTED]"
. "To: [EMAIL PROTECTED]"
. "Subject: test$i\r\n"
. "\r\n"
. "$i: this is a test message, please
ignore\r\n";
} else {
$envelope["from"]= "[EMAIL PROTECTED]";
$envelope["to"] = "[EMAIL PROTECTED]";
$envelope["subject"] = "Test msg $i";
$part1["type"] = TYPEMULTIPART;
$part1["subtype"] = "mixed";
$part2["type"] = TYPETEXT;
$part2["subtype"] = "plain";
$part2["description"] = "imap_mail_compose() function";
$part2["contents.data"] = "message
1:xx";
$part3["type"] = TYPETEXT;
$part3["subtype"] = "plain";
$part3["description"] = "Example";
$part3["contents.data"] = "message
2:yy";
$part4["type"] = TYPETEXT;
$part4["subtype"] = "plain";
$part4["description"] = "Return Values";
$part4["contents.data"] = "message
3:zz";
$body[1] = $part1;
$body[2] = $part2;
$body[3] = $part3;
$body[4] = $part4;
$msg = imap_mail_compose($envelope, $body);
}
imap_append($imap_stream, $mailbox, $msg);
}
}
/**
* Get the mailbox name from a mailbox decription, i.e strip off server
details.
*
* @param string mailbox complete mailbox name
* @return mailbox name
*/
function get_mailbox_name($mailbox){
if (preg_match('/\{.*?\}(.*)/', $mailbox, $match) != 1) {
echo "Unrecpognized mailbox name\n";
return false;
}
return $match[1];
}
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/clean.inc?view=markup&rev=1.1
Index: php-src/ext/imap/tests/clean.inc
+++ php-src/ext/imap/tests/clean.inc
Nmsgs; $i++) {
imap_delete($imap_stream, $i);
}
$mailboxes = imap_getmailboxes($imap_stream, $server, '*');
foreach($mailboxes as $value) {
// Only delete mailboxes with our prefix
if (preg_match('/\{.*?\}INBOX\.(.+)/', $value->name, $match) == 1) {
if (strlen($match[1]) >= strlen($mailbox_prefix)
&& substr_compare($match[1], $mailbox_prefix, 0,
strlen($mailbox_prefix)) == 0) {
imap_deletemailbox($imap_stream, $value->name);
}
}
}
imap_close($imap_stream, CL_EXPUNGE);
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap/tests clean.inc imap_include.inc skipif.inc
zoe Fri Nov 28 17:39:13 2008 UTC
Added files:
/php-src/ext/imap/tests clean.inc skipif.inc imap_include.inc
Log:
Committing include files required for tests. Tests and bug reports to follow.
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/clean.inc?view=markup&rev=1.1
Index: php-src/ext/imap/tests/clean.inc
+++ php-src/ext/imap/tests/clean.inc
Nmsgs; $i++) {
imap_delete($imap_stream, $i);
}
$mailboxes = imap_getmailboxes($imap_stream, $server, '*');
foreach($mailboxes as $value) {
// Only delete mailboxes with our prefix
if (preg_match('/\{.*?\}INBOX\.(.+)/', $value->name, $match) == 1) {
if (strlen($match[1]) >= strlen($mailbox_prefix)
&& substr_compare($match[1], $mailbox_prefix, 0,
strlen($mailbox_prefix)) == 0) {
imap_deletemailbox($imap_stream, $value->name);
}
}
}
imap_close($imap_stream, CL_EXPUNGE);
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/skipif.inc?view=markup&rev=1.1
Index: php-src/ext/imap/tests/skipif.inc
+++ php-src/ext/imap/tests/skipif.inc
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/imap_include.inc?view=markup&rev=1.1
Index: php-src/ext/imap/tests/imap_include.inc
+++ php-src/ext/imap/tests/imap_include.inc
name == $mailbox) {
exit ("TEST FAILED : Mailbox '$mailbox' already
exists\n");
}
}
}
if (imap_createmailbox($imap_stream, $mailbox) === false) {
return false;
}
// Add number of test msgs requested
if ($message_count > 0) {
populate_mailbox($imap_stream, $mailbox, $message_count,
$msg_type);
}
return $mailbox;
}
/**
* Populate a mailbox with generic emails
*
* @param resource $imap_stream
* @param string $mailbox
*/
function populate_mailbox($imap_stream, $mailbox, $message_count, $msg_type =
"simple"){
global $users, $domain;
for($i = 1; $i <= $message_count; $i++) {
if ($msg_type == "simple") {
$msg = "From: [EMAIL PROTECTED]"
. "To: [EMAIL PROTECTED]"
. "Subject: test$i\r\n"
. "\r\n"
. "$i: this is a test message, please
ignore\r\n";
} else {
$envelope["from"]= "[EMAIL PROTECTED]";
$envelope["to"] = "[EMAIL PROTECTED]";
$envelope["subject"] = "Test msg $i";
$part1["type"] = TYPEMULTIPART;
$part1["subtype"] = "mixed";
$part2["type"] = TYPETEXT;
$part2["subtype"] = "plain";
$part2["description"] = "imap_mail_compose() function";
$part2["contents.data"] = "message
1:xx";
$part3["type"] = TYPETEXT;
$part3["subtype"] = "plain";
$part3["description"] = "Example";
$part3["contents.data"] = "message
2:yy";
$part4["type"] = TYPETEXT;
$part4["subtype"] = "plain";
$part4["description"] = "Return Values";
$part4["contents.data"] = "message
3:zz";
$body[1] = $part1;
$body[2] = $part2;
$body[3] = $part3;
$body[4] = $part4;
$msg = imap_mail_compose($envelope, $body);
}
imap_append($imap_stream, $mailbox, $msg);
}
}
/**
* Get the mailbox name from a mailbox decription, i.e strip off server
details.
*
* @param string mailbox complete mailbox name
* @return mailbox name
*/
function get_mailbox_name($mailbox){
if (preg_match('/\{.*?\}(.*)/', $mailbox, $match) != 1) {
echo "Unrecpognized mailbox name\n";
return false;
}
return $match[1];
}
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite3 sqlite3.c /ext/sqlite3/tests sqlite3_29_createfunction.phpt
felipe Fri Nov 28 15:37:02 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/sqlite3/tests sqlite3_29_createfunction.phpt
Modified files:
/php-src/ext/sqlite3sqlite3.c
Log:
- MFH: Fixed memory leaks in createFunction and createAggregate methods
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.1.2.20&r2=1.1.2.21&diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.1.2.20
php-src/ext/sqlite3/sqlite3.c:1.1.2.21
--- php-src/ext/sqlite3/sqlite3.c:1.1.2.20 Thu Nov 27 19:01:23 2008
+++ php-src/ext/sqlite3/sqlite3.c Fri Nov 28 15:37:02 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.1.2.20 2008/11/27 19:01:23 dmitry Exp $ */
+/* $Id: sqlite3.c,v 1.1.2.21 2008/11/28 15:37:02 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -791,6 +791,7 @@
MAKE_STD_ZVAL(func->func);
*(func->func) = *callback_func;
zval_copy_ctor(func->func);
+ INIT_PZVAL(func->func);
func->argc = sql_func_num_args;
func->next = db_obj->funcs;
@@ -849,10 +850,12 @@
MAKE_STD_ZVAL(func->step);
*(func->step) = *step_callback;
zval_copy_ctor(func->step);
+ INIT_PZVAL(func->step);
MAKE_STD_ZVAL(func->fini);
*(func->fini) = *fini_callback;
zval_copy_ctor(func->fini);
+ INIT_PZVAL(func->fini);
func->argc = sql_func_num_args;
func->next = db_obj->funcs;
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/tests/sqlite3_29_createfunction.phpt?view=markup&rev=1.1
Index: php-src/ext/sqlite3/tests/sqlite3_29_createfunction.phpt
+++ php-src/ext/sqlite3/tests/sqlite3_29_createfunction.phpt
--TEST--
SQLite3::createFunction - Basic test
--SKIPIF--
--FILE--
createfunction($func, $func));
var_dump($db->querySingle('SELECT strtoupper("test")'));
$func2 = 'strtolower';
var_dump($db->createfunction($func2, $func2));
var_dump($db->querySingle('SELECT strtolower("TEST")'));
var_dump($db->createfunction($func, $func2));
var_dump($db->querySingle('SELECT strtoupper("tEst")'));
?>
--EXPECTF--
bool(true)
%string|unicode%(4) "TEST"
bool(true)
%string|unicode%(4) "test"
bool(true)
%string|unicode%(4) "test"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3 sqlite3.c /ext/sqlite3/tests sqlite3_29_createfunction.phpt
felipe Fri Nov 28 15:36:34 2008 UTC
Added files:
/php-src/ext/sqlite3/tests sqlite3_29_createfunction.phpt
Modified files:
/php-src/ext/sqlite3sqlite3.c
Log:
- Fixed memory leaks in createFunction and createAggregate methods
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.22&r2=1.23&diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.22 php-src/ext/sqlite3/sqlite3.c:1.23
--- php-src/ext/sqlite3/sqlite3.c:1.22 Thu Nov 27 19:02:45 2008
+++ php-src/ext/sqlite3/sqlite3.c Fri Nov 28 15:36:34 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.22 2008/11/27 19:02:45 dmitry Exp $ */
+/* $Id: sqlite3.c,v 1.23 2008/11/28 15:36:34 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -817,6 +817,7 @@
MAKE_STD_ZVAL(func->func);
*(func->func) = *callback_func;
zval_copy_ctor(func->func);
+ INIT_PZVAL(func->func);
func->argc = sql_func_num_args;
func->next = db_obj->funcs;
@@ -876,10 +877,12 @@
MAKE_STD_ZVAL(func->step);
*(func->step) = *step_callback;
zval_copy_ctor(func->step);
+ INIT_PZVAL(func->step);
MAKE_STD_ZVAL(func->fini);
*(func->fini) = *fini_callback;
zval_copy_ctor(func->fini);
+ INIT_PZVAL(func->fini);
func->argc = sql_func_num_args;
func->next = db_obj->funcs;
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/tests/sqlite3_29_createfunction.phpt?view=markup&rev=1.1
Index: php-src/ext/sqlite3/tests/sqlite3_29_createfunction.phpt
+++ php-src/ext/sqlite3/tests/sqlite3_29_createfunction.phpt
--TEST--
SQLite3::createFunction - Basic test
--SKIPIF--
--FILE--
createfunction($func, $func));
var_dump($db->querySingle('SELECT strtoupper("test")'));
$func2 = 'strtolower';
var_dump($db->createfunction($func2, $func2));
var_dump($db->querySingle('SELECT strtolower("TEST")'));
var_dump($db->createfunction($func, $func2));
var_dump($db->querySingle('SELECT strtoupper("tEst")'));
?>
--EXPECTF--
bool(true)
%string|unicode%(4) "TEST"
bool(true)
%string|unicode%(4) "test"
bool(true)
%string|unicode%(4) "test"
--
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/mysqlnd mysqlnd_loaddata.c
johannesFri Nov 28 14:38:03 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_loaddata.c
Log:
MFH: No infinite loop in case the connection broke
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_loaddata.c?r1=1.2.2.8&r2=1.2.2.9&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_loaddata.c
diff -u php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.2.2.8
php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.2.2.9
--- php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.2.2.8 Thu Nov 6 10:37:47 2008
+++ php-src/ext/mysqlnd/mysqlnd_loaddata.c Fri Nov 28 14:38:03 2008
@@ -244,7 +244,6 @@
/* get response from server and update upsert values */
if (FAIL == mysqlnd_simple_command_handle_response(conn,
PROT_OK_PACKET, FALSE, COM_QUERY, FALSE TSRMLS_CC)) {
result = FAIL;
- goto infile_error;
}
(*conn->infile.local_infile_end)(info TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_loaddata.c
johannesFri Nov 28 14:37:43 2008 UTC
Modified files:
/php-src/ext/mysqlndmysqlnd_loaddata.c
Log:
No infinite loop in case the connection broke
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_loaddata.c?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_loaddata.c
diff -u php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.8
php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.9
--- php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.8 Thu Nov 6 10:36:30 2008
+++ php-src/ext/mysqlnd/mysqlnd_loaddata.c Fri Nov 28 14:37:43 2008
@@ -244,7 +244,6 @@
/* get response from server and update upsert values */
if (FAIL == mysqlnd_simple_command_handle_response(conn,
PROT_OK_PACKET, FALSE, COM_QUERY, FALSE TSRMLS_CC)) {
result = FAIL;
- goto infile_error;
}
(*conn->infile.local_infile_end)(info TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_http.c
dmitry Fri Nov 28 14:21:08 2008 UTC
Modified files:
/php-src/ext/soap php_http.c
Log:
Fixed bug #41534 (SoapClient over HTTPS fails to reestablish connection)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.114&r2=1.115&diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.114 php-src/ext/soap/php_http.c:1.115
--- php-src/ext/soap/php_http.c:1.114 Wed Oct 1 13:13:49 2008
+++ php-src/ext/soap/php_http.c Fri Nov 28 14:21:08 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_http.c,v 1.114 2008/10/01 13:13:49 dmitry Exp $ */
+/* $Id: php_http.c,v 1.115 2008/11/28 14:21:08 dmitry Exp $ */
#include "php_soap.h"
#include "ext/standard/base64.h"
@@ -31,30 +31,6 @@
#define smart_str_append_const(str, const) \
smart_str_appendl(str,const,sizeof(const)-1)
-static int stream_alive(php_stream *stream TSRMLS_DC)
-{
- int socket;
- char buf;
-
- /* maybe better to use:
-* php_stream_set_option(stream, PHP_STREAM_OPTION_CHECK_LIVENESS, 0,
NULL)
-* here instead */
-
- if (stream == NULL || stream->eof || php_stream_cast(stream,
PHP_STREAM_AS_FD_FOR_SELECT, (void**)&socket, 0) != SUCCESS) {
- return FALSE;
- }
- if (socket == -1) {
- return FALSE;
- } else {
- if (php_pollfd_for_ms(socket, PHP_POLLREADABLE, 0) > 0) {
- if (0 == recv(socket, &buf, sizeof(buf), MSG_PEEK) &&
php_socket_errno() != EAGAIN) {
- return FALSE;
- }
- }
- }
- return TRUE;
-}
-
/* Proxy HTTP Authentication */
void proxy_authentication(zval* this_ptr, smart_str* soap_headers TSRMLS_DC)
{
@@ -363,7 +339,7 @@
}
/* Check if keep-alive connection is still opened */
- if (stream != NULL && !stream_alive(stream TSRMLS_CC)) {
+ if (stream != NULL && php_stream_eof(stream)) {
php_stream_close(stream);
if (client->url) {
php_url_free(client->url);
@@ -917,6 +893,7 @@
efree(cookie);
}
+ /* See if the server requested a close */
if (http_1_1) {
http_close = FALSE;
if (use_proxy && !use_ssl) {
@@ -928,8 +905,35 @@
efree(connection);
}
}
+ if (http_close == FALSE) {
+ connection =
get_http_header_value(http_headers,"Connection: ");
+ if (connection) {
+ if (strncasecmp(connection, "close",
sizeof("close")-1) == 0) {
+ http_close = TRUE;
+ }
+ efree(connection);
+ }
+ }
} else {
http_close = TRUE;
+ if (use_proxy && !use_ssl) {
+ connection =
get_http_header_value(http_headers,"Proxy-Connection: ");
+ if (connection) {
+ if (strncasecmp(connection, "Keep-Alive",
sizeof("Keep-Alive")-1) == 0) {
+ http_close = FALSE;
+ }
+ efree(connection);
+ }
+ }
+ if (http_close == TRUE) {
+ connection =
get_http_header_value(http_headers,"Connection: ");
+ if (connection) {
+ if (strncasecmp(connection, "Keep-Alive",
sizeof("Keep-Alive")-1) == 0) {
+ http_close = FALSE;
+ }
+ efree(connection);
+ }
+ }
}
if (!get_http_body(stream, http_close, http_headers, &http_body,
&http_body_size TSRMLS_CC)) {
@@ -948,31 +952,6 @@
if (request != buf) {efree(request);}
- /* See if the server requested a close */
- http_close = TRUE;
- connection = get_http_header_value(http_headers,"Proxy-Connection: ");
- if (connection) {
- if (strncasecmp(connection, "Keep-Alive",
sizeof("Keep-Alive")-1) == 0) {
- http_close = FALSE;
- }
- efree(connection);
-/*
- } else if (http_1_1) {
- http_close = FALSE;
-*/
- }
- connection = get_http_header_value(http_headers,"Connection: ");
- if (connection) {
- if (strncasecmp(connection, "Keep-Alive",
sizeof("Keep-Alive")-1) == 0) {
- http_close = FALSE;
- }
- efree(connection);
-/*
-
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/soap php_http.c
dmitry Fri Nov 28 14:20:58 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
/php-src/ext/soap php_http.c
Log:
Fixed bug #41534 (SoapClient over HTTPS fails to reestablish connection)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.392&r2=1.2027.2.547.2.965.2.393&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.392
php-src/NEWS:1.2027.2.547.2.965.2.393
--- php-src/NEWS:1.2027.2.547.2.965.2.392 Thu Nov 27 19:01:18 2008
+++ php-src/NEWSFri Nov 28 14:20:57 2008
@@ -93,6 +93,8 @@
(David C.)
- Fixed bug #44154 (pdo->errorInfo() always have three elements in the
returned array). (David C.)
+- Fixed bug #41534 (SoapClient over HTTPS fails to reestablish connection).
+ (Dmitry)
02 Sep 2008, PHP 5.3.0 Alpha 2
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.77.2.11.2.12.2.6&r2=1.77.2.11.2.12.2.7&diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.77.2.11.2.12.2.6
php-src/ext/soap/php_http.c:1.77.2.11.2.12.2.7
--- php-src/ext/soap/php_http.c:1.77.2.11.2.12.2.6 Wed Oct 1 13:13:34 2008
+++ php-src/ext/soap/php_http.c Fri Nov 28 14:20:58 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_http.c,v 1.77.2.11.2.12.2.6 2008/10/01 13:13:34 dmitry Exp $ */
+/* $Id: php_http.c,v 1.77.2.11.2.12.2.7 2008/11/28 14:20:58 dmitry Exp $ */
#include "php_soap.h"
#include "ext/standard/base64.h"
@@ -31,30 +31,6 @@
#define smart_str_append_const(str, const) \
smart_str_appendl(str,const,sizeof(const)-1)
-static int stream_alive(php_stream *stream TSRMLS_DC)
-{
- int socket;
- char buf;
-
- /* maybe better to use:
-* php_stream_set_option(stream, PHP_STREAM_OPTION_CHECK_LIVENESS, 0,
NULL)
-* here instead */
-
- if (stream == NULL || stream->eof || php_stream_cast(stream,
PHP_STREAM_AS_FD_FOR_SELECT, (void**)&socket, 0) != SUCCESS) {
- return FALSE;
- }
- if (socket == -1) {
- return FALSE;
- } else {
- if (php_pollfd_for_ms(socket, PHP_POLLREADABLE, 0) > 0) {
- if (0 == recv(socket, &buf, sizeof(buf), MSG_PEEK) &&
php_socket_errno() != EAGAIN) {
- return FALSE;
- }
- }
- }
- return TRUE;
-}
-
/* Proxy HTTP Authentication */
void proxy_authentication(zval* this_ptr, smart_str* soap_headers TSRMLS_DC)
{
@@ -364,7 +340,7 @@
}
/* Check if keep-alive connection is still opened */
- if (stream != NULL && !stream_alive(stream TSRMLS_CC)) {
+ if (stream != NULL && php_stream_eof(stream)) {
php_stream_close(stream);
zend_hash_del(Z_OBJPROP_P(this_ptr), "httpurl",
sizeof("httpurl"));
zend_hash_del(Z_OBJPROP_P(this_ptr), "httpsocket",
sizeof("httpsocket"));
@@ -909,6 +885,7 @@
efree(cookie);
}
+ /* See if the server requested a close */
if (http_1_1) {
http_close = FALSE;
if (use_proxy && !use_ssl) {
@@ -920,8 +897,35 @@
efree(connection);
}
}
+ if (http_close == FALSE) {
+ connection =
get_http_header_value(http_headers,"Connection: ");
+ if (connection) {
+ if (strncasecmp(connection, "close",
sizeof("close")-1) == 0) {
+ http_close = TRUE;
+ }
+ efree(connection);
+ }
+ }
} else {
http_close = TRUE;
+ if (use_proxy && !use_ssl) {
+ connection =
get_http_header_value(http_headers,"Proxy-Connection: ");
+ if (connection) {
+ if (strncasecmp(connection, "Keep-Alive",
sizeof("Keep-Alive")-1) == 0) {
+ http_close = FALSE;
+ }
+ efree(connection);
+ }
+ }
+ if (http_close == TRUE) {
+ connection =
get_http_header_value(http_headers,"Connection: ");
+ if (connection) {
+ if (strncasecmp(connection, "Keep-Alive",
sizeof("Keep-Alive")-1) == 0) {
+ http_close = FALSE;
+ }
+ efree(connection);
+ }
+ }
}
if (!get_http_body(stream, http_close, http_headers, &http_body,
&http_body_size TSR
[PHP-CVS] cvs: php-src /ext/mhash .cvsignore
janiFri Nov 28 13:23:04 2008 UTC Removed files: /php-src/ext/mhash .cvsignore Log: Last file.. -- 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/mhash .cvsignore
janiFri Nov 28 13:22:31 2008 UTC Removed files: (Branch: PHP_5_3) /php-src/ext/mhash .cvsignore Log: - remove this too -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c
dmitry Fri Nov 28 11:57:11 2008 UTC
Modified files:
/php-src/sapi/cgi cgi_main.c
Log:
Fixed bug #46366 (bad cwd with / as pathinfo)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.371&r2=1.372&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.371 php-src/sapi/cgi/cgi_main.c:1.372
--- php-src/sapi/cgi/cgi_main.c:1.371 Mon Nov 17 11:26:25 2008
+++ php-src/sapi/cgi/cgi_main.c Fri Nov 28 11:57:11 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.371 2008/11/17 11:26:25 felipe Exp $ */
+/* $Id: cgi_main.c,v 1.372 2008/11/28 11:57:11 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1087,6 +1087,9 @@
if (script_path_translated &&
(script_path_translated_len =
strlen(script_path_translated)) > 0 &&
(script_path_translated[script_path_translated_len-1] == '/' ||
+#ifdef PHP_WIN32
+
script_path_translated[script_path_translated_len-1] == '\\' ||
+#endif
(real_path =
tsrm_realpath(script_path_translated, NULL TSRMLS_CC)) == NULL)
) {
char *pt = estrndup(script_path_translated,
script_path_translated_len);
--
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/cgi cgi_main.c
dmitry Fri Nov 28 11:57:03 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cgi cgi_main.c
Log:
Fixed bug #46366 (bad cwd with / as pathinfo)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.50.2.31&r2=1.267.2.15.2.50.2.32&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.31
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.32
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.31Sat Nov 8 22:56:17 2008
+++ php-src/sapi/cgi/cgi_main.c Fri Nov 28 11:57:02 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.31 2008/11/08 22:56:17 rasmus Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.32 2008/11/28 11:57:02 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1078,6 +1078,9 @@
if (script_path_translated &&
(script_path_translated_len =
strlen(script_path_translated)) > 0 &&
(script_path_translated[script_path_translated_len-1] == '/' ||
+#ifdef PHP_WIN32
+
script_path_translated[script_path_translated_len-1] == '\\' ||
+#endif
(real_path =
tsrm_realpath(script_path_translated, NULL TSRMLS_CC)) == NULL)
) {
char *pt = estrndup(script_path_translated,
script_path_translated_len);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /sapi/cgi cgi_main.c
dmitry Fri Nov 28 11:56:50 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/sapi/cgi cgi_main.c
Log:
Fixed bug #46366 (bad cwd with / as pathinfo)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1339&r2=1.2027.2.547.2.1340&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1339 php-src/NEWS:1.2027.2.547.2.1340
--- php-src/NEWS:1.2027.2.547.2.1339Thu Nov 27 23:51:45 2008
+++ php-src/NEWSFri Nov 28 11:56:50 2008
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? Dec 2008, PHP 5.2.7
+- Fixed bug #46366 (bad cwd with / as pathinfo). (Dmitry)
27 Nov 2008, PHP 5.2.7RC5
- Upgraded PCRE to version 7.8 (Fixes CVE-2008-2371) (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.65&r2=1.267.2.15.2.66&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.65
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.66
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.65 Sat Nov 8 22:45:29 2008
+++ php-src/sapi/cgi/cgi_main.c Fri Nov 28 11:56:50 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.65 2008/11/08 22:45:29 rasmus Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.66 2008/11/28 11:56:50 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -985,6 +985,9 @@
if (script_path_translated &&
(script_path_translated_len =
strlen(script_path_translated)) > 0 &&
(script_path_translated[script_path_translated_len-1] == '/' ||
+#ifdef PHP_WIN32
+
script_path_translated[script_path_translated_len-1] == '\\' ||
+#endif
(real_path = tsrm_realpath(script_path_translated,
NULL TSRMLS_CC)) == NULL)) {
char *pt = estrndup(script_path_translated,
script_path_translated_len);
int len = script_path_translated_len;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang func_get_arg.001.phpt func_get_arg.002.phpt func_get_arg.003.phpt func_get_arg.004.phpt func_get_arg.005.phpt func_get_arg_variation.phpt func_get_args.001.phpt func
ant Fri Nov 28 10:42:21 2008 UTC
Modified files:
/php-src/tests/lang passByReference_008.phpt
passByReference_002.phpt short_tags.004.phpt
func_get_args.001.phpt short_tags.002.phpt
func_get_arg.002.phpt passByReference_003.phpt
passByReference_005.phpt static_basic_001.phpt
func_num_args.001.phpt short_tags.001.phpt
static_variation_002.phpt
passByReference_004.phpt func_num_args.004.phpt
passByReference_010.phpt func_get_arg.003.phpt
passByReference_006.phpt short_tags.003.phpt
passByReference_009.phpt
static_variation_001.phpt
func_get_args.003.phpt static_basic_002.phpt
func_get_arg.005.phpt func_get_arg.001.phpt
func_num_args.002.phpt func_num_args.003.phpt
func_get_args.002.phpt passByReference_007.phpt
func_get_args.004.phpt passByReference_001.phpt
func_get_arg_variation.phpt
func_get_arg.004.phpt
Log:
Language tests: checked on PHP 5.2.6, 5.3 and 6.0 (Windows, Linux and Linux
64 bit).
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_008.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/tests/lang/passByReference_008.phpt
diff -u /dev/null php-src/tests/lang/passByReference_008.phpt:1.2
--- /dev/null Fri Nov 28 10:42:21 2008
+++ php-src/tests/lang/passByReference_008.phpt Fri Nov 28 10:42:20 2008
@@ -0,0 +1,39 @@
+--TEST--
+Pass same variable by ref and by value.
+--FILE--
+
+--EXPECTF--
+-- Val, Ref --
+unicode(10) "original.a"
+unicode(10) "original.a"
+unicode(9) "changed.y"
+
+
+-- Ref, Val --
+unicode(10) "original.b"
+unicode(10) "original.b"
+unicode(9) "changed.x"
+
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_002.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/tests/lang/passByReference_002.phpt
diff -u /dev/null php-src/tests/lang/passByReference_002.phpt:1.2
--- /dev/null Fri Nov 28 10:42:21 2008
+++ php-src/tests/lang/passByReference_002.phpt Fri Nov 28 10:42:20 2008
@@ -0,0 +1,15 @@
+--TEST--
+Attempt to pass a constant by reference
+--FILE--
+
+--EXPECTF--
+Fatal error: Only variables can be passed by reference in %s on line 8
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.004.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/tests/lang/short_tags.004.phpt
diff -u /dev/null php-src/tests/lang/short_tags.004.phpt:1.2
--- /dev/null Fri Nov 28 10:42:21 2008
+++ php-src/tests/lang/short_tags.004.phpt Fri Nov 28 10:42:20 2008
@@ -0,0 +1,37 @@
+--TEST--
+tags
+--INI--
+short_open_tag=off
+asp_tags=off
+--FILE--
+
+
+<%= 'so should this' %>
+
+
+
+
+
+<%= $a%>
+
+
+
+
+--EXPECTF--
+
+
+<%= 'so should this' %>
+
+
+
+
+<%= $a%>
+
+
+
+
+Notice: Undefined variable: b in %s on line %d
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_get_args.001.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/tests/lang/func_get_args.001.phpt
diff -u /dev/null php-src/tests/lang/func_get_args.001.phpt:1.2
--- /dev/null Fri Nov 28 10:42:21 2008
+++ php-src/tests/lang/func_get_args.001.phpt Fri Nov 28 10:42:20 2008
@@ -0,0 +1,15 @@
+--TEST--
+func_get_args with no args
+--FILE--
+
+--EXPECT--
+array(0) {
+}
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.002.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/tests/lang/short_tags.002.phpt
diff -u /dev/null php-src/tests/lang/short_tags.002.phpt:1.2
--- /dev/null Fri Nov 28 10:42:21 2008
+++ php-src/tests/lang/short_tags.002.phpt Fri Nov 28 10:42:20 2008
@@ -0,0 +1,12 @@
+--TEST--
+short tags
+--INI--
+short_tags=off
+--FILE--
+
+Finished
+--EXPECT--
+Used a short tag
+Finished
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_get_arg.002.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/tests/lang/func_get_arg.002.phpt
diff -u /dev/null php-src/tests/lang/func_get_arg.002.phpt:1.2
--- /dev/null Fri Nov 28 10:42:21 2008
+++ php-src/tests/lang/func_get_arg.002.phptFri Nov 28 10:42:20 2008
@@ -0,0 +1,19 @@
+--TEST--
+func_get_arg with variable number of args
+--FILE--
+
+--EXPECT--
+int(3)
+int(3)
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_003.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/tests/lang/passByReference_003.phpt
diff -u /dev/null php-src/tests/lang/passByReference_003.phpt:1.2
--- /dev/null Fri Nov 28 10:42:21 2008
+++ php-src/tests/lang/passByReference_003.phpt Fri Nov 28 10:42:20 2008
@@ -0,0 +1,48 @@
+--TEST--
+Implicit initialisation when passing by reference
+--FILE--
+
+--EXPECTF--
+
+Passing undefined by value
+
+Notice: Undefined variable: undef1 in %s on line 13
+
+Inside passbyVal call:
+NU
[PHP-CVS] cvs: php-src(PHP_5_3) /tests/lang func_get_arg.001.phpt func_get_arg.002.phpt func_get_arg.003.phpt func_get_arg.004.phpt func_get_arg.005.phpt func_get_arg_variation.phpt func_get_args.001.
ant Fri Nov 28 10:41:19 2008 UTC Added files: (Branch: PHP_5_3) /php-src/tests/lang passByReference_007.phpt func_get_args.003.phpt passByReference_002.phpt passByReference_003.phpt func_get_arg.004.phpt short_tags.004.phpt passByReference_008.phpt short_tags.001.phpt func_num_args.003.phpt func_get_arg.001.phpt func_get_arg.003.phpt passByReference_009.phpt func_num_args.001.phpt func_get_args.002.phpt static_basic_001.phpt func_get_args.001.phpt passByReference_004.phpt func_get_arg.005.phpt passByReference_010.phpt passByReference_005.phpt short_tags.003.phpt func_num_args.002.phpt func_get_arg_variation.phpt func_num_args.004.phpt static_variation_002.phpt static_variation_001.phpt passByReference_001.phpt func_get_args.004.phpt passByReference_006.phpt static_basic_002.phpt short_tags.002.phpt func_get_arg.002.phpt Log: Language tests: checked on PHP 5.2.6, 5.3 and 6.0 (Windows, Linux and Linux 64 bit). http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_007.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/passByReference_007.phpt +++ php-src/tests/lang/passByReference_007.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_get_args.003.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_get_args.003.phpt +++ php-src/tests/lang/func_get_args.003.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_002.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/passByReference_002.phpt +++ php-src/tests/lang/passByReference_002.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_003.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/passByReference_003.phpt +++ php-src/tests/lang/passByReference_003.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_get_arg.004.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_get_arg.004.phpt +++ php-src/tests/lang/func_get_arg.004.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.004.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/short_tags.004.phpt +++ php-src/tests/lang/short_tags.004.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_008.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/passByReference_008.phpt +++ php-src/tests/lang/passByReference_008.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.001.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/short_tags.001.phpt +++ php-src/tests/lang/short_tags.001.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_num_args.003.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_num_args.003.phpt +++ php-src/tests/lang/func_num_args.003.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_get_arg.001.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_get_arg.001.phpt +++ php-src/tests/lang/func_get_arg.001.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_get_arg.003.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_get_arg.003.phpt +++ php-src/tests/lang/func_get_arg.003.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_009.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/passByReference_009.phpt +++ php-src/tests/lang/passByReference_009.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_num_args.001.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_num_args.001.phpt +++ php-src/tests/lang/func_num_args.001.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_get_args.002.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_get_args.002.phpt +++ php-src/tests/lang/func_get_args.002.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/static_basic_001.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/static_basic_001.phpt +++ php-src/tests/lang/static_basic_001.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_get_args.001.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_get_args.001.phpt +++ php-src/tests/lang/func_get_args.001.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_004.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/passByReference_004.phpt +++ php-src/tests/lang/passByReference_004.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_get_arg.005.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_get_arg.005.phpt +++ php-src/tests/lang/func_get_arg.005.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_010.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/passByReference_010.phpt +++ php-src/tests/lang/passByReference_010.phpt
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/lang func_get_arg.001.phpt func_get_arg.002.phpt func_get_arg.003.phpt func_get_arg.004.phpt func_get_arg.005.phpt func_get_arg_variation.phpt func_get_args.001.
ant Fri Nov 28 10:40:36 2008 UTC Added files: (Branch: PHP_5_2) /php-src/tests/lang short_tags.004.phpt func_num_args.001.phpt passByReference_007.phpt passByReference_009.phpt passByReference_003.phpt static_basic_002.phpt func_get_arg.005.phpt func_num_args.004.phpt passByReference_002.phpt func_num_args.003.phpt short_tags.001.phpt short_tags.003.phpt passByReference_006.phpt func_get_arg.001.phpt func_get_args.004.phpt func_get_arg_variation.phpt func_num_args.002.phpt passByReference_010.phpt func_get_arg.002.phpt func_get_args.003.phpt func_get_args.002.phpt func_get_args.001.phpt func_get_arg.004.phpt passByReference_008.phpt short_tags.002.phpt static_basic_001.phpt static_variation_002.phpt passByReference_005.phpt func_get_arg.003.phpt static_variation_001.phpt passByReference_004.phpt passByReference_001.phpt Log: Language tests: checked on PHP 5.2.6, 5.3 and 6.0 (Windows, Linux and Linux 64 bit). http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.004.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/short_tags.004.phpt +++ php-src/tests/lang/short_tags.004.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_num_args.001.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_num_args.001.phpt +++ php-src/tests/lang/func_num_args.001.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_007.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/passByReference_007.phpt +++ php-src/tests/lang/passByReference_007.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_009.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/passByReference_009.phpt +++ php-src/tests/lang/passByReference_009.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_003.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/passByReference_003.phpt +++ php-src/tests/lang/passByReference_003.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/static_basic_002.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/static_basic_002.phpt +++ php-src/tests/lang/static_basic_002.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_get_arg.005.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_get_arg.005.phpt +++ php-src/tests/lang/func_get_arg.005.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_num_args.004.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_num_args.004.phpt +++ php-src/tests/lang/func_num_args.004.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_002.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/passByReference_002.phpt +++ php-src/tests/lang/passByReference_002.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_num_args.003.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_num_args.003.phpt +++ php-src/tests/lang/func_num_args.003.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.001.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/short_tags.001.phpt +++ php-src/tests/lang/short_tags.001.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/short_tags.003.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/short_tags.003.phpt +++ php-src/tests/lang/short_tags.003.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_006.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/passByReference_006.phpt +++ php-src/tests/lang/passByReference_006.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_get_arg.001.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_get_arg.001.phpt +++ php-src/tests/lang/func_get_arg.001.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_get_args.004.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_get_args.004.phpt +++ php-src/tests/lang/func_get_args.004.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_get_arg_variation.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_get_arg_variation.phpt +++ php-src/tests/lang/func_get_arg_variation.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_num_args.002.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_num_args.002.phpt +++ php-src/tests/lang/func_num_args.002.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/passByReference_010.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/passByReference_010.phpt +++ php-src/tests/lang/passByReference_010.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/lang/func_get_arg.002.phpt?view=markup&rev=1.1 Index: php-src/tests/lang/func_get_arg.002.phpt +++ php-src/test
