[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/assert.c branches/PHP_5_4/ext/standard/assert.c trunk/ext/standard/assert.c

2011-05-26 Thread Ilia Alshanetsky
iliaaThu, 26 May 2011 18:17:43 +

Revision: http://svn.php.net/viewvc?view=revision&revision=311451

Log:
Fixed bug #54924 (assert.* is not being reset upon request shutdown).

Bug: http://bugs.php.net/54924 (Open) assert.active is not being reset upon 
request shutdown
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/standard/assert.c
U   php/php-src/branches/PHP_5_4/ext/standard/assert.c
U   php/php-src/trunk/ext/standard/assert.c

Modified: php/php-src/branches/PHP_5_3/ext/standard/assert.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/assert.c  2011-05-26 16:38:39 UTC 
(rev 311450)
+++ php/php-src/branches/PHP_5_3/ext/standard/assert.c  2011-05-26 18:17:43 UTC 
(rev 311451)
@@ -253,8 +253,8 @@
case ASSERT_ACTIVE:
oldint = ASSERTG(active);
if (ac == 2) {
-   convert_to_long_ex(value);
-   ASSERTG(active) = Z_LVAL_PP(value);
+   convert_to_string_ex(value);
+   zend_alter_ini_entry_ex("assert.active", 
sizeof("assert.active"), Z_STRVAL_PP(value), Z_STRLEN_PP(value), PHP_INI_USER, 
PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC);
}
RETURN_LONG(oldint);
break;
@@ -262,8 +262,8 @@
case ASSERT_BAIL:
oldint = ASSERTG(bail);
if (ac == 2) {
-   convert_to_long_ex(value);
-   ASSERTG(bail) = Z_LVAL_PP(value);
+   convert_to_string_ex(value);
+   zend_alter_ini_entry_ex("assert.bail", 
sizeof("assert.bail"), Z_STRVAL_PP(value), Z_STRLEN_PP(value), PHP_INI_USER, 
PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC);
}
RETURN_LONG(oldint);
break;
@@ -271,8 +271,8 @@
case ASSERT_QUIET_EVAL:
oldint = ASSERTG(quiet_eval);
if (ac == 2) {
-   convert_to_long_ex(value);
-   ASSERTG(quiet_eval) = Z_LVAL_PP(value);
+   convert_to_string_ex(value);
+   zend_alter_ini_entry_ex("assert.quiet_eval", 
sizeof("assert.quiet_eval"), Z_STRVAL_PP(value), Z_STRLEN_PP(value), 
PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC);
}
RETURN_LONG(oldint);
break;
@@ -280,8 +280,8 @@
case ASSERT_WARNING:
oldint = ASSERTG(warning);
if (ac == 2) {
-   convert_to_long_ex(value);
-   ASSERTG(warning) = Z_LVAL_PP(value);
+   convert_to_string_ex(value);
+   zend_alter_ini_entry_ex("assert.warning", 
sizeof("assert.warning"), Z_STRVAL_PP(value), Z_STRLEN_PP(value), PHP_INI_USER, 
PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC);
}
RETURN_LONG(oldint);
break;

Modified: php/php-src/branches/PHP_5_4/ext/standard/assert.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/assert.c  2011-05-26 16:38:39 UTC 
(rev 311450)
+++ php/php-src/branches/PHP_5_4/ext/standard/assert.c  2011-05-26 18:17:43 UTC 
(rev 311451)
@@ -253,8 +253,8 @@
case ASSERT_ACTIVE:
oldint = ASSERTG(active);
if (ac == 2) {
-   convert_to_long_ex(value);
-   ASSERTG(active) = Z_LVAL_PP(value);
+   convert_to_string_ex(value);
+   zend_alter_ini_entry_ex("assert.active", 
sizeof("assert.active"), Z_STRVAL_PP(value), Z_STRLEN_PP(value), PHP_INI_USER, 
PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC);
}
RETURN_LONG(oldint);
break;
@@ -262,8 +262,8 @@
case ASSERT_BAIL:
oldint = ASSERTG(bail);
if (ac == 2) {
-   convert_to_long_ex(value);
-   ASSERTG(bail) = Z_LVAL_PP(value);
+   convert_to_string_ex(value);
+   zend_alter_ini_entry_ex("assert.bail", 
sizeof("assert.bail"), Z_STRVAL_PP(value), Z_STRLEN_PP(value), PHP_INI_USER, 
PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC);
}
RETURN_LONG(oldint);
break;
@@ -271,8 +271,8 @@
case ASSERT_QUIET_EVAL:
oldint = ASSERTG(quiet_eval);
if (ac == 2) {
-   convert_to_long_ex(value);
-   ASSERTG(quiet_eval) = Z_LVAL_PP(value);
+   convert_to_string_ex(value);
+   zend_alter_ini_entry_ex("assert.quiet_eval", 
sizeof("assert.quiet_eval"), Z_STRVAL_PP(value), Z_STRLEN_PP(value), 
PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC);
}
RETURN_LONG(oldint);
break;
@@ -280,8 +280,8 

Re: [PHP-CVS] svn: /php/php-src/trunk/ NEWS Zend/zend_multiply.h Zend/zend_operators.c Zend/zend_operators.h Zend/zend_vm_def.h Zend/zend_vm_execute.h

2011-05-26 Thread Ilia Alshanetsky
Not merging this into 5.4?

On Mon, May 23, 2011 at 4:05 AM, Dmitry Stogov  wrote:
> dmitry                                   Mon, 23 May 2011 08:05:44 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=311346
>
> Log:
> Arithmetic speedup. Inlined most probable code-paths for arithmetic 
> operations directly into executor.
>
> Changed paths:
>    U   php/php-src/trunk/NEWS
>    U   php/php-src/trunk/Zend/zend_multiply.h
>    U   php/php-src/trunk/Zend/zend_operators.c
>    U   php/php-src/trunk/Zend/zend_operators.h
>    U   php/php-src/trunk/Zend/zend_vm_def.h
>    U   php/php-src/trunk/Zend/zend_vm_execute.h
>
>
> --
> 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] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/dl.c branches/PHP_5_4/ext/standard/dl.c trunk/ext/standard/dl.c

