[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/session/session.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/session/session.c trunk/ext/session/session.c
iliaaThu, 08 Mar 2012 03:31:46 +
Revision: http://svn.php.net/viewvc?view=revision&revision=324009
Log:
Fixed bug #60634 (Segmentation fault when trying to die() in
SessionHandler::write())
Bug: https://bugs.php.net/60634 (Assigned) Segmentation fault when trying to
die() in SessionHandler::write()
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/session/session.c
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/ext/session/session.c
U php/php-src/trunk/ext/session/session.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2012-03-07 19:47:18 UTC (rev 324008)
+++ php/php-src/branches/PHP_5_3/NEWS 2012-03-08 03:31:46 UTC (rev 324009)
@@ -52,6 +52,7 @@
. Fixed bug #60811 (php-fpm compilation problem). (rasmus)
- SOAP
+ . Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
. Fixed bug #60887 (SoapClient ignores user_agent option and sends no
User-Agent header). (carloschilazo at gmail dot com)
@@ -61,9 +62,6 @@
- PDO_Sqlite extension:
. Add createCollation support. (Damien)
-- SOAP:
- . Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
-
- Reflection:
. Fixed bug #60968 (Late static binding doesn't work with
ReflectionMethod::invokeArgs()). (Laruence)
@@ -71,6 +69,8 @@
- Session:
. Fixed bug #60860 (session.save_handler=user without defined function core
dumps). (Felipe)
+ . Fixed bug #60634 (Segmentation fault when trying to die() in
+SessionHandler::write()). (Ilia)
- Streams:
. Fixed bug #61115 (stream related segfault on fatal error in
Modified: php/php-src/branches/PHP_5_3/ext/session/session.c
===
--- php/php-src/branches/PHP_5_3/ext/session/session.c 2012-03-07 19:47:18 UTC
(rev 324008)
+++ php/php-src/branches/PHP_5_3/ext/session/session.c 2012-03-08 03:31:46 UTC
(rev 324009)
@@ -1512,9 +1512,7 @@
{
if (PS(session_status) == php_session_active) {
PS(session_status) = php_session_none;
- zend_try {
- php_session_save_current_state(TSRMLS_C);
- } zend_end_try();
+ php_session_save_current_state(TSRMLS_C);
}
}
/* }}} */
@@ -2167,7 +2165,9 @@
{
int i;
- php_session_flush(TSRMLS_C);
+ zend_try {
+ php_session_flush(TSRMLS_C);
+ } zend_end_try();
php_rshutdown_session_globals(TSRMLS_C);
/* this should NOT be done in php_rshutdown_session_globals() */
Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS 2012-03-07 19:47:18 UTC (rev 324008)
+++ php/php-src/branches/PHP_5_4/NEWS 2012-03-08 03:31:46 UTC (rev 324009)
@@ -44,6 +44,10 @@
. Fixed bug #60948 (mysqlnd FTBFS when -Wformat-security is enabled).
(Johannes)
+- 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)
Modified: php/php-src/branches/PHP_5_4/ext/session/session.c
===
--- php/php-src/branches/PHP_5_4/ext/session/session.c 2012-03-07 19:47:18 UTC
(rev 324008)
+++ php/php-src/branches/PHP_5_4/ext/session/session.c 2012-03-08 03:31:46 UTC
(rev 324009)
@@ -1450,9 +1450,7 @@
{
if (PS(session_status) == php_session_active) {
PS(session_status) = php_session_none;
- zend_try {
- php_session_save_current_state(TSRMLS_C);
- } zend_end_try();
+ php_session_save_current_state(TSRMLS_C);
}
}
/* }}} */
@@ -2142,7 +2140,9 @@
{
int i;
- php_session_flush(TSRMLS_C);
+ zend_try {
+ php_session_flush(TSRMLS_C);
+ } zend_end_try();
php_rshutdown_session_globals(TSRMLS_C);
/* this should NOT be done in php_rshutdown_session_globals() */
Modified: php/php-src/trunk/ext/session/session.c
===
--- php/php-src/trunk/ext/session/session.c 2012-03-07 19:47:18 UTC (rev
324008)
+++ php/php-src/trunk/ext/session/session.c 2012-03-08 03:31:46 UTC (rev
324009)
@@ -1450,9 +1450,7 @@
{
if (PS(session_status) == php_session_active) {
PS(session_status) = php_session_none;
- zend_try {
- php_session_save_current_state(TSRMLS_C);
- } zend_end_try();
+ php_session_save_current_state(TSRMLS_C);
}
}
/* }}} */
@@ -2142,7 +2140,9 @@
{
int i;
-
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS
cataphract Wed, 07 Mar 2012 19:47:18 + Revision: http://svn.php.net/viewvc?view=revision&revision=324008 Log: - Updated NEWS with news of bug #61306 having been resolved (see r323988). - Tidied up NEWS Bug: https://bugs.php.net/61306 (Assigned) Segfault at end of request Changed paths: U php/php-src/branches/PHP_5_4/NEWS Modified: php/php-src/branches/PHP_5_4/NEWS === --- php/php-src/branches/PHP_5_4/NEWS 2012-03-07 17:34:24 UTC (rev 324007) +++ php/php-src/branches/PHP_5_4/NEWS 2012-03-07 19:47:18 UTC (rev 324008) @@ -2,35 +2,34 @@ ||| ?? ??? 2012, PHP 5.4.1 RC1 -- Array: - . Fixed bug #52719 (array_walk_recursive crashes if third param of the -function is by reference). (Nikita Popov) - . Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX). -(Laruence) - - CLI Server: . "Connection: close" instead of "Connection: closed" (Gustavo) - Core: - . Fixed bug #60573 (type hinting with "self" keyword causes weird errors). + . Fixed bug #61225 (Incorect lexing of 0b00*+). (Pierrick) + . Fixed bug #61165 (Segfault - strip_tags()). (Laruence) + . 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 #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 #60801 (strpbrk() mishandles NUL byte). (Adam) - . Fixed bug #60911 (Confusing error message when extending traits). (Stefan) - . Fixed bug #60978 (exit code incorrect). (Laruence) - . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical -vars). (Laruence) - . Fixed bug #61011 (Crash when an exception is thrown by __autoload -accessing a static property). (Laruence) - . Fixed bug #61052 (Missing error check in trait 'insteadof' clause). (Stefan) - . Fixed bug #61072 (Memory leak when restoring an exception handler). -(Nikic, Laruence) - . Fixed bug #61087 (Memory leak in parse_ini_file when specifying -invalid scanner mode). (Nikic, Laruence) - . Fixed bug #61106 (Segfault when using header_register_callback). (Nikita Popov) - . Fixed bug #61165 (Segfault - strip_tags()). (Laruence) - . Fixed bug #61225 (Incorect lexing of 0b00*+). (Pierrick) + . Fixed bug #60573 (type hinting with "self" keyword causes weird errors). +(Laruence) + . Fixed bug #52719 (array_walk_recursive crashes if third param of the +function is by reference). (Nikita Popov) - Installation . Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones) @@ -70,15 +69,19 @@ - Standard: . Fixed memory leak in substr_replace. (Pierrick) . Make max_file_uploads ini directive settable outside of php.ini (Rasmus) - . Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths). (Ilia) + . Fixed bug #60106 (stream_socket_server silently truncates long unix socket +paths). (Ilia) - XMLRPC: - . Fixed bug #61097 (Memory leak in xmlrpc functions copying zvals). (Nikita Popov) - . Fixed bug #61264 (xmlrpc_parse_method_descriptions leaks temporary variable). (Nikita Popov) + . Fixed bug #61264 (xmlrpc_parse_method_descriptions leaks temporary +variable). (Nikita Popov) + . Fixed bug #61097 (Memory leak in xmlrpc functions copying zvals). (Nikita +Popov) - Zlib: + . Fixed bug #61306 (initialization of global inappropriate for ZTS). (Gustavo) + . Fixed bug #61287 (A particular string fails to decompress). (Mike) . Fixed bug #61139 (gzopen leaks when specifying invalid mode). (Nikita Popov) - . Fixed bug #61287 (A particular string fails to decompress). (Mike) 01 Mar 2012, PHP 5.4.0 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt
On 03/07/2012 10:15 AM, Stas Malyshev wrote: Hi! Users should be able to see the fixes in 5.4 by reading only 5.4 NEWS. That's why we merge 5.3 news before the release. See my other email. This is error prone since bugs may not be relevant, and release cycles may not coincide. I'd like it to be made redundant. I think the 5.3& 5.4 branches have to be considered distinct from now on. What's different now? Users may never touch a 5.3 bundle. If they install 5.4.0 and then upgrade to 5.4.1, they need to know what has changed in between. Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt
On 03/07/2012 10:22 AM, Stas Malyshev wrote: Hi! I think what Chris is asking is to have NEWS entries in the branch where a commit is done, no mater if the fix was already reported in a previous branch NEWS file. It'd mean instead of easy merge on release we'd have to have hard and time-consuming cleanup of old NEWS - I'd have to go through NEWS and for each entry go to 5.3 NEWS and check if it's there too and if it's there remove it. Or we'd just have it twice in both 5.3 and 5.4 sections? Ideally from the users/readers point of view, each branch that has a fix would have a related NEWS entry. With git this discussion might be moot so we might want to drop this thread. However my general standpoint is: 1. we should commit a comment to each branch's NEWS file when code is committed to that branch. 2. the previous branch's NEWS files would not be merged into the N+1 branch at N+1 release. 3. the RC release fixes would stay under their RC section headers. This would mean trivially more developer effort at commit time but would: 1. show more accurately what is fixed in any code bundle. 2. require almost no manual cleanup at release time (except for grammar etc). We need to figure it out btw as if we carry NEWS with patches in git that would mean patches will never cleanly apply between branches (as NEWS files are always different). We need to have a better mechanism for this. If NEWS was automatically generated at push time or prior to release, then discussion is moot. Yes, some one-off manual tidy up might be needed at release time. BTW, why we don't put the same in the trunk NEWS then? Because of the current manual merge of the previous branch's NEWS at the time a new branch is released. E.g. 5.4.0 NEWS included the 5.3.10 NEWS. Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt
On Wed, Mar 7, 2012 at 7:22 PM, Stas Malyshev wrote: > Or we'd just have it twice in both 5.3 and 5.4 sections? Yes > BTW, why we don't put the same in the trunk NEWS then? I would say we could consider to add NEWS entry after a 1st release for a given branch? Cheers, -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt
Hi! I think what Chris is asking is to have NEWS entries in the branch where a commit is done, no mater if the fix was already reported in a previous branch NEWS file. It'd mean instead of easy merge on release we'd have to have hard and time-consuming cleanup of old NEWS - I'd have to go through NEWS and for each entry go to 5.3 NEWS and check if it's there too and if it's there remove it. Or we'd just have it twice in both 5.3 and 5.4 sections? We need to figure it out btw as if we carry NEWS with patches in git that would mean patches will never cleanly apply between branches (as NEWS files are always different). We need to have a better mechanism for this. BTW, why we don't put the same in the trunk NEWS then? -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt
I think what Chris is asking is to have NEWS entries in the branch where a commit is done, no mater if the fix was already reported in a previous branch NEWS file. On Wed, Mar 7, 2012 at 7:15 PM, Stas Malyshev wrote: > Hi! > > >> Users should be able to see the fixes in 5.4 by reading only 5.4 NEWS. > > > That's why we merge 5.3 news before the release. > >> I think the 5.3& 5.4 branches have to be considered distinct from now >> on. > > > > What's different now? > > -- > Stanislav Malyshev, Software Architect > SugarCRM: http://www.sugarcrm.com/ > (408)454-6900 ext. 227 > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt
Hi! Users should be able to see the fixes in 5.4 by reading only 5.4 NEWS. That's why we merge 5.3 news before the release. I think the 5.3& 5.4 branches have to be considered distinct from now on. What's different now? -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt
On 03/07/2012 10:00 AM, Stas Malyshev wrote: Hi! This one (#61173) isn't in 5.4 NEWS, since it was only fixed in 5.3.11. Do we now duplicate 5.3 and 5.4 NEWS? Users should be able to see the fixes in 5.4 by reading only 5.4 NEWS. I think the 5.3 & 5.4 branches have to be considered distinct from now on. Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ ext/standard/tests/general_functions/bug60227.phpt ext/standard/tests/general_functions/bug60227_1.phpt ext/standard/tests/general_functions/bug60227_
hi Chris, Agreed. I would also like to have entries for what get fixed since the last release of the same branch. It is even more important with the totally asynchronous (and somehow slow) 5.3 releases. On Wed, Mar 7, 2012 at 6:57 PM, Christopher Jones wrote: > > > On 03/07/2012 09:51 AM, Stas Malyshev wrote: >> >> Hi! >> >>> What about NEWS? >> >> >> It's already fixed in 5.3... > > > Urrgh, so it (#60227) is. We need a better branching mechanism so > users can tell what is fixed and what isn't in any particular release. > > -- > Email: christopher.jo...@oracle.com > Tel: +1 650 506 8630 > Blog: http://blogs.oracle.com/opal/ > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt
Hi! This one (#61173) isn't in 5.4 NEWS, since it was only fixed in 5.3.11. Do we now duplicate 5.3 and 5.4 NEWS? -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt
On 03/07/2012 08:06 AM, Christopher Jones wrote: On 3/6/12 11:38 PM, Stanislav Malyshev wrote: stas Wed, 07 Mar 2012 07:38:57 + Revision: http://svn.php.net/viewvc?view=revision&revision=323985 Log: MFH: Fixed bug #61173 (Unable to detect error from finfo constructor). Bug: https://bugs.php.net/61173 (Assigned) Unable to detect error from finfo constructor Changed paths: U php/php-src/branches/PHP_5_4/ext/fileinfo/fileinfo.c A php/php-src/branches/PHP_5_4/ext/fileinfo/tests/bug61173.phpt What about NEWS? Chris This one (#61173) isn't in 5.4 NEWS, since it was only fixed in 5.3.11. Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ ext/standard/tests/general_functions/bug60227.phpt ext/standard/tests/general_functions/bug60227_1.phpt ext/standard/tests/general_functions/bug60227_
On 03/07/2012 09:51 AM, Stas Malyshev wrote: Hi! What about NEWS? It's already fixed in 5.3... Urrgh, so it (#60227) is. We need a better branching mechanism so users can tell what is fixed and what isn't in any particular release. -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ ext/standard/tests/general_functions/bug60227.phpt ext/standard/tests/general_functions/bug60227_1.phpt ext/standard/tests/general_functions/bug60227_
Hi! What about NEWS? It's already fixed in 5.3... -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/zlib/zlib.c trunk/ext/zlib/zlib.c
On Mar 7, 2012, at 8:15 AM, Christopher Jones wrote: > > > On 3/7/12 12:51 AM, Gustavo André dos Santos Lopes wrote: >> cataphract Wed, 07 Mar 2012 08:51:30 + >> >> Revision: http://svn.php.net/viewvc?view=revision&revision=323988 >> >> Log: >> - Tentative fix for bug #61306. >> #cjones: Will update NEWS when confirmed it fixes the problem. >> >> Bug: https://bugs.php.net/61306 (Assigned) Segfault at end of request >> >> Changed paths: >> U php/php-src/branches/PHP_5_4/ext/zlib/zlib.c >> U php/php-src/trunk/ext/zlib/zlib.c >> > > LOL! My gut feel says that NEWS should be kept in sync whenever code > changes. It doesn't seem technically difficult. Keeping NEWS up to > date avoids any bus-factor or memory-loss situations. If a bug fix is > reverted, it's trivial to update NEWS again. NEWS comments can say > "attempt to fix" or "unfinished" if there is some temporary > uncertainty about a fix. They don't call him Christopher NEWS Jones for nothin'. :) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/zlib/zlib.c trunk/ext/zlib/zlib.c
On 3/7/12 12:51 AM, Gustavo André dos Santos Lopes wrote: cataphract Wed, 07 Mar 2012 08:51:30 + Revision: http://svn.php.net/viewvc?view=revision&revision=323988 Log: - Tentative fix for bug #61306. #cjones: Will update NEWS when confirmed it fixes the problem. Bug: https://bugs.php.net/61306 (Assigned) Segfault at end of request Changed paths: U php/php-src/branches/PHP_5_4/ext/zlib/zlib.c U php/php-src/trunk/ext/zlib/zlib.c LOL! My gut feel says that NEWS should be kept in sync whenever code changes. It doesn't seem technically difficult. Keeping NEWS up to date avoids any bus-factor or memory-loss situations. If a bug fix is reverted, it's trivial to update NEWS again. NEWS comments can say "attempt to fix" or "unfinished" if there is some temporary uncertainty about a fix. -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt
On 3/6/12 11:38 PM, Stanislav Malyshev wrote: stas Wed, 07 Mar 2012 07:38:57 + Revision: http://svn.php.net/viewvc?view=revision&revision=323985 Log: MFH: Fixed bug #61173 (Unable to detect error from finfo constructor). Bug: https://bugs.php.net/61173 (Assigned) Unable to detect error from finfo constructor Changed paths: U php/php-src/branches/PHP_5_4/ext/fileinfo/fileinfo.c A php/php-src/branches/PHP_5_4/ext/fileinfo/tests/bug61173.phpt What about NEWS? Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ ext/standard/tests/general_functions/bug60227.phpt ext/standard/tests/general_functions/bug60227_1.phpt ext/standard/tests/general_functions/bug60227_
On 3/6/12 11:49 PM, Stanislav Malyshev wrote: stas Wed, 07 Mar 2012 07:49:56 + Revision: http://svn.php.net/viewvc?view=revision&revision=323986 Log: MFH: Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227. Bug: https://bugs.php.net/60227 (Closed) header() cannot detect the multi-line header with CR(0x0D). Changed paths: D php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227.phpt A php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_1.phpt A php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_2.phpt A php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_3.phpt A php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_4.phpt U php/php-src/branches/PHP_5_4/main/SAPI.c What about NEWS? -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- 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_4/ext/zlib/zlib.c trunk/ext/zlib/zlib.c
cataphract Wed, 07 Mar 2012 08:51:30 +
Revision: http://svn.php.net/viewvc?view=revision&revision=323988
Log:
- Tentative fix for bug #61306.
#cjones: Will update NEWS when confirmed it fixes the problem.
Bug: https://bugs.php.net/61306 (Assigned) Segfault at end of request
Changed paths:
U php/php-src/branches/PHP_5_4/ext/zlib/zlib.c
U php/php-src/trunk/ext/zlib/zlib.c
Modified: php/php-src/branches/PHP_5_4/ext/zlib/zlib.c
===
--- php/php-src/branches/PHP_5_4/ext/zlib/zlib.c2012-03-07 07:55:26 UTC
(rev 323987)
+++ php/php-src/branches/PHP_5_4/ext/zlib/zlib.c2012-03-07 08:51:30 UTC
(rev 323988)
@@ -938,7 +938,6 @@
REGISTER_LONG_CONSTANT("ZLIB_ENCODING_GZIP", PHP_ZLIB_ENCODING_GZIP,
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("ZLIB_ENCODING_DEFLATE",
PHP_ZLIB_ENCODING_DEFLATE, CONST_CS|CONST_PERSISTENT);
REGISTER_INI_ENTRIES();
- ZLIBG(ob_gzhandler) = NULL;
return SUCCESS;
}
/* }}} */
@@ -989,6 +988,13 @@
}
/* }}} */
+/* {{{ ZEND_MODULE_GLOBALS_CTOR */
+static ZEND_MODULE_GLOBALS_CTOR_D(zlib)
+{
+ zlib_globals->ob_gzhandler = NULL;
+}
+/* }}} */
+
/* {{{ php_zlib_module_entry */
zend_module_entry php_zlib_module_entry = {
STANDARD_MODULE_HEADER,
@@ -1001,9 +1007,9 @@
PHP_MINFO(zlib),
"2.0",
PHP_MODULE_GLOBALS(zlib),
+ ZEND_MODULE_GLOBALS_CTOR_N(zlib),
NULL,
NULL,
- NULL,
STANDARD_MODULE_PROPERTIES_EX
};
/* }}} */
Modified: php/php-src/trunk/ext/zlib/zlib.c
===
--- php/php-src/trunk/ext/zlib/zlib.c 2012-03-07 07:55:26 UTC (rev 323987)
+++ php/php-src/trunk/ext/zlib/zlib.c 2012-03-07 08:51:30 UTC (rev 323988)
@@ -938,7 +938,6 @@
REGISTER_LONG_CONSTANT("ZLIB_ENCODING_GZIP", PHP_ZLIB_ENCODING_GZIP,
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("ZLIB_ENCODING_DEFLATE",
PHP_ZLIB_ENCODING_DEFLATE, CONST_CS|CONST_PERSISTENT);
REGISTER_INI_ENTRIES();
- ZLIBG(ob_gzhandler) = NULL;
return SUCCESS;
}
/* }}} */
@@ -990,6 +989,13 @@
}
/* }}} */
+/* {{{ ZEND_MODULE_GLOBALS_CTOR */
+static ZEND_MODULE_GLOBALS_CTOR_D(zlib)
+{
+ zlib_globals->ob_gzhandler = NULL;
+}
+/* }}} */
+
/* {{{ php_zlib_module_entry */
zend_module_entry php_zlib_module_entry = {
STANDARD_MODULE_HEADER,
@@ -1002,9 +1008,9 @@
PHP_MINFO(zlib),
"2.0",
PHP_MODULE_GLOBALS(zlib),
+ ZEND_MODULE_GLOBALS_CTOR_N(zlib),
NULL,
NULL,
- NULL,
STANDARD_MODULE_PROPERTIES_EX
};
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] karma.git branch master updated. fc9c78f
The branch, master on karma.git has been updated
via fc9c78fe12aa756060684e565adf8fb8a4373120 (commit)
from c388fdc594d5cf8f8f695eef47c179e2e1acc39e (commit)
http://git.php.net/?p=karma.git;a=log;h=fc9c78fe12aa756060684e565adf8fb8a4373120;hp=c388fdc594d5cf8f8f695eef47c179e2e1acc39e
Summary of changes:
hooks/post-receive |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-- Log
commit fc9c78fe12aa756060684e565adf8fb8a4373120
Author: David Soria Parra
Date: Wed Mar 7 09:41:34 2012 +0100
No comma needed
diff --git a/hooks/post-receive b/hooks/post-receive
index 3a45616..d64d5d1 100755
--- a/hooks/post-receive
+++ b/hooks/post-receive
@@ -234,7 +234,7 @@ generate_email_header()
X-Git-Oldrev: $oldrev
X-Git-Newrev: $newrev
- The $refname_type, $short_refname on $projectdesc has been
${change_type}d
+ The $refname_type $short_refname on $projectdesc has been
${change_type}d
EOF
}
Thank you for your contribution.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] karma.git branch PHP_POST_RECEIVE updated. 46adcc9
The branch, PHP_POST_RECEIVE on karma.git has been updated
via 46adcc9c1571d5a20660ca49b2762189a1495786 (commit)
from c7163b23683f8656f913ff4d22706ca5a5f41380 (commit)
http://git.php.net/?p=karma.git;a=log;h=46adcc9c1571d5a20660ca49b2762189a1495786;hp=c7163b23683f8656f913ff4d22706ca5a5f41380
Summary of changes:
README.POST_RECEIVE | 29 -
lib/Git/PostReceiveHook.php |2 +-
2 files changed, 29 insertions(+), 2 deletions(-)
-- Log
commit 46adcc9c1571d5a20660ca49b2762189a1495786
Author: Alexander Moskaliov
Date: Wed Mar 7 12:32:12 2012 +0400
add situatuions for mail per commit
diff --git a/README.POST_RECEIVE b/README.POST_RECEIVE
index fe0a666..522ff1f 100644
--- a/README.POST_RECEIVE
+++ b/README.POST_RECEIVE
@@ -79,4 +79,31 @@ Tag mail:
Commit mail:
-(Realization of this part in progress)
\ No newline at end of file
+(Realization of this part in progress)
+
+1 - 2 - 3 - A (pushed, but not new branch)
+
+5 - 2 - 6 - B (pushed, but not new branch)
+
+3 - 5 - 7 - C (already on server)
+
+We must check was every commit on repository before or not.
+git rev-list --max-count=1 REV --not ALL BRANCHES EXCEPT PUSHED BRANCHES
WITH THIS COMMIT
+If result empty - this commit already was pushed in one of others
repository.
+Examples:
+for 2 rev : we send mail
+for 3 rev : we not send mail, because it already in C branch
+
+
+1 - 2 - 3 - A (pushed)
+ \
+ 4 - 5 - B (pushed, new)
+
+6 - 7 - 8 - C (already on server)
+
+We must mark 1 commit as commit in branches A and B.
+If we didn't it and run "git rev-list --max-count=1 sha_for_1_commit --not
B C" we get wrong result,
+because commit 1 also in B branch.
+For this we get "old" revision of every updated branch and check if it
placed in every new branches.
+If it is we mark all revisions between "old" of updated branch and "new"
of new branch as revision also from new branch.
+So we get this command "git rev-list --max-count=1 sha_for_1_commit --not
C"
diff --git a/lib/Git/PostReceiveHook.php b/lib/Git/PostReceiveHook.php
index c34a55b..c515358 100644
--- a/lib/Git/PostReceiveHook.php
+++ b/lib/Git/PostReceiveHook.php
@@ -82,7 +82,7 @@ class PostReceiveHook extends ReceiveHook
if ($branch['changetype'] != self::TYPE_DELETED) {
if ($branch['changetype'] == self::TYPE_UPDATED) {
-// check if push was with --forced option
+// check if push was with --force option
if ($replacedRevisions = $this->getRevisions($branch['new'] .
'..' . $branch['old'])) {
$message .= "Discarded revisions: \n" . implode("\n",
$replacedRevisions) . "\n";
}
Thank you for your contribution.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
