[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cli php_cli.c
lbarnaudTue Nov 25 03:53:00 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cli php_cli.c
Log:
MFH: Fixed endless loop in cli when ignore_user_abort is on
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.28&r2=1.129.2.13.2.29&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.28
php-src/sapi/cli/php_cli.c:1.129.2.13.2.29
--- php-src/sapi/cli/php_cli.c:1.129.2.13.2.28 Mon Nov 3 23:26:24 2008
+++ php-src/sapi/cli/php_cli.c Tue Nov 25 03:53:00 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.129.2.13.2.28 2008/11/03 23:26:24 lbarnaud Exp $ */
+/* $Id: php_cli.c,v 1.129.2.13.2.29 2008/11/25 03:53:00 lbarnaud Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -260,11 +260,10 @@
{
ret = sapi_cli_single_write(ptr, remaining);
if (!ret) {
-#ifdef PHP_CLI_WIN32_NO_CONSOLE
- break;
-#else
+#ifndef PHP_CLI_WIN32_NO_CONSOLE
php_handle_aborted_connection();
#endif
+ break;
}
ptr += ret;
remaining -= ret;
--
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
lbarnaudTue Nov 25 03:52:00 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cli php_cli.c
Log:
MFH: Fixed endless loop in cli when ignore_user_abort is on
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.22.2.16&r2=1.129.2.13.2.22.2.17&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.16
php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.17
--- php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.16 Thu Nov 13 10:14:04 2008
+++ php-src/sapi/cli/php_cli.c Tue Nov 25 03:52:00 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.129.2.13.2.22.2.16 2008/11/13 10:14:04 lbarnaud Exp $ */
+/* $Id: php_cli.c,v 1.129.2.13.2.22.2.17 2008/11/25 03:52:00 lbarnaud Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -260,11 +260,10 @@
{
ret = sapi_cli_single_write(ptr, remaining);
if (!ret) {
-#ifdef PHP_CLI_WIN32_NO_CONSOLE
- break;
-#else
+#ifndef PHP_CLI_WIN32_NO_CONSOLE
php_handle_aborted_connection();
#endif
+ break;
}
ptr += ret;
remaining -= ret;
--
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
lbarnaudTue Nov 25 03:49:21 2008 UTC
Modified files:
/php-src/sapi/cli php_cli.c
Log:
Fixed endless loop in cli when ignore_user_abort is on
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.200&r2=1.201&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.200 php-src/sapi/cli/php_cli.c:1.201
--- php-src/sapi/cli/php_cli.c:1.200Mon Nov 17 11:26:25 2008
+++ php-src/sapi/cli/php_cli.c Tue Nov 25 03:49:21 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.200 2008/11/17 11:26:25 felipe Exp $ */
+/* $Id: php_cli.c,v 1.201 2008/11/25 03:49:21 lbarnaud Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -264,11 +264,10 @@
{
ret = sapi_cli_single_write(ptr, remaining);
if (!ret) {
-#ifdef PHP_CLI_WIN32_NO_CONSOLE
- break;
-#else
+#ifndef PHP_CLI_WIN32_NO_CONSOLE
php_handle_aborted_connection();
#endif
+ break;
}
ptr += ret;
remaining -= ret;
--
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 /sapi/apache2handler apache_config.c
stasTue Nov 25 00:33:11 2008 UTC
Modified files:
/php-src/sapi/apachemod_php.c
/php-src/sapi/apache2handlerapache_config.c
Log:
MFB: fix php_value application order for Apache
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php.c?r1=1.10&r2=1.11&diff_format=u
Index: php-src/sapi/apache/mod_php.c
diff -u php-src/sapi/apache/mod_php.c:1.10 php-src/sapi/apache/mod_php.c:1.11
--- php-src/sapi/apache/mod_php.c:1.10 Thu Nov 13 10:33:08 2008
+++ php-src/sapi/apache/mod_php.c Tue Nov 25 00:33:10 2008
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: mod_php.c,v 1.10 2008/11/13 10:33:08 lbarnaud Exp $ */
+/* $Id: mod_php.c,v 1.11 2008/11/25 00:33:10 stas Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -738,11 +738,11 @@
return 1; /* does not exist in dest, copy from source */
}
- if (new_per_dir_entry->type==PHP_INI_SYSTEM
- && orig_per_dir_entry->type!=PHP_INI_SYSTEM) {
- return 1;
- } else {
+ if (orig_per_dir_entry->type==PHP_INI_SYSTEM
+ && new_per_dir_entry->type!=PHP_INI_SYSTEM) {
return 0;
+ } else {
+ return 1;
}
}
/* }}} */
@@ -779,9 +779,9 @@
/* need a copy of addv to merge */
new = php_create_dir(p, "php_merge_dir");
- zend_hash_copy(new, (HashTable *) addv, (copy_ctor_func_t)
copy_per_dir_entry, NULL, sizeof(php_per_dir_entry));
+ zend_hash_copy(new, (HashTable *) basev, (copy_ctor_func_t)
copy_per_dir_entry, NULL, sizeof(php_per_dir_entry));
- zend_hash_merge_ex(new, (HashTable *) basev, (copy_ctor_func_t)
copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t)
should_overwrite_per_dir_entry, NULL);
+ zend_hash_merge_ex(new, (HashTable *) addv, (copy_ctor_func_t)
copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t)
should_overwrite_per_dir_entry, NULL);
return new;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/apache_config.c?r1=1.15&r2=1.16&diff_format=u
Index: php-src/sapi/apache2handler/apache_config.c
diff -u php-src/sapi/apache2handler/apache_config.c:1.15
php-src/sapi/apache2handler/apache_config.c:1.16
--- php-src/sapi/apache2handler/apache_config.c:1.15Mon Dec 31 07:12:19 2007
+++ php-src/sapi/apache2handler/apache_config.c Tue Nov 25 00:33:11 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: apache_config.c,v 1.15 2007/12/31 07:12:19 sebastian Exp $ */
+/* $Id: apache_config.c,v 1.16 2008/11/25 00:33:11 stas Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -117,6 +117,23 @@
return NULL;
}
+static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht,
php_dir_entry *new_per_dir_entry, zend_hash_key *hash_key, void *pData)
+{
+ php_dir_entry *orig_per_dir_entry;
+
+ if (zend_hash_find(target_ht, hash_key->arKey.s, hash_key->nKeyLength,
(void **) &orig_per_dir_entry)==FAILURE) {
+ return 1; /* does not exist in dest, copy from source */
+ }
+
+ if (new_per_dir_entry->status >= orig_per_dir_entry->status) {
+ /* use new entry */
+ phpapdebug((stderr, "ADDING/OVERWRITING %s (%d vs. %d)\n",
hash_key->arKey.s, new_per_dir_entry->status, orig_per_dir_entry->status));
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf)
{
@@ -128,9 +145,12 @@
ulong num_index;
n = create_php_config(p, "merge_php_config");
- zend_hash_copy(&n->config, &e->config, NULL, NULL,
sizeof(php_dir_entry));
-
+ /* copy old config */
+ zend_hash_copy(&n->config, &d->config, NULL, NULL,
sizeof(php_dir_entry));
+ /* merge new config */
phpapdebug((stderr, "Merge dir (%p)+(%p)=(%p)\n", base_conf, new_conf,
n));
+ zend_hash_merge_ex(&n->config, &e->config, NULL, sizeof(php_dir_entry),
(merge_checker_func_t) should_overwrite_per_dir_entry, NULL);
+#if STAS_0
for (zend_hash_internal_pointer_reset(&d->config);
zend_hash_get_current_key_ex(&d->config, &str,
&str_len,
&num_index, 0, NULL) == HASH_KEY_IS_STRING;
@@ -143,7 +163,7 @@
zend_hash_update(&n->config, str.s, str_len, data,
sizeof(*data), NULL);
phpapdebug((stderr, "ADDING/OVERWRITING %s (%d vs. %d)\n",
str.s, data->status, pe?pe->status:-1));
}
-
+#endif
return n;
}
--
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 /sapi/apache2handler apache_config.c
stasMon Nov 24 22:18:25 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/apachemod_php5.c
/php-src/sapi/apache2handlerapache_config.c
Log:
fix php_value application order for Apache
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php5.c?r1=1.19.2.7.2.14&r2=1.19.2.7.2.15&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.14
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.14Mon Dec 31 07:20:15 2007
+++ php-src/sapi/apache/mod_php5.c Mon Nov 24 22:18:25 2008
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: mod_php5.c,v 1.19.2.7.2.14 2007/12/31 07:20:15 sebastian Exp $ */
+/* $Id: mod_php5.c,v 1.19.2.7.2.15 2008/11/24 22:18:25 stas Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -729,11 +729,11 @@
return 1; /* does not exist in dest, copy from source */
}
- if (new_per_dir_entry->type==PHP_INI_SYSTEM
- && orig_per_dir_entry->type!=PHP_INI_SYSTEM) {
- return 1;
- } else {
+ if (orig_per_dir_entry->type==PHP_INI_SYSTEM
+ && new_per_dir_entry->type!=PHP_INI_SYSTEM) {
return 0;
+ } else {
+ return 1;
}
}
/* }}} */
@@ -770,9 +770,9 @@
/* need a copy of addv to merge */
new = php_create_dir(p, "php_merge_dir");
- zend_hash_copy(new, (HashTable *) addv, (copy_ctor_func_t)
copy_per_dir_entry, NULL, sizeof(php_per_dir_entry));
+ zend_hash_copy(new, (HashTable *) basev, (copy_ctor_func_t)
copy_per_dir_entry, NULL, sizeof(php_per_dir_entry));
- zend_hash_merge_ex(new, (HashTable *) basev, (copy_ctor_func_t)
copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t)
should_overwrite_per_dir_entry, NULL);
+ zend_hash_merge_ex(new, (HashTable *) addv, (copy_ctor_func_t)
copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t)
should_overwrite_per_dir_entry, NULL);
return new;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/apache_config.c?r1=1.7.2.1.2.5&r2=1.7.2.1.2.6&diff_format=u
Index: php-src/sapi/apache2handler/apache_config.c
diff -u php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.5
php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.6
--- php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.5 Mon Dec 31
07:20:15 2007
+++ php-src/sapi/apache2handler/apache_config.c Mon Nov 24 22:18:25 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: apache_config.c,v 1.7.2.1.2.5 2007/12/31 07:20:15 sebastian Exp $ */
+/* $Id: apache_config.c,v 1.7.2.1.2.6 2008/11/24 22:18:25 stas Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -117,6 +117,23 @@
return NULL;
}
+static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht,
php_dir_entry *new_per_dir_entry, zend_hash_key *hash_key, void *pData)
+{
+ php_dir_entry *orig_per_dir_entry;
+
+ if (zend_hash_find(target_ht, hash_key->arKey, hash_key->nKeyLength,
(void **) &orig_per_dir_entry)==FAILURE) {
+ return 1; /* does not exist in dest, copy from source */
+ }
+
+ if (new_per_dir_entry->status >= orig_per_dir_entry->status) {
+ /* use new entry */
+ phpapdebug((stderr, "ADDING/OVERWRITING %s (%d vs. %d)\n",
hash_key->arKey, new_per_dir_entry->status, orig_per_dir_entry->status));
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf)
{
@@ -128,9 +145,12 @@
ulong num_index;
n = create_php_config(p, "merge_php_config");
- zend_hash_copy(&n->config, &e->config, NULL, NULL,
sizeof(php_dir_entry));
-
+ /* copy old config */
+ zend_hash_copy(&n->config, &d->config, NULL, NULL,
sizeof(php_dir_entry));
+ /* merge new config */
phpapdebug((stderr, "Merge dir (%p)+(%p)=(%p)\n", base_conf, new_conf,
n));
+ zend_hash_merge_ex(&n->config, &e->config, NULL, sizeof(php_dir_entry),
(merge_checker_func_t) should_overwrite_per_dir_entry, NULL);
+#if STAS_0
for (zend_hash_internal_pointer_reset(&d->config);
zend_hash_get_current_key_ex(&d->config, &str,
&str_len,
&num_index, 0, NULL) == HASH_KEY_IS_STRING;
@@ -140,10 +160,10 @@
if (zend_hash_find(&n->config, str, str_len, (void **) &pe) ==
SUCCESS) {
if (pe->status >= data->status) continue;
}
- zend_hash_update(&n->config, str, str_len, data, sizeof(*data),
NULL);
phpapdebug((stderr, "
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/apache mod_php5.c /sapi/apache2handler apache_config.c
stasMon Nov 24 22:23:11 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/apachemod_php5.c
/php-src/sapi/apache2handlerapache_config.c
Log:
MFB: fix php_value application order for Apache
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php5.c?r1=1.19.2.7.2.13.2.8&r2=1.19.2.7.2.13.2.9&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.8
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.8Thu Nov 13 10:14:04 2008
+++ php-src/sapi/apache/mod_php5.c Mon Nov 24 22:23:11 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.8 2008/11/13 10:14:04 lbarnaud Exp $ */
+/* $Id: mod_php5.c,v 1.19.2.7.2.13.2.9 2008/11/24 22:23:11 stas Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -745,11 +745,11 @@
return 1; /* does not exist in dest, copy from source */
}
- if (new_per_dir_entry->type==PHP_INI_SYSTEM
- && orig_per_dir_entry->type!=PHP_INI_SYSTEM) {
- return 1;
- } else {
+ if (orig_per_dir_entry->type==PHP_INI_SYSTEM
+ && new_per_dir_entry->type!=PHP_INI_SYSTEM) {
return 0;
+ } else {
+ return 1;
}
}
/* }}} */
@@ -786,9 +786,9 @@
/* need a copy of addv to merge */
new = php_create_dir(p, "php_merge_dir");
- zend_hash_copy(new, (HashTable *) addv, (copy_ctor_func_t)
copy_per_dir_entry, NULL, sizeof(php_per_dir_entry));
+ zend_hash_copy(new, (HashTable *) basev, (copy_ctor_func_t)
copy_per_dir_entry, NULL, sizeof(php_per_dir_entry));
- zend_hash_merge_ex(new, (HashTable *) basev, (copy_ctor_func_t)
copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t)
should_overwrite_per_dir_entry, NULL);
+ zend_hash_merge_ex(new, (HashTable *) addv, (copy_ctor_func_t)
copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t)
should_overwrite_per_dir_entry, NULL);
return new;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/apache_config.c?r1=1.7.2.1.2.4.2.1&r2=1.7.2.1.2.4.2.2&diff_format=u
Index: php-src/sapi/apache2handler/apache_config.c
diff -u php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.4.2.1
php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.4.2.2
--- php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.4.2.1 Mon Dec 31
07:17:18 2007
+++ php-src/sapi/apache2handler/apache_config.c Mon Nov 24 22:23:11 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: apache_config.c,v 1.7.2.1.2.4.2.1 2007/12/31 07:17:18 sebastian Exp $
*/
+/* $Id: apache_config.c,v 1.7.2.1.2.4.2.2 2008/11/24 22:23:11 stas Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -117,6 +117,23 @@
return NULL;
}
+static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht,
php_dir_entry *new_per_dir_entry, zend_hash_key *hash_key, void *pData)
+{
+ php_dir_entry *orig_per_dir_entry;
+
+ if (zend_hash_find(target_ht, hash_key->arKey, hash_key->nKeyLength,
(void **) &orig_per_dir_entry)==FAILURE) {
+ return 1; /* does not exist in dest, copy from source */
+ }
+
+ if (new_per_dir_entry->status >= orig_per_dir_entry->status) {
+ /* use new entry */
+ phpapdebug((stderr, "ADDING/OVERWRITING %s (%d vs. %d)\n",
hash_key->arKey, new_per_dir_entry->status, orig_per_dir_entry->status));
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf)
{
@@ -128,9 +145,12 @@
ulong num_index;
n = create_php_config(p, "merge_php_config");
- zend_hash_copy(&n->config, &e->config, NULL, NULL,
sizeof(php_dir_entry));
-
+ /* copy old config */
+ zend_hash_copy(&n->config, &d->config, NULL, NULL,
sizeof(php_dir_entry));
+ /* merge new config */
phpapdebug((stderr, "Merge dir (%p)+(%p)=(%p)\n", base_conf, new_conf,
n));
+ zend_hash_merge_ex(&n->config, &e->config, NULL, sizeof(php_dir_entry),
(merge_checker_func_t) should_overwrite_per_dir_entry, NULL);
+#if STAS_0
for (zend_hash_internal_pointer_reset(&d->config);
zend_hash_get_current_key_ex(&d->config, &str,
&str_len,
&num_index, 0, NULL) == HASH_KEY_IS_STRING;
@@ -140,10 +160,10 @@
if (zend_hash_find(&n->config, str, str_len, (void **) &pe) ==
SUCCESS) {
if (pe->status >= data->status) continue;
}
- zend_hash_update(&n->config, str, str_len, data, sizeof(
[PHP-CVS] cvs: php-src /ext/mbstring php_unicode.c
iliaa Mon Nov 24 21:23:53 2008 UTC
Modified files:
/php-src/ext/mbstring php_unicode.c
Log:
MFB: Fixed bug #46626 (mb_convert_case does not handle apostrophe correctly)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_unicode.c?r1=1.17&r2=1.18&diff_format=u
Index: php-src/ext/mbstring/php_unicode.c
diff -u php-src/ext/mbstring/php_unicode.c:1.17
php-src/ext/mbstring/php_unicode.c:1.18
--- php-src/ext/mbstring/php_unicode.c:1.17 Thu Jul 24 13:46:35 2008
+++ php-src/ext/mbstring/php_unicode.c Mon Nov 24 21:23:53 2008
@@ -304,7 +304,7 @@
for (i = 0; i < unicode_len; i+=4) {
int res = php_unicode_is_prop(
BE_ARY_TO_UINT32(&unicode_ptr[i]),
-
UC_MN|UC_ME|UC_CF|UC_LM|UC_SK|UC_LU|UC_LL|UC_LT, 0);
+
UC_MN|UC_ME|UC_CF|UC_LM|UC_SK|UC_LU|UC_LL|UC_LT|UC_PO|UC_OS, 0);
if (mode) {
if (res) {
UINT32_TO_BE_ARY(&unicode_ptr[i],
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/mbstring php_unicode.c
iliaa Mon Nov 24 21:23:45 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring php_unicode.c
/php-srcNEWS
Log:
MFB: Fixed bug #46626 (mb_convert_case does not handle apostrophe correctly)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_unicode.c?r1=1.11.2.2.2.4&r2=1.11.2.2.2.5&diff_format=u
Index: php-src/ext/mbstring/php_unicode.c
diff -u php-src/ext/mbstring/php_unicode.c:1.11.2.2.2.4
php-src/ext/mbstring/php_unicode.c:1.11.2.2.2.5
--- php-src/ext/mbstring/php_unicode.c:1.11.2.2.2.4 Sun Feb 17 02:01:41 2008
+++ php-src/ext/mbstring/php_unicode.c Mon Nov 24 21:23:45 2008
@@ -308,7 +308,7 @@
for (i = 0; i < unicode_len; i+=4) {
int res = php_unicode_is_prop(
BE_ARY_TO_UINT32(&unicode_ptr[i]),
-
UC_MN|UC_ME|UC_CF|UC_LM|UC_SK|UC_LU|UC_LL|UC_LT, 0);
+
UC_MN|UC_ME|UC_CF|UC_LM|UC_SK|UC_LU|UC_LL|UC_LT|UC_PO|UC_OS, 0);
if (mode) {
if (res) {
UINT32_TO_BE_ARY(&unicode_ptr[i],
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1328&r2=1.2027.2.547.2.1329&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1328 php-src/NEWS:1.2027.2.547.2.1329
--- php-src/NEWS:1.2027.2.547.2.1328Mon Nov 24 15:37:33 2008
+++ php-src/NEWSMon Nov 24 21:23:45 2008
@@ -6,6 +6,8 @@
- Fixed memory leak inside readline_callback_handler_remove() function.
(Felipe)
- Fixed bug #46649 (Setting array element with that same array produces
inconsistent results). (Arnaud)
+- Fixed bug #46626 (mb_convert_case does not handle apostrophe correctly).
+ (Ilia)
20 Nov 2008, PHP 5.2.7RC4
- Added logging option for error_log to send directly to SAPI. (Stas)
--
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/mbstring php_unicode.c
iliaa Mon Nov 24 21:23:03 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring php_unicode.c
Log:
Fixed bug #46626 (mb_convert_case does not handle apostrophe correctly)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_unicode.c?r1=1.11.2.2.2.2.2.3&r2=1.11.2.2.2.2.2.4&diff_format=u
Index: php-src/ext/mbstring/php_unicode.c
diff -u php-src/ext/mbstring/php_unicode.c:1.11.2.2.2.2.2.3
php-src/ext/mbstring/php_unicode.c:1.11.2.2.2.2.2.4
--- php-src/ext/mbstring/php_unicode.c:1.11.2.2.2.2.2.3 Thu Jul 24 13:46:49 2008
+++ php-src/ext/mbstring/php_unicode.c Mon Nov 24 21:23:03 2008
@@ -308,7 +308,7 @@
for (i = 0; i < unicode_len; i+=4) {
int res = php_unicode_is_prop(
BE_ARY_TO_UINT32(&unicode_ptr[i]),
-
UC_MN|UC_ME|UC_CF|UC_LM|UC_SK|UC_LU|UC_LL|UC_LT, 0);
+
UC_MN|UC_ME|UC_CF|UC_LM|UC_SK|UC_LU|UC_LL|UC_LT|UC_PO|UC_OS, 0);
if (mode) {
if (res) {
UINT32_TO_BE_ARY(&unicode_ptr[i],
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard string.c
On Monday 24 November 2008 20:31:02 Arnaud Le Blanc wrote:
> lbarnaud Mon Nov 24 19:31:02 2008 UTC
>
> Modified files:
> /php-src/ext/standard string.c
> Log:
Log message should have been:
Fix invalid read in strtr().
>
>
> http://cvs.php.net/viewvc.cgi/php-
src/ext/standard/string.c?r1=1.685&r2=1.686&diff_format=u
> Index: php-src/ext/standard/string.c
> diff -u php-src/ext/standard/string.c:1.685 php-
src/ext/standard/string.c:1.686
> --- php-src/ext/standard/string.c:1.685 Mon Nov 24 19:21:20 2008
> +++ php-src/ext/standard/string.c Mon Nov 24 19:31:02 2008
> @@ -18,7 +18,7 @@
> +--+
> */
>
> -/* $Id: string.c,v 1.685 2008/11/24 19:21:20 lbarnaud Exp $ */
> +/* $Id: string.c,v 1.686 2008/11/24 19:31:02 lbarnaud Exp $ */
>
> /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
>
> @@ -3986,7 +3986,7 @@
> }
> if (can_optimize) {
> for (i = trlen; i < str_to_len; i++) {
> - if (str_from[i] > 255) {
> + if (str_to[i] > 255) {
> can_optimize = 0;
> break;
> }
>
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c
lbarnaudMon Nov 24 19:31:02 2008 UTC
Modified files:
/php-src/ext/standard string.c
Log:
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.685&r2=1.686&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.685 php-src/ext/standard/string.c:1.686
--- php-src/ext/standard/string.c:1.685 Mon Nov 24 19:21:20 2008
+++ php-src/ext/standard/string.c Mon Nov 24 19:31:02 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.685 2008/11/24 19:21:20 lbarnaud Exp $ */
+/* $Id: string.c,v 1.686 2008/11/24 19:31:02 lbarnaud Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -3986,7 +3986,7 @@
}
if (can_optimize) {
for (i = trlen; i < str_to_len; i++) {
- if (str_from[i] > 255) {
+ if (str_to[i] > 255) {
can_optimize = 0;
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard array.c basic_functions.c
stasMon Nov 24 19:24:09 2008 UTC
Modified files:
/php-src/ext/standard array.c basic_functions.c
Log:
MFB: restore BC for arrays
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.465&r2=1.466&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.465 php-src/ext/standard/array.c:1.466
--- php-src/ext/standard/array.c:1.465 Tue Oct 21 22:06:48 2008
+++ php-src/ext/standard/array.cMon Nov 24 19:24:09 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.465 2008/10/21 22:06:48 lbarnaud Exp $ */
+/* $Id: array.c,v 1.466 2008/11/24 19:24:09 stas Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -771,16 +771,17 @@
Advances array argument's internal pointer to the last element and return
it */
PHP_FUNCTION(end)
{
- zval *array, **entry;
+ HashTable *array;
+ zval **entry;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H", &array) ==
FAILURE) {
return;
}
- zend_hash_internal_pointer_end(Z_ARRVAL_P(array));
+ zend_hash_internal_pointer_end(array);
if (return_value_used) {
- if (zend_hash_get_current_data(Z_ARRVAL_P(array), (void **)
&entry) == FAILURE) {
+ if (zend_hash_get_current_data(array, (void **) &entry) ==
FAILURE) {
RETURN_FALSE;
}
@@ -793,16 +794,17 @@
Move array argument's internal pointer to the previous element and return
it */
PHP_FUNCTION(prev)
{
- zval *array, **entry;
+ HashTable *array;
+ zval **entry;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H", &array) ==
FAILURE) {
return;
}
- zend_hash_move_backwards(Z_ARRVAL_P(array));
+ zend_hash_move_backwards(array);
if (return_value_used) {
- if (zend_hash_get_current_data(Z_ARRVAL_P(array), (void **)
&entry) == FAILURE) {
+ if (zend_hash_get_current_data(array, (void **) &entry) ==
FAILURE) {
RETURN_FALSE;
}
@@ -815,16 +817,17 @@
Move array argument's internal pointer to the next element and return it */
PHP_FUNCTION(next)
{
- zval *array, **entry;
+ HashTable *array;
+ zval **entry;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H", &array) ==
FAILURE) {
return;
}
- zend_hash_move_forward(Z_ARRVAL_P(array));
+ zend_hash_move_forward(array);
if (return_value_used) {
- if (zend_hash_get_current_data(Z_ARRVAL_P(array), (void **)
&entry) == FAILURE) {
+ if (zend_hash_get_current_data(array, (void **) &entry) ==
FAILURE) {
RETURN_FALSE;
}
@@ -837,16 +840,17 @@
Set array argument's internal pointer to the first element and return it */
PHP_FUNCTION(reset)
{
- zval *array, **entry;
+ HashTable *array;
+ zval **entry;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H", &array) ==
FAILURE) {
return;
}
- zend_hash_internal_pointer_reset(Z_ARRVAL_P(array));
+ zend_hash_internal_pointer_reset(array);
if (return_value_used) {
- if (zend_hash_get_current_data(Z_ARRVAL_P(array), (void **)
&entry) == FAILURE) {
+ if (zend_hash_get_current_data(array, (void **) &entry) ==
FAILURE) {
RETURN_FALSE;
}
@@ -859,13 +863,14 @@
Return the element currently pointed to by the internal array pointer */
PHP_FUNCTION(current)
{
- zval *array, **entry;
+ HashTable *array;
+ zval **entry;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H", &array) ==
FAILURE) {
return;
}
- if (zend_hash_get_current_data(Z_ARRVAL_P(array), (void **) &entry) ==
FAILURE) {
+ if (zend_hash_get_current_data(array, (void **) &entry) == FAILURE) {
RETURN_FALSE;
}
RETURN_ZVAL(*entry, 1, 0);
@@ -876,16 +881,16 @@
Return the key of the element currently pointed to by the internal array
pointer */
PHP_FUNCTION(key)
{
- zval *array;
+ HashTable *array;
zstr string_key;
uint string_length;
ulong num_key;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) ==
FAILURE) {
+ i
[PHP-CVS] cvs: php-src /ext/standard string.c
lbarnaudMon Nov 24 19:21:20 2008 UTC
Modified files:
/php-src/ext/standard string.c
Log:
Fixed bug #44075 (strtok misbehaving on unicode string)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.684&r2=1.685&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.684 php-src/ext/standard/string.c:1.685
--- php-src/ext/standard/string.c:1.684 Fri Nov 21 19:14:46 2008
+++ php-src/ext/standard/string.c Mon Nov 24 19:21:20 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.684 2008/11/21 19:14:46 felipe Exp $ */
+/* $Id: string.c,v 1.685 2008/11/24 19:21:20 lbarnaud Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1569,8 +1569,11 @@
end = i;
if (end - start) {
+ RETVAL_UNICODEL(u_p + start, end - start, 1);
+ /* skip matched token */
+ U16_FWD_1(u_p, end, rem_len);
BG(strtok_last) = u_p + end;
- RETURN_UNICODEL(u_p + start, end - start, 1);
+ return;
} else {
BG(strtok_last) = NULL;
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / README.PARAMETER_PARSING_API
stasMon Nov 24 19:18:35 2008 UTC Modified files: /php-srcREADME.PARAMETER_PARSING_API Log: add object-compatible array modes http://cvs.php.net/viewvc.cgi/php-src/README.PARAMETER_PARSING_API?r1=1.25&r2=1.26&diff_format=u Index: php-src/README.PARAMETER_PARSING_API diff -u php-src/README.PARAMETER_PARSING_API:1.25 php-src/README.PARAMETER_PARSING_API:1.26 --- php-src/README.PARAMETER_PARSING_API:1.25 Mon Aug 18 14:34:32 2008 +++ php-src/README.PARAMETER_PARSING_APIMon Nov 24 19:18:34 2008 @@ -39,12 +39,14 @@ instance of that class. a - array (zval*) + A - array or object (zval *) b - boolean (zend_bool) C - class (zend_class_entry*) d - double (double) f - function or array containing php method call info (returned as zend_fcall_info and zend_fcall_info_cache) h - array (returned as HashTable*) + H - array or HASH_OF(object) (returned as HashTable*) l - long (long) o - object of any type (zval*) O - object of specific type given by class entry (zval*, zend_class_entry) -- 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
lbarnaudMon Nov 24 19:17:57 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard basic_functions.c Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.76&r2=1.725.2.31.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.76 php-src/ext/standard/basic_functions.c:1.725.2.31.2.77 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.76 Thu Nov 13 19:22:01 2008 +++ php-src/ext/standard/basic_functions.c Mon Nov 24 19:17:56 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.76 2008/11/13 19:22:01 stas Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.77 2008/11/24 19:17:56 lbarnaud Exp $ */ #include "php.h" #include "php_streams.h" @@ -4131,6 +4131,7 @@ memset(BG(strtok_table), 0, 256); BG(strtok_string) = NULL; BG(strtok_zval) = NULL; + BG(strtok_last) = NULL; BG(locale_string) = NULL; BG(user_compare_func_name) = NULL; BG(array_walk_func_name) = NULL; -- 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
lbarnaudMon Nov 24 19:17:35 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard basic_functions.c Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.74&r2=1.725.2.31.2.64.2.75&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.74 php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.75 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.74 Mon Nov 24 18:12:17 2008 +++ php-src/ext/standard/basic_functions.c Mon Nov 24 19:17:34 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.74 2008/11/24 18:12:17 stas Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.75 2008/11/24 19:17:34 lbarnaud Exp $ */ #include "php.h" #include "php_streams.h" @@ -3677,6 +3677,7 @@ memset(BG(strtok_table), 0, 256); BG(strtok_string) = NULL; BG(strtok_zval) = NULL; + BG(strtok_last) = NULL; BG(locale_string) = NULL; BG(array_walk_fci) = empty_fcall_info; BG(array_walk_fci_cache) = empty_fcall_info_cache; -- 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
lbarnaudMon Nov 24 19:16:51 2008 UTC Modified files: /php-src/ext/standard basic_functions.c Log: Fixed some conditional jumps depending on uninitialised value http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.938&r2=1.939&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.938 php-src/ext/standard/basic_functions.c:1.939 --- php-src/ext/standard/basic_functions.c:1.938Mon Nov 17 11:26:24 2008 +++ php-src/ext/standard/basic_functions.c Mon Nov 24 19:16:51 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.938 2008/11/17 11:26:24 felipe Exp $ */ +/* $Id: basic_functions.c,v 1.939 2008/11/24 19:16:51 lbarnaud Exp $ */ #include "php.h" #include "php_streams.h" @@ -3657,6 +3657,7 @@ memset(BG(strtok_table), 0, 256); BG(strtok_string) = NULL; BG(strtok_zval) = NULL; + BG(strtok_last) = NULL; BG(locale_string) = NULL; BG(array_walk_fci) = empty_fcall_info; BG(array_walk_fci_cache) = empty_fcall_info_cache; @@ -5986,7 +5987,7 @@ zval **pp_filename; char *filename; int filename_len; - zend_bool process_sections; + zend_bool process_sections = 0; long scanner_mode = ZEND_INI_SCANNER_NORMAL; zend_file_handle fh; zend_ini_parser_cb_t ini_parser_cb; -- 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 array.c basic_functions.c
stasMon Nov 24 18:12:17 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard array.c basic_functions.c
Log:
restore BC for arrays
[DOC] natsort, natcasesort, usort, uasort, uksort, array_flip, array_unique
still won't work with objects
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.45&r2=1.308.2.21.2.37.2.46&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.45
php-src/ext/standard/array.c:1.308.2.21.2.37.2.46
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.45 Tue Oct 21 22:08:36 2008
+++ php-src/ext/standard/array.cMon Nov 24 18:12:16 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.308.2.21.2.37.2.45 2008/10/21 22:08:36 lbarnaud Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.46 2008/11/24 18:12:16 stas Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -751,16 +751,17 @@
Advances array argument's internal pointer to the last element and return
it */
PHP_FUNCTION(end)
{
- zval *array, **entry;
+ HashTable *array;
+ zval **entry;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H", &array) ==
FAILURE) {
return;
}
- zend_hash_internal_pointer_end(Z_ARRVAL_P(array));
+ zend_hash_internal_pointer_end(array);
if (return_value_used) {
- if (zend_hash_get_current_data(Z_ARRVAL_P(array), (void **)
&entry) == FAILURE) {
+ if (zend_hash_get_current_data(array, (void **) &entry) ==
FAILURE) {
RETURN_FALSE;
}
@@ -773,16 +774,17 @@
Move array argument's internal pointer to the previous element and return
it */
PHP_FUNCTION(prev)
{
- zval *array, **entry;
+ HashTable *array;
+ zval **entry;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H", &array) ==
FAILURE) {
return;
}
- zend_hash_move_backwards(Z_ARRVAL_P(array));
+ zend_hash_move_backwards(array);
if (return_value_used) {
- if (zend_hash_get_current_data(Z_ARRVAL_P(array), (void **)
&entry) == FAILURE) {
+ if (zend_hash_get_current_data(array, (void **) &entry) ==
FAILURE) {
RETURN_FALSE;
}
@@ -795,16 +797,17 @@
Move array argument's internal pointer to the next element and return it */
PHP_FUNCTION(next)
{
- zval *array, **entry;
+ HashTable *array;
+ zval **entry;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H", &array) ==
FAILURE) {
return;
}
- zend_hash_move_forward(Z_ARRVAL_P(array));
+ zend_hash_move_forward(array);
if (return_value_used) {
- if (zend_hash_get_current_data(Z_ARRVAL_P(array), (void **)
&entry) == FAILURE) {
+ if (zend_hash_get_current_data(array, (void **) &entry) ==
FAILURE) {
RETURN_FALSE;
}
@@ -817,16 +820,17 @@
Set array argument's internal pointer to the first element and return it */
PHP_FUNCTION(reset)
{
- zval *array, **entry;
+ HashTable *array;
+ zval **entry;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H", &array) ==
FAILURE) {
return;
}
- zend_hash_internal_pointer_reset(Z_ARRVAL_P(array));
+ zend_hash_internal_pointer_reset(array);
if (return_value_used) {
- if (zend_hash_get_current_data(Z_ARRVAL_P(array), (void **)
&entry) == FAILURE) {
+ if (zend_hash_get_current_data(array, (void **) &entry) ==
FAILURE) {
RETURN_FALSE;
}
@@ -839,13 +843,14 @@
Return the element currently pointed to by the internal array pointer */
PHP_FUNCTION(current)
{
- zval *array, **entry;
+ HashTable *array;
+ zval **entry;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H", &array) ==
FAILURE) {
return;
}
- if (zend_hash_get_current_data(Z_ARRVAL_P(array), (void **) &entry) ==
FAILURE) {
+ if (zend_hash_get_current_data(array, (void **) &entry) == FAILURE) {
RETURN_FALSE;
}
RETURN_ZVAL(*entry, 1, 0);
@@ -856,16 +861,16 @@
Return the key of the element currently pointed to by the internal array
pointer */
PHP_FUNCTION(k
[PHP-CVS] cvs: php-src(PHP_5_3) / README.PARAMETER_PARSING_API
stasMon Nov 24 18:10:36 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcREADME.PARAMETER_PARSING_API Log: add object-compatible array modes http://cvs.php.net/viewvc.cgi/php-src/README.PARAMETER_PARSING_API?r1=1.7.6.2.2.5&r2=1.7.6.2.2.6&diff_format=u Index: php-src/README.PARAMETER_PARSING_API diff -u php-src/README.PARAMETER_PARSING_API:1.7.6.2.2.5 php-src/README.PARAMETER_PARSING_API:1.7.6.2.2.6 --- php-src/README.PARAMETER_PARSING_API:1.7.6.2.2.5Mon Aug 18 14:34:59 2008 +++ php-src/README.PARAMETER_PARSING_APIMon Nov 24 18:10:36 2008 @@ -39,12 +39,14 @@ instance of that class. a - array (zval*) + A - array or object (zval *) b - boolean (zend_bool) C - class (zend_class_entry*) d - double (double) f - function or array containing php method call info (returned as zend_fcall_info and zend_fcall_info_cache) h - array (returned as HashTable*) + H - array or HASH_OF(object) (returned as HashTable*) l - long (long) o - object of any type (zval*) O - object of specific type given by class entry (zval*, zend_class_entry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/array array_product_error.phpt array_product_variation1.phpt array_product_variation2.phpt array_product_variation3.phpt array_product_variation4.phpt array_
ilewis Mon Nov 24 17:36:44 2008 UTC
Modified files:
/php-src/ext/standard/tests/array array_product_error.phpt
array_product_variation1.phpt
array_product_variation2.phpt
array_product_variation3.phpt
array_product_variation4.phpt
array_product_variation5.phpt
Log:
Adding some tests for array_product
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_product_error.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_product_error.phpt
diff -u /dev/null php-src/ext/standard/tests/array/array_product_error.phpt:1.2
--- /dev/null Mon Nov 24 17:36:44 2008
+++ php-src/ext/standard/tests/array/array_product_error.phpt Mon Nov 24
17:36:44 2008
@@ -0,0 +1,45 @@
+--TEST--
+Test array_product() function : error conditions
+--FILE--
+
+===DONE===
+--EXPECTF--
+*** Testing array_product() : error conditions ***
+
+-- Testing array_product() function with Zero arguments --
+
+Warning: array_product() expects exactly 1 parameter, 0 given in
%sarray_product_error.php on line %d
+NULL
+
+-- Testing array_product() function with more than expected no. of arguments --
+
+Warning: array_product() expects exactly 1 parameter, 2 given in
%sarray_product_error.php on line %d
+NULL
+
+-- Testing array_product() function incorrect argument type --
+
+Warning: array_product() expects parameter 1 to be array, Unicode string given
in %sarray_product_error.php on line %d
+NULL
+===DONE===
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_product_variation1.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_product_variation1.phpt
diff -u /dev/null
php-src/ext/standard/tests/array/array_product_variation1.phpt:1.2
--- /dev/null Mon Nov 24 17:36:44 2008
+++ php-src/ext/standard/tests/array/array_product_variation1.phpt Mon Nov
24 17:36:44 2008
@@ -0,0 +1,58 @@
+--TEST--
+Test array_product() function : variation
+--FILE--
+ true, "boolean (false)" => false,
+ "string" => "hello", "numeric string" => "12",
+ "resource" => $fp, "object" => new A(), "null" => null,
+ "array" => array(3,2));
+
+foreach ($types as $desc => $type) {
+ echo $desc . "\n";
+ var_dump(array_product(array($type)));
+ echo "\n";
+}
+
+fclose($fp);
+?>
+===DONE===
+--EXPECTF--
+*** Testing array_product() : variation - using non numeric values ***
+boolean (true)
+int(1)
+
+boolean (false)
+int(0)
+
+string
+int(0)
+
+numeric string
+int(12)
+
+resource
+int(%d)
+
+object
+int(1)
+
+null
+int(0)
+
+array
+int(1)
+
+===DONE===
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_product_variation2.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_product_variation2.phpt
diff -u /dev/null
php-src/ext/standard/tests/array/array_product_variation2.phpt:1.2
--- /dev/null Mon Nov 24 17:36:44 2008
+++ php-src/ext/standard/tests/array/array_product_variation2.phpt Mon Nov
24 17:36:44 2008
@@ -0,0 +1,22 @@
+--TEST--
+Test array_product() function : variation - using a keyed array
+--FILE--
+ 2, "janet" => 5)) );
+?>
+===DONE===
+--EXPECTF--
+*** Testing array_product() : variations ***
+
+-- Testing array_product() function with a keyed array --
+int(10)
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_product_variation3.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_product_variation3.phpt
diff -u /dev/null
php-src/ext/standard/tests/array/array_product_variation3.phpt:1.2
--- /dev/null Mon Nov 24 17:36:44 2008
+++ php-src/ext/standard/tests/array/array_product_variation3.phpt Mon Nov
24 17:36:44 2008
@@ -0,0 +1,48 @@
+--TEST--
+Test array_product() function : variation - negative numbers
+--FILE--
+
+===DONE===
+--EXPECTF--
+*** Testing array_product() : variations - negative numbers***
+
+-- Testing array_product() function with one negative number --
+int(-2)
+
+-- Testing array_product() function with two negative numbers --
+int(6)
+
+-- Testing array_product() function with three negative numbers --
+int(-24)
+
+-- Testing array_product() function with negative floats --
+float(-1.5)
+
+-- Testing array_product() function with negative floats --
+float(-9.999E+15)
+===DONE===
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_product_variation4.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_product_variation4.phpt
diff -u /dev/null
php-src/ext/standard/tests/array/array_product_variation4.phpt:1.2
--- /dev/null Mon Nov 24 17:36:44 2008
+++ php-src/ext/standard/tests/array/array_product_variation4.phpt Mon Nov
24 17:36:44 2008
@@
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main/streams streams.c xp_socket.c
dsp Mon Nov 24 15:37:34 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main/streams streams.c xp_socket.c
/php-srcNEWS
Log:
MFH: Revert fix for 43782, as it caused problems.
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.30&r2=1.82.2.6.2.31&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.30
php-src/main/streams/streams.c:1.82.2.6.2.31
--- php-src/main/streams/streams.c:1.82.2.6.2.30Tue Nov 11 01:56:33 2008
+++ php-src/main/streams/streams.c Mon Nov 24 15:37:33 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.6.2.30 2008/11/11 01:56:33 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.31 2008/11/24 15:37:33 dsp Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -641,7 +641,7 @@
/* use the configured timeout when checking eof */
if (!stream->eof && PHP_STREAM_OPTION_RETURN_ERR ==
php_stream_set_option(stream,
PHP_STREAM_OPTION_CHECK_LIVENESS,
- -1, NULL)) {
+ 0, NULL)) {
stream->eof = 1;
}
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.2.2.11&r2=1.33.2.2.2.12&diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.33.2.2.2.11
php-src/main/streams/xp_socket.c:1.33.2.2.2.12
--- php-src/main/streams/xp_socket.c:1.33.2.2.2.11 Wed Aug 27 07:48:37 2008
+++ php-src/main/streams/xp_socket.cMon Nov 24 15:37:33 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_socket.c,v 1.33.2.2.2.11 2008/08/27 07:48:37 dsp Exp $ */
+/* $Id: xp_socket.c,v 1.33.2.2.2.12 2008/11/24 15:37:33 dsp Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -280,12 +280,8 @@
if (sock->socket == -1) {
alive = 0;
- } else {
- if (php_pollfd_for(sock->socket,
PHP_POLLREADABLE|POLLPRI, &tv) > 0) {
- if (0 == recv(sock->socket,
&buf, sizeof(buf), MSG_PEEK) && php_socket_errno() != EAGAIN) {
- alive = 0;
- }
- } else {
+ } else if (php_pollfd_for(sock->socket,
PHP_POLLREADABLE|POLLPRI, &tv) > 0) {
+ if (0 == recv(sock->socket, &buf,
sizeof(buf), MSG_PEEK) && php_socket_errno() != EAGAIN) {
alive = 0;
}
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1327&r2=1.2027.2.547.2.1328&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1327 php-src/NEWS:1.2027.2.547.2.1328
--- php-src/NEWS:1.2027.2.547.2.1327Mon Nov 24 12:49:00 2008
+++ php-src/NEWSMon Nov 24 15:37:33 2008
@@ -269,7 +269,6 @@
overlapping needles). (Moriyoshi)
- Fixed Bug #43958 (class name added into the error message). (Dmitry)
- Fixed bug #43941 (json_encode silently cuts non-UTF8 strings). (Stas)
-- Fixed bug #43782 (feof() does not detect timeout on socket). (David Soria
Parra)
- Fixed bug #43668 (Added odbc.default_cursortype to control the ODBC
cursormodel). (Patrick)
- Fixed bug #43666 (Fixed code to use ODBC 3.52 datatypes for 64bit systems).
--
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/streams streams.c xp_socket.c
dsp Mon Nov 24 15:36:47 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main/streams streams.c xp_socket.c
Log:
MFH: Revert fix for 43782, as it caused problems.
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.18.2.19&r2=1.82.2.6.2.18.2.20&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.18.2.19
php-src/main/streams/streams.c:1.82.2.6.2.18.2.20
--- php-src/main/streams/streams.c:1.82.2.6.2.18.2.19 Tue Nov 11 01:55:51 2008
+++ php-src/main/streams/streams.c Mon Nov 24 15:36:47 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.6.2.18.2.19 2008/11/11 01:55:51 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.18.2.20 2008/11/24 15:36:47 dsp Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -650,7 +650,7 @@
/* use the configured timeout when checking eof */
if (!stream->eof && PHP_STREAM_OPTION_RETURN_ERR ==
php_stream_set_option(stream,
PHP_STREAM_OPTION_CHECK_LIVENESS,
- -1, NULL)) {
+ 0, NULL)) {
stream->eof = 1;
}
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.2.2.6.2.6&r2=1.33.2.2.2.6.2.7&diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.6
php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.7
--- php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.6 Tue Aug 26 16:06:36 2008
+++ php-src/main/streams/xp_socket.cMon Nov 24 15:36:47 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_socket.c,v 1.33.2.2.2.6.2.6 2008/08/26 16:06:36 dsp Exp $ */
+/* $Id: xp_socket.c,v 1.33.2.2.2.6.2.7 2008/11/24 15:36:47 dsp Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -280,12 +280,8 @@
if (sock->socket == -1) {
alive = 0;
- } else {
- if (php_pollfd_for(sock->socket,
PHP_POLLREADABLE|POLLPRI, &tv) > 0) {
- if (0 == recv(sock->socket,
&buf, sizeof(buf), MSG_PEEK) && php_socket_errno() != EAGAIN) {
- alive = 0;
- }
- } else {
+ } else if (php_pollfd_for(sock->socket,
PHP_POLLREADABLE|POLLPRI, &tv) > 0) {
+ if (0 == recv(sock->socket, &buf,
sizeof(buf), MSG_PEEK) && php_socket_errno() != EAGAIN) {
alive = 0;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams streams.c xp_socket.c
dsp Mon Nov 24 15:35:03 2008 UTC
Modified files:
/php-src/main/streams streams.c xp_socket.c
Log:
Revert fix for 43782, as it caused problems.
[DOC] We better document the issue at it is.
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.174&r2=1.175&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.174
php-src/main/streams/streams.c:1.175
--- php-src/main/streams/streams.c:1.174Tue Nov 11 01:55:19 2008
+++ php-src/main/streams/streams.c Mon Nov 24 15:35:03 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.174 2008/11/11 01:55:19 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.175 2008/11/24 15:35:03 dsp Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -840,7 +840,7 @@
/* use the configured timeout when checking eof */
if (!stream->eof && PHP_STREAM_OPTION_RETURN_ERR ==
php_stream_set_option(stream,
PHP_STREAM_OPTION_CHECK_LIVENESS,
- -1, NULL)) {
+ 0, NULL)) {
stream->eof = 1;
}
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.48&r2=1.49&diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.48
php-src/main/streams/xp_socket.c:1.49
--- php-src/main/streams/xp_socket.c:1.48 Tue Aug 26 16:06:23 2008
+++ php-src/main/streams/xp_socket.cMon Nov 24 15:35:03 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_socket.c,v 1.48 2008/08/26 16:06:23 dsp Exp $ */
+/* $Id: xp_socket.c,v 1.49 2008/11/24 15:35:03 dsp Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -280,12 +280,8 @@
if (sock->socket == -1) {
alive = 0;
- } else {
- if (php_pollfd_for(sock->socket,
PHP_POLLREADABLE|POLLPRI, &tv) > 0) {
- if (0 == recv(sock->socket,
&buf, sizeof(buf), MSG_PEEK) && php_socket_errno() != EAGAIN) {
- alive = 0;
- }
- } else {
+ } else if (php_pollfd_for(sock->socket,
PHP_POLLREADABLE|POLLPRI, &tv) > 0) {
+ if (0 == recv(sock->socket, &buf,
sizeof(buf), MSG_PEEK) && php_socket_errno() != EAGAIN) {
alive = 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_2) / NEWS
janiMon Nov 24 12:49:01 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - Keep the style ;) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1326&r2=1.2027.2.547.2.1327&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1326 php-src/NEWS:1.2027.2.547.2.1327 --- php-src/NEWS:1.2027.2.547.2.1326Sun Nov 23 20:36:31 2008 +++ php-src/NEWSMon Nov 24 12:49:00 2008 @@ -1,10 +1,11 @@ PHPNEWS ||| ?? Nov 2008, PHP 5.2.7 +- Upgraded PCRE to version 7.8 (Ilia) + - Fixed memory leak inside readline_callback_handler_remove() function. (Felipe) - Fixed bug #46649 (Setting array element with that same array produces inconsistent results). (Arnaud) -- Fixed bug #46643 (Upgraded PCRE to 7.8) 20 Nov 2008, PHP 5.2.7RC4 - Added logging option for error_log to send directly to SAPI. (Stas) -- 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/date/tests gmmktime_variation9.phpt
smantoorMon Nov 24 11:10:03 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/date/tests gmmktime_variation9.phpt Log: Fixed testcsae inputs so that test runs faster http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/gmmktime_variation9.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/date/tests/gmmktime_variation9.phpt diff -u php-src/ext/date/tests/gmmktime_variation9.phpt:1.1.2.2 php-src/ext/date/tests/gmmktime_variation9.phpt:1.1.2.3 --- php-src/ext/date/tests/gmmktime_variation9.phpt:1.1.2.2 Fri Nov 21 06:22:58 2008 +++ php-src/ext/date/tests/gmmktime_variation9.phpt Mon Nov 24 11:10:02 2008 @@ -1,5 +1,5 @@ --TEST-- -Test gmmktime() function : usage variation - Passing positive and negetive float values to arguments. +Test gmmktime() function : usage variation - Passing positive and negative float values to arguments. --FILE-- 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, + 'float 123456' => 123456, + 'float -123456' => -123456, 'float -10.5' => -10.5, ); @@ -39,19 +39,19 @@ --EXPECTREGEX-- \*\*\* Testing gmmktime\(\) : usage variation \*\*\* ---float 12.3456789000e10-- -(bool|int)\((false|45658554088)\) -(bool|int)\((false|7408625522408)\) -(bool|int)\((false|124674971880)\) -(bool|int)\((false|324659998242749288)\) -(bool|int)\((false|3906586568967811688)\) - ---float -12.3456789000e10-- -(bool|int)\((false|-4345912)\) -(bool|int)\((false|-7406189157592)\) -int\((-929300768|-122238606120)\) -(bool|int)\((false|-324659995848460312)\) -(bool|int)\((false|-3906586693265644312)\) +--float 123456-- +int\(1662595688\) +int\(1225589768\) +int\(1218306336\) +(bool|int)\((false|325855037288)\) +(bool|int)\((false|3844412784488)\) + +--float -123456-- +int\(773712488\) +int\(1210775048\) +int\(1218059424\) +(bool|int)\((false|-323460834712)\) +(bool|int)\((false|-3968710530712)\) --float -10.5-- int\(1218118088\) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/tests gmmktime_variation9.phpt
smantoorMon Nov 24 11:05:02 2008 UTC Modified files: /php-src/ext/date/tests gmmktime_variation9.phpt Log: Fixed testcsae inputs so that test runs faster http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/gmmktime_variation9.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/date/tests/gmmktime_variation9.phpt diff -u php-src/ext/date/tests/gmmktime_variation9.phpt:1.1 php-src/ext/date/tests/gmmktime_variation9.phpt:1.2 --- php-src/ext/date/tests/gmmktime_variation9.phpt:1.1 Fri Nov 21 06:21:51 2008 +++ php-src/ext/date/tests/gmmktime_variation9.phpt Mon Nov 24 11:05:02 2008 @@ -1,5 +1,5 @@ --TEST-- -Test gmmktime() function : usage variation - Passing positive and negetive float values to arguments. +Test gmmktime() function : usage variation - Passing positive and negative float values to arguments. --FILE-- 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, + 'float 123456' => 123456, + 'float -123456' => -123456, 'float -10.5' => -10.5, ); @@ -39,19 +39,19 @@ --EXPECTREGEX-- \*\*\* Testing gmmktime\(\) : usage variation \*\*\* ---float 12.3456789000e10-- -(bool|int)\((false|45658554088)\) -(bool|int)\((false|7408625522408)\) -(bool|int)\((false|124674971880)\) -(bool|int)\((false|324659998242749288)\) -(bool|int)\((false|3906586568967811688)\) - ---float -12.3456789000e10-- -(bool|int)\((false|-4345912)\) -(bool|int)\((false|-7406189157592)\) -int\((-929300768|-122238606120)\) -(bool|int)\((false|-324659995848460312)\) -(bool|int)\((false|-3906586693265644312)\) +--float 123456-- +int\(1662595688\) +int\(1225589768\) +int\(1218306336\) +(bool|int)\((false|325855037288)\) +(bool|int)\((false|3844412784488)\) + +--float -123456-- +int\(773712488\) +int\(1210775048\) +int\(1218059424\) +(bool|int)\((false|-323460834712)\) +(bool|int)\((false|-3968710530712)\) --float -10.5-- int\(1218118088\) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/date/tests gmmktime_basic.phpt gmmktime_error.phpt gmmktime_variation1.phpt gmmktime_variation2.phpt gmmktime_variation3.phpt gmmktime_variation4.phpt gmmktime_variatio
On 24.11.2008 09:15, Sanjay M Mantoor wrote: > Antony, > > Yes. It takes some time in passing on linux 64 bit. But I am seeing tests > are passing consistently here. > Here is sample run on linux64 bit. Please let me know if any problems. Could you change this test, so that it doesn't take 3 minutes to pass, please? I believe it would make 30 minutes under valgrind, which is unreasonably long for a test. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
