[PHP-CVS] [git] commit php-src.git: NEWS sapi/fpm/fpm/fpm_shm.c

2012-03-19 Thread Ilia Alshanetsky
Commit: edb57810a707e92b3fdb03fcf36fee53e1f69fd3
Author: Ilia Alshanetsky(ili...@php.net) Mon, 19 Mar 2012 13:10:23 -0400
Committer: Ilia Alshanetsky(ili...@php.net)  Mon, 19 Mar 2012 13:10:23 -0400
Parents: bcd19cf6491030f3bfd14d769011ba8f20d99333

Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=edb57810a707e92b3fdb03fcf36fee53e1f69fd3

Log:
Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).

Bugs:
https://bugs.php.net/61430

Changed paths:
  M  NEWS
  M  sapi/fpm/fpm/fpm_shm.c


Diff:
edb57810a707e92b3fdb03fcf36fee53e1f69fd3
diff --git a/NEWS b/NEWS
index 7563155..a2d7c05 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,10 @@ PHP  
  NEWS
 function is by reference). (Nikita Popov)
   . Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry)
 
+- FPM
+  . Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
+(michaelhood at gmail dot com, Ilia)
+
 - Ibase
   . Fixed bug #60947 (Segmentation fault while executing ibase_db_info).
 (Ilia)
diff --git a/sapi/fpm/fpm/fpm_shm.c b/sapi/fpm/fpm/fpm_shm.c
index 6acbddf..9226adf 100644
--- a/sapi/fpm/fpm/fpm_shm.c
+++ b/sapi/fpm/fpm/fpm_shm.c
@@ -35,7 +35,7 @@ void *fpm_shm_alloc(size_t size) /* {{{ */
return NULL;
}
 
-   memset(mem, size, 0);
+   memset(mem, 0, size);
fpm_shm_size += size;
return mem;
 }


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



[PHP-CVS] [git] commit php-src.git: NEWS

2012-03-19 Thread Ilia Alshanetsky
Commit: 5709f7dd5bd6874257f7b0f49f90fc1ff627a918
Author: Ilia Alshanetsky(ili...@php.net) Mon, 19 Mar 2012 13:10:53 -0400
Committer: Ilia Alshanetsky(ili...@php.net)  Mon, 19 Mar 2012 13:10:53 -0400
Parents: 867d980574ec8086cc40634fbd62af257504b8ea 
edb57810a707e92b3fdb03fcf36fee53e1f69fd3

Link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=5709f7dd5bd6874257f7b0f49f90fc1ff627a918

Log:
Merge branch '53' into 54

* 53:
  Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).

Bugs:
https://bugs.php.net/61430

Changed paths:
  MM  NEWS

5709f7dd5bd6874257f7b0f49f90fc1ff627a918
diff --combined NEWS
index 1b9b4cf,a2d7c05..ae0d190
--- a/NEWS
+++ b/NEWS
@@@ -1,43 -1,38 +1,47 @@@
  PHP
NEWS
  
|||
 -?? ??? 2012, PHP 5.3.11
 +?? ??? 2012, PHP 5.4.1 RC1
 +
 +- CLI Server:
 +  . Implemented FR #60850 (Built in web server does not set 
 +$_SERVER['SCRIPT_FILENAME'] when using router). (Laruence)
 +  . "Connection: close" instead of "Connection: closed" (Gustavo)
  
  - Core:
 -  . Fixed bug #61273 (call_user_func_array with more than 16333 arguments
 +  . Fixed bug #61374 (html_entity_decode tries to decode code points that 
don't
 +exist in ISO-8859-1). (Gustavo)
 +  . Fixed bug #61273 (call_user_func_array with more than 16333 arguments 
  leaks / crashes). (Laruence)
 +  . Fixed bug #61225 (Incorrect lexing of 0b00*+). (Pierrick)
. Fixed bug #61165 (Segfault - strip_tags()). (Laruence)
 -  . Improved max_input_vars directive to check nested variables (Dmitry).
 -  . Fixed bug #61095 (Incorect lexing of 0x00*+). (Etienne)
 +  . Fixed bug #61106 (Segfault when using header_register_callback). (Nikita
 +Popov)
. Fixed bug #61087 (Memory leak in parse_ini_file when specifying
  invalid scanner mode). (Nikic, Laruence)
. Fixed bug #61072 (Memory leak when restoring an exception handler).
  (Nikic, Laruence)
. Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX).
 -  (Laruence)
 -  . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical
 -  vars). (Laruence)
 -  . Fix bug #60895 (Possible invalid handler usage in windows random
 -functions). (Pierre)
 -  . Fixed bug #60825 (Segfault when running symfony 2 tests).
 -(Dmitry, Laruence)
 +(Laruence)
 +  . Fixed bug #61052 (Missing error check in trait 'insteadof' clause). 
(Stefan)
 +  . Fixed bug #61011 (Crash when an exception is thrown by __autoload
 +accessing a static property). (Laruence)
 +  . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical 
 +vars). (Laruence)
 +  . Fixed bug #60978 (exit code incorrect). (Laruence)
 +  . Fixed bug #60911 (Confusing error message when extending traits). (Stefan)
. Fixed bug #60801 (strpbrk() mishandles NUL byte). (Adam)
 +  . Fixed bug #60717 (Order of traits in use statement can cause a fatal
 +error). (Stefan)
 +  . Fixed bug #60573 (type hinting with "self" keyword causes weird errors).
 +(Laruence)
. Fixed bug #60569 (Nullbyte truncates Exception $message). (Ilia)
 -  . Fixed bug #60227 (header() cannot detect the multi-line header with CR).
 -(rui, Gustavo)
 -  . Fixed bug #60222 (time_nanosleep() does validate input params). (Ilia)
. Fixed bug #52719 (array_walk_recursive crashes if third param of the
  function is by reference). (Nikita Popov)
 -  . Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry)
  
+ - FPM
+   . Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
+ (michaelhood at gmail dot com, Ilia)
+ 
  - Ibase
. Fixed bug #60947 (Segmentation fault while executing ibase_db_info).
  (Ilia)
@@@ -45,504 -40,97 +49,504 @@@
  - Installation
. Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones)
  
 -- Fileinfo
 -  . Fixed bug #61173 (Unable to detect error from finfo constructor). 
(Gustavo)
 -
 -- Firebird Database extension (ibase):
 -  . Fixed bug #60802 (ibase_trans() gives segfault when passing params).
 +- mbstring:
 +  . MFH mb_ereg_replace_callback() for security enhancements. (Rui)
  
  - mysqli
. Fixed bug #61003 (mysql_stat() require a valid connection). (Johannes).
  
 +- mysqlnd
 +  . Fixed bug #60948 (mysqlnd FTBFS when -Wformat-security is enabled).
 +(Johannes)
 +
 +- Readline:
 +  . Fixed bug #61088 (Memory leak in readline_callback_handler_install).
 +(Nikic, Laruence)
 +
 +- Session
 +  . Fixed bug #60634 (Segmentation fault when trying to die() in 
 +SessionHandler::write()). (Ilia)
 +
 +- SOAP
 +  . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
 +User-Agent header). (carloschilazo at gmail dot com)
 +  . Fixed bug #60842, #51775 (Chunked response parsing error when 
 +chunksize length line is > 10 bytes). (Ilia)
 +
 +- PDO
 +  . Fixed bug #61292 (Segfault while calling a