2011-05-26 Thread Pierre Joye
pajoye   Thu, 26 May 2011 14:37:13 +

Revision: http://svn.php.net/viewvc?view=revision&revision=311444

Log:
-fix bug 54935, php_win_err can lead to crash

Bug: http://bugs.php.net/54935 (Open) php_win_err can lead to crash
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/standard/dl.c
U   php/php-src/branches/PHP_5_4/ext/standard/dl.c
U   php/php-src/trunk/ext/standard/dl.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-05-26 14:17:51 UTC (rev 311443)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-05-26 14:37:13 UTC (rev 311444)
@@ -21,10 +21,13 @@
 (Dmitry)

 - Core:
-  . Fixed a crash inside dtor for error handling. (Ilia)
   . Implemented FR #54459 (Range function accuracy). (Adam)
   . Added PHP_MANDIR constant telling where the manpages were installed into,
 and an --man-dir argument to php-config. (Hannes)
+
+  . Fixed a crash inside dtor for error handling. (Ilia)
+
+  . Fixed bug #54935 php_win_err can lead to crash. (Pierre)
   . Fixed bug #54895 (Fix compiling with older gcc version without need for
 membar_producer macro). (mhei at heimpold dot de)
   . Fixed bug #54723 (getimagesize() doesn't check the full ico signature).
@@ -35,13 +38,13 @@
 (CVE-2011-1148)
   . Fixed bug #54180 (parse_url() incorrectly parses path when ? in fragment).
 (tomas dot brastavicius at quantum dot lt, Pierrick)
-  . Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using
-TMPDIR on Windows). (Pierre)
   . Fixed bug #54866 (incorrect accounting for realpath_cache_size) (Dustin 
Ward)
   . Fixed bug #54721 (Different Hashes on Windows, BSD and Linux on wrong Salt 
size)
 (Pierre, os at irj dot ru)
   . Fixed bug #50363 (Invalid parsing in convert.quoted-printable-decode 
filter).
 (slusarz at curecanti dot org)
+  . Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using
+TMPDIR on Windows). (Pierre)

 - Apache2 Handler SAPI:
   . Fixed bug #54529 (SAPI crashes on apache_config.c:197).

Modified: php/php-src/branches/PHP_5_3/ext/standard/dl.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/dl.c  2011-05-26 14:17:51 UTC 
(rev 311443)
+++ php/php-src/branches/PHP_5_3/ext/standard/dl.c  2011-05-26 14:37:13 UTC 
(rev 311444)
@@ -148,7 +148,7 @@
if (!handle) {
 #if PHP_WIN32
char *err = GET_DL_ERROR();
-   if (err) {
+   if (err && (*err != "")) {
php_error_docref(NULL TSRMLS_CC, error_type, "Unable to 
load dynamic library '%s' - %s", libpath, err);
LocalFree(err);
} else {

Modified: php/php-src/branches/PHP_5_4/ext/standard/dl.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/dl.c  2011-05-26 14:17:51 UTC 
(rev 311443)
+++ php/php-src/branches/PHP_5_4/ext/standard/dl.c  2011-05-26 14:37:13 UTC 
(rev 311444)
@@ -145,7 +145,7 @@
if (!handle) {
 #if PHP_WIN32
char *err = GET_DL_ERROR();
-   if (err) {
+   if (err && (*err != "")) {
php_error_docref(NULL TSRMLS_CC, error_type, "Unable to 
load dynamic library '%s' - %s", libpath, err);
LocalFree(err);
} else {

Modified: php/php-src/trunk/ext/standard/dl.c
===
--- php/php-src/trunk/ext/standard/dl.c 2011-05-26 14:17:51 UTC (rev 311443)
+++ php/php-src/trunk/ext/standard/dl.c 2011-05-26 14:37:13 UTC (rev 311444)
@@ -145,7 +145,7 @@
if (!handle) {
 #if PHP_WIN32
char *err = GET_DL_ERROR();
-   if (err) {
+   if (err && (*err != "")) {
php_error_docref(NULL TSRMLS_CC, error_type, "Unable to 
load dynamic library '%s' - %s", libpath, err);
LocalFree(err);
} else {

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