Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/Zend/tests/bug60825.phpt branches/PHP_5_3/Zend/zend_vm_def.h branches/PHP_5_3/Zend/zend_vm_execute.h trunk/NEWS trunk/Zend/tests
Sent from my iPhone 在 2012-1-25，15:49，Dmitry Stogov dmi...@zend.com 写道： On 01/25/2012 11:36 AM, Rasmus Lerdorf wrote: Still a known crash bug though. This is what our RCs are supposed to catch, right? This is not a single way to crash PHP with especially prepared code. Some of these ways are never going to be fixed. For me it doesn't mater if this patch will be committed before or after release. Anyway, the patch may have effect only on very specific PHP code and shouldn't make any harm. Indeed, I think we should been careful with *big* patch which might introduce new issues when in code freeze phase. Considering this little fix, it is no harm to commit to RC. :) Anyway it also okey for me to commit after release, since this is really a trivial bug and there are already one patche for me need to be remembered ci after 5.4.0 released. :) Thanks Thanks. Dmitry. On 01/24/2012 11:34 PM, Dmitry Stogov wrote: Hi Stas, Not a big problem, just yet another way to crash PHP locally with tricky code. It may be committed after release as well. Thanks. Dmitry. On 01/25/2012 11:29 AM, Stas Malyshev wrote: Hi! Now it looks fine. I think it should be committed into 5.4 as well. Stas? That would probably require new RC, i.e. release will have to be pushed back. How serious is the problem we're talking about? -- 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_3/NEWS branches/PHP_5_3/Zend/tests/bug60825.phpt branches/PHP_5_3/Zend/zend_vm_def.h branches/PHP_5_3/Zend/zend_vm_execute.h trunk/NEWS trunk/Zend/tests
hi! we need another RC anyway. There is another trait segfault and that openssl security bug. Cheers, On Wed, Jan 25, 2012 at 8:29 AM, Stas Malyshev smalys...@sugarcrm.com wrote: Hi! Now it looks fine. I think it should be committed into 5.4 as well. Stas? That would probably require new RC, i.e. release will have to be pushed back. How serious is the problem we're talking about? -- 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_3/NEWS branches/PHP_5_3/Zend/tests/bug60825.phpt branches/PHP_5_3/Zend/zend_vm_def.h branches/PHP_5_3/Zend/zend_vm_execute.h trunk/NEWS trunk/Zend/tests
to be more specific: If we do not want to delay 5.4 any further (and I think we should not delay it any longer after this RC). We should simply stop any kind of commits after it, to follow the golden release rule. Only very critical security issues should be allowed, after approvals. It is also easy to release 5.4.1 shortly after final. Cheers, On Wed, Jan 25, 2012 at 10:25 AM, Pierre Joye pierre@gmail.com wrote: hi! we need another RC anyway. There is another trait segfault and that openssl security bug. Cheers, On Wed, Jan 25, 2012 at 8:29 AM, Stas Malyshev smalys...@sugarcrm.com wrote: Hi! Now it looks fine. I think it should be committed into 5.4 as well. Stas? That would probably require new RC, i.e. release will have to be pushed back. How serious is the problem we're talking about? -- 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 -- 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
[PHP-CVS] svn: /SVNROOT/ pre-commit
dsp Wed, 25 Jan 2012 14:25:44 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322735
Log:
Move web/doc to git
Changed paths:
U SVNROOT/pre-commit
Modified: SVNROOT/pre-commit
===
--- SVNROOT/pre-commit 2012-01-25 14:01:35 UTC (rev 322734)
+++ SVNROOT/pre-commit 2012-01-25 14:25:44 UTC (rev 322735)
@@ -3,8 +3,8 @@
$migrated_repositories = array('systems/', 'web/php-bugs/', 'web/php-gcov/',
'web/php-master/', 'web/php-news/', 'web/qa/', 'web/php-people/',
'web/php-rmtools/',
-'web/pres2', 'web/presentations/', 'web/php-wiki/', 'web/php/',
'web/php-windows/',
-'web/pecl');
+'web/pres2/', 'web/presentations/', 'web/php-wiki/', 'web/php/',
'web/php-windows/',
+'web/pecl/', 'web/doc/');
//
-
// Include
require dirname(__FILE__) . '/hook-common.inc.php';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
dsp Wed, 25 Jan 2012 14:39:26 + Revision: http://svn.php.net/viewvc?view=revisionrevision=322737 Log: Move web/doc to git Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail 2012-01-25 14:31:39 UTC (rev 322736) +++ SVNROOT/global_avail 2012-01-25 14:39:26 UTC (rev 322737) @@ -22,7 +22,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad|php/php-src,pecl,phpdoc,phd,web/doc,web/doc-editor +avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad|php/php-src,pecl,phpdoc,phd,web/doc.git,web/doc-editor # Engine karma is further restricted (this line MUST come after lines granting # php-src karma and before lines granting Zend/TSRM karma) @@ -45,7 +45,7 @@ # Some people only work on PhD (The DocBook [manual] build system) # Those with php-src and/or phpdoc karma already have access to this -avail|loudi,mrkschan,pmjones,irker|phd,web/doc,web/doc-editor +avail|loudi,mrkschan,pmjones,irker|phd,web/doc.git,web/doc-editor # People who work on the Engine - not people with just tests access avail|andi,zeev,andrei,stas,sterling,sas,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp,shire,gron,gopalv,gwynne,pierrick,laruence|php/php-src/*/Zend,php/php-src/*/TSRM @@ -53,7 +53,7 @@ # The PHP Documentation Group maintains the documentation and its # translations.
[PHP-CVS] svn: /SVNROOT/ global_avail pre-commit
dsp Wed, 25 Jan 2012 15:31:53 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322741
Log:
Move web/php-testfest to git
Changed paths:
U SVNROOT/global_avail
U SVNROOT/pre-commit
Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2012-01-25 15:04:28 UTC (rev 322740)
+++ SVNROOT/global_avail2012-01-25 15:31:53 UTC (rev 322741)
@@ -41,7 +41,7 @@
avail|edink,jmertic,pajoye|php/win-installer
# Testfest web
-avail|davidc,lsmith,goldoraf,zoe|web/php-testfest
+avail|davidc,lsmith,goldoraf,zoe|web/testfest.git
# Some people only work on PhD (The DocBook [manual] build system)
# Those with php-src and/or phpdoc karma already have access to this
Modified: SVNROOT/pre-commit
===
--- SVNROOT/pre-commit 2012-01-25 15:04:28 UTC (rev 322740)
+++ SVNROOT/pre-commit 2012-01-25 15:31:53 UTC (rev 322741)
@@ -4,7 +4,7 @@
$migrated_repositories = array('systems/', 'web/php-bugs/', 'web/php-gcov/',
'web/php-master/', 'web/php-news/', 'web/qa/', 'web/php-people/',
'web/php-rmtools/',
'web/pres2/', 'web/presentations/', 'web/php-wiki/', 'web/php/',
'web/php-windows/',
-'web/pecl/', 'web/doc/');
+'web/pecl/', 'web/doc/', 'web/php-testfest/');
//
-
// Include
require dirname(__FILE__) . '/hook-common.inc.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_4/main/output.c branches/PHP_5_4/main/php_output.h trunk/main/output.c trunk/main/php_output.h
mike Wed, 25 Jan 2012 17:22:46 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322743
Log:
fix crash with display_startup_errors=1
Changed paths:
U php/php-src/branches/PHP_5_4/main/output.c
U php/php-src/branches/PHP_5_4/main/php_output.h
U php/php-src/trunk/main/output.c
U php/php-src/trunk/main/php_output.h
Modified: php/php-src/branches/PHP_5_4/main/output.c
===
--- php/php-src/branches/PHP_5_4/main/output.c 2012-01-25 15:59:08 UTC (rev
322742)
+++ php/php-src/branches/PHP_5_4/main/output.c 2012-01-25 17:22:46 UTC (rev
322743)
@@ -85,6 +85,18 @@
}
/* }}} */
+/* {{{ stderr writer if not PHP_OUTPUT_ACTIVATED */
+static int php_output_stderr(const char *str, size_t str_len)
+{
+ fwrite(str, 1, str_len, stderr);
+/* See http://support.microsoft.com/kb/190351 */
+#ifdef PHP_WIN32
+ fflush(stderr);
+#endif
+ return str_len;
+}
+/* }}} */
+
/* {{{ void php_output_startup(void)
* Set up module globals and initalize the conflict and reverse conflict hash
tables */
PHPAPI void php_output_startup(void)
@@ -117,6 +129,7 @@
#endif
zend_stack_init(OG(handlers));
+ OG(flags) |= PHP_OUTPUT_ACTIVATED;
return SUCCESS;
}
@@ -139,6 +152,8 @@
}
zend_stack_destroy(OG(handlers));
}
+
+ OG(flags) ^= PHP_OUTPUT_ACTIVATED;
}
/* }}} */
@@ -174,9 +189,11 @@
* Get output control status */
PHPAPI int php_output_get_status(TSRMLS_D)
{
- return OG(flags)
- | (OG(active) ? PHP_OUTPUT_ACTIVE : 0)
- | (OG(running)? PHP_OUTPUT_LOCKED : 0);
+ return (
+ OG(flags)
+ | (OG(active) ? PHP_OUTPUT_ACTIVE : 0)
+ | (OG(running)? PHP_OUTPUT_LOCKED : 0)
+ ) 0xff;
}
/* }}} */
@@ -187,7 +204,10 @@
if (OG(flags) PHP_OUTPUT_DISABLED) {
return 0;
}
- return sapi_module.ub_write(str, len TSRMLS_CC);
+ if (OG(flags) PHP_OUTPUT_ACTIVATED) {
+ return sapi_module.ub_write(str, len TSRMLS_CC);
+ }
+ return php_output_stderr(str, len);
}
/* }}} */
@@ -198,8 +218,11 @@
if (OG(flags) PHP_OUTPUT_DISABLED) {
return 0;
}
- php_output_op(PHP_OUTPUT_HANDLER_WRITE, str, len TSRMLS_CC);
- return (int) len;
+ if (OG(flags) PHP_OUTPUT_ACTIVATED) {
+ php_output_op(PHP_OUTPUT_HANDLER_WRITE, str, len TSRMLS_CC);
+ return (int) len;
+ }
+ return php_output_stderr(str, len);
}
/* }}} */
Modified: php/php-src/branches/PHP_5_4/main/php_output.h
===
--- php/php-src/branches/PHP_5_4/main/php_output.h 2012-01-25 15:59:08 UTC
(rev 322742)
+++ php/php-src/branches/PHP_5_4/main/php_output.h 2012-01-25 17:22:46 UTC
(rev 322743)
@@ -67,6 +67,8 @@
/* supplementary flags for php_output_get_status() */
#define PHP_OUTPUT_ACTIVE 0x10
#define PHP_OUTPUT_LOCKED 0x20
+/* output layer is ready to use */
+#define PHP_OUTPUT_ACTIVATED 0x10
/* handler hooks */
typedef enum _php_output_handler_hook_t {
Modified: php/php-src/trunk/main/output.c
===
--- php/php-src/trunk/main/output.c 2012-01-25 15:59:08 UTC (rev 322742)
+++ php/php-src/trunk/main/output.c 2012-01-25 17:22:46 UTC (rev 322743)
@@ -85,6 +85,18 @@
}
/* }}} */
+/* {{{ stderr writer if not PHP_OUTPUT_ACTIVATED */
+static int php_output_stderr(const char *str, size_t str_len)
+{
+ fwrite(str, 1, str_len, stderr);
+/* See http://support.microsoft.com/kb/190351 */
+#ifdef PHP_WIN32
+ fflush(stderr);
+#endif
+ return str_len;
+}
+/* }}} */
+
/* {{{ void php_output_startup(void)
* Set up module globals and initalize the conflict and reverse conflict hash
tables */
PHPAPI void php_output_startup(void)
@@ -117,6 +129,7 @@
#endif
zend_stack_init(OG(handlers));
+ OG(flags) |= PHP_OUTPUT_ACTIVATED;
return SUCCESS;
}
@@ -139,6 +152,8 @@
}
zend_stack_destroy(OG(handlers));
}
+
+ OG(flags) ^= PHP_OUTPUT_ACTIVATED;
}
/* }}} */
@@ -174,9 +189,11 @@
* Get output control status */
PHPAPI int php_output_get_status(TSRMLS_D)
{
- return OG(flags)
- | (OG(active) ? PHP_OUTPUT_ACTIVE : 0)
- | (OG(running)? PHP_OUTPUT_LOCKED : 0);
+ return (
+ OG(flags)
+ | (OG(active) ? PHP_OUTPUT_ACTIVE : 0)
+ | (OG(running)? PHP_OUTPUT_LOCKED : 0)
+ ) 0xff;
}
/* }}} */
@@ -187,7 +204,10 @@
if (OG(flags) PHP_OUTPUT_DISABLED) {
return 0;
}
- return
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/Zend/tests/bug60825.phpt branches/PHP_5_3/Zend/zend_vm_def.h branches/PHP_5_3/Zend/zend_vm_execute.h trunk/NEWS trunk/Zend/tests
Hi! Considering this little fix, it is no harm to commit to RC. :) Anyway it also okey for me to commit after release, since this is really a trivial bug and there are already one patche for me need to be remembered ci after 5.4.0 released. :) OK, it looks like we're going to have another RC anyway, so please commit it to 5.4 too. -- 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
[PHP-CVS] svn: /php/php-src/trunk/ run-tests.php
mike Wed, 25 Jan 2012 19:36:36 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322758
Log:
find a php-cgi which is a sibling of the php executable
Changed paths:
U php/php-src/trunk/run-tests.php
Modified: php/php-src/trunk/run-tests.php
===
--- php/php-src/trunk/run-tests.php 2012-01-25 19:32:58 UTC (rev 322757)
+++ php/php-src/trunk/run-tests.php 2012-01-25 19:36:36 UTC (rev 322758)
@@ -1357,6 +1357,9 @@
} else if (file_exists(./sapi/cgi/php-cgi)) {
$old_php = $php;
$php = realpath(./sapi/cgi/php-cgi) . ' -C ';
+ } else if (file_exists(dirname($php) . /php-cgi)) {
+ $old_php = $php;
+ $php = realpath(dirname($php) . /php-cgi) . '
-C ';
} else {
show_result('SKIP', $tested, $tested_file,
reason: CGI not available);
if ($JUNIT) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pre-commit
dsp Wed, 25 Jan 2012 21:34:03 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322760
Log:
Close web/. Everything is now in git.
Changed paths:
U SVNROOT/pre-commit
Modified: SVNROOT/pre-commit
===
--- SVNROOT/pre-commit 2012-01-25 19:47:35 UTC (rev 322759)
+++ SVNROOT/pre-commit 2012-01-25 21:34:03 UTC (rev 322760)
@@ -1,10 +1,7 @@
#!/usr/local/bin/php
?php
-$migrated_repositories = array('systems/', 'web/php-bugs/', 'web/php-gcov/',
-'web/php-master/', 'web/php-news/', 'web/qa/', 'web/php-people/',
'web/php-rmtools/',
-'web/pres2/', 'web/presentations/', 'web/php-wiki/', 'web/php/',
'web/php-windows/',
-'web/pecl/', 'web/doc/', 'web/php-testfest/');
+$migrated_repositories = array('systems/', 'web/');
//
-
// Include
require dirname(__FILE__) . '/hook-common.inc.php';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
dsp Wed, 25 Jan 2012 21:44:02 + Revision: http://svn.php.net/viewvc?view=revisionrevision=322761 Log: Move web/doc-editor to git Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail 2012-01-25 21:34:03 UTC (rev 322760) +++ SVNROOT/global_avail 2012-01-25 21:44:02 UTC (rev 322761) @@ -22,7 +22,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad|php/php-src,pecl,phpdoc,phd,web/doc.git,web/doc-editor +avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad|php/php-src,pecl,phpdoc,phd,web/doc.git,web/doc-editor.git # Engine karma is further restricted (this line MUST come after lines granting # php-src karma and before lines granting Zend/TSRM karma) @@ -45,7 +45,7 @@ # Some people only work on PhD (The DocBook [manual] build system) # Those with php-src and/or phpdoc karma already have access to this -avail|loudi,mrkschan,pmjones,irker|phd,web/doc.git,web/doc-editor +avail|loudi,mrkschan,pmjones,irker|phd,web/doc.git,web/doc-editor.git # People who work on the Engine - not people with just tests access avail|andi,zeev,andrei,stas,sterling,sas,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp,shire,gron,gopalv,gwynne,pierrick,laruence|php/php-src/*/Zend,php/php-src/*/TSRM @@ -53,7 +53,7 @@ # The PHP Documentation Group maintains the documentation and its # translations.
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/Zend/tests/bug60825.phpt branches/PHP_5_4/Zend/zend_vm_def.h branches/PHP_5_4/Zend/zend_vm_execute.h trunk/NEWS
laruence Thu, 26 Jan 2012 01:21:35 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322770
Log:
Fixed bug #60825 (Segfault when running symfony 2 tests)
Bug: https://bugs.php.net/60825 (Critical) Segfault when running symfony 2 tests
Changed paths:
U php/php-src/branches/PHP_5_4/NEWS
A php/php-src/branches/PHP_5_4/Zend/tests/bug60825.phpt
U php/php-src/branches/PHP_5_4/Zend/zend_vm_def.h
U php/php-src/branches/PHP_5_4/Zend/zend_vm_execute.h
U php/php-src/trunk/NEWS
Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS 2012-01-25 23:11:18 UTC (rev 322769)
+++ php/php-src/branches/PHP_5_4/NEWS 2012-01-26 01:21:35 UTC (rev 322770)
@@ -9,6 +9,8 @@
$_SERVER['REQUEST_TIME_FLOAT'] to include microsecond precision. (Patrick)
. Fixed bug #60809 (TRAITS - PHPDoc Comment Style Bug). (Dmitry)
. Fixed bug #60768 (Output buffer not discarded) (Mike)
+ . Fixed bug #60825 (Segfault when running symfony 2 tests).
+(Dmitry, Laruence)
- Hash
. Fixed bug #60221 (Tiger hash output byte order) (Mike)
Added: php/php-src/branches/PHP_5_4/Zend/tests/bug60825.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/bug60825.phpt (rev 0)
+++ php/php-src/branches/PHP_5_4/Zend/tests/bug60825.phpt 2012-01-26 01:21:35 UTC (rev 322770)
@@ -0,0 +1,19 @@
+--TEST--
+Bug #60825 (Segfault when running symfony 2 tests)
+--DESCRIPTION--
+run this with valgrind
+--FILE--
+?php
+class test {
+ public static $x;
+ public function __toString() {
+ self::$x = $this;
+ return __FILE__;
+ }
+}
+$a = new test;
+require_once $a;
+debug_zval_dump(test::$x);
+?
+--EXPECTF--
+string(%d) %sbug60825.php refcount(2)
Modified: php/php-src/branches/PHP_5_4/Zend/zend_vm_def.h
===
--- php/php-src/branches/PHP_5_4/Zend/zend_vm_def.h 2012-01-25 23:11:18 UTC (rev 322769)
+++ php/php-src/branches/PHP_5_4/Zend/zend_vm_def.h 2012-01-26 01:21:35 UTC (rev 322770)
@@ -2391,7 +2391,7 @@
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
} else if (OP2_TYPE != IS_CONST
- EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY)
+ EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY)
zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
zend_class_entry *ce;
zval **method = NULL;
@@ -2399,15 +2399,15 @@
zend_hash_index_find(Z_ARRVAL_P(function_name), 0, (void **) obj);
zend_hash_index_find(Z_ARRVAL_P(function_name), 1, (void **) method);
-
+
if (Z_TYPE_PP(obj) != IS_STRING Z_TYPE_PP(obj) != IS_OBJECT) {
zend_error_noreturn(E_ERROR, First array member is not a valid class name or object);
}
-
+
if (Z_TYPE_PP(method) != IS_STRING) {
zend_error_noreturn(E_ERROR, Second array member is not a valid method);
}
-
+
if (Z_TYPE_PP(obj) == IS_STRING) {
ce = zend_fetch_class_by_name(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj), NULL, 0 TSRMLS_CC);
if (UNEXPECTED(ce == NULL)) {
@@ -2415,7 +2415,7 @@
}
EX(called_scope) = ce;
EX(object) = NULL;
-
+
if (ce-get_static_method) {
EX(fbc) = ce-get_static_method(ce, Z_STRVAL_PP(method), Z_STRLEN_PP(method) TSRMLS_CC);
} else {
@@ -2429,7 +2429,7 @@
if (UNEXPECTED(EX(fbc) == NULL)) {
zend_error_noreturn(E_ERROR, Call to undefined method %s::%s(), Z_OBJ_CLASS_NAME_P(EX(object)), Z_STRVAL_PP(method));
}
-
+
if ((EX(fbc)-common.fn_flags ZEND_ACC_STATIC) != 0) {
EX(object) = NULL;
} else {
@@ -3693,17 +3693,18 @@
zend_op_array *new_op_array=NULL;
zend_free_op free_op1;
zval *inc_filename;
- zval tmp_inc_filename;
+zval *tmp_inc_filename = NULL;
zend_bool failure_retval=0;
SAVE_OPLINE();
inc_filename = GET_OP1_ZVAL_PTR(BP_VAR_R);
if (inc_filename-type!=IS_STRING) {
- ZVAL_COPY_VALUE(tmp_inc_filename, inc_filename);
- zval_copy_ctor(tmp_inc_filename);
- convert_to_string(tmp_inc_filename);
- inc_filename = tmp_inc_filename;
+ MAKE_STD_ZVAL(tmp_inc_filename);
+ ZVAL_COPY_VALUE(tmp_inc_filename, inc_filename);
+ zval_copy_ctor(tmp_inc_filename);
+ convert_to_string(tmp_inc_filename);
+ inc_filename = tmp_inc_filename;
}
if (opline-extended_value != ZEND_EVAL strlen(Z_STRVAL_P(inc_filename)) != Z_STRLEN_P(inc_filename)) {
@@ -3767,8 +3768,8 @@
EMPTY_SWITCH_DEFAULT_CASE()
}
}
- if (inc_filename==tmp_inc_filename) {
- zval_dtor(tmp_inc_filename);
+ if (tmp_inc_filename) {
+ zval_ptr_dtor(tmp_inc_filename);
}
FREE_OP1();
if (UNEXPECTED(EG(exception) != NULL)) {
@@ -4510,15 +4511,15 @@
if (Z_TYPE_P(offset) = IS_BOOL /* simple scalar types */
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
-ZVAL_COPY_VALUE(tmp, offset);
-
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_vm_def.h branches/PHP_5_4/Zend/zend_vm_execute.h trunk/Zend/zend_vm_def.h trunk/Zend/zend_vm_execute.h
laruence Thu, 26 Jan 2012 01:28:37 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322774
Log:
WS, merged from trunk cause this issue, sorry
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_vm_def.h
U php/php-src/branches/PHP_5_4/Zend/zend_vm_execute.h
U php/php-src/trunk/Zend/zend_vm_def.h
U php/php-src/trunk/Zend/zend_vm_execute.h
Modified: php/php-src/branches/PHP_5_4/Zend/zend_vm_def.h
===
--- php/php-src/branches/PHP_5_4/Zend/zend_vm_def.h 2012-01-26 01:27:54 UTC (rev 322773)
+++ php/php-src/branches/PHP_5_4/Zend/zend_vm_def.h 2012-01-26 01:28:37 UTC (rev 322774)
@@ -2391,23 +2391,23 @@
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
} else if (OP2_TYPE != IS_CONST
- EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY)
- zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
+EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY)
+zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
zend_class_entry *ce;
zval **method = NULL;
zval **obj = NULL;
zend_hash_index_find(Z_ARRVAL_P(function_name), 0, (void **) obj);
zend_hash_index_find(Z_ARRVAL_P(function_name), 1, (void **) method);
-
+
if (Z_TYPE_PP(obj) != IS_STRING Z_TYPE_PP(obj) != IS_OBJECT) {
zend_error_noreturn(E_ERROR, First array member is not a valid class name or object);
}
-
+
if (Z_TYPE_PP(method) != IS_STRING) {
zend_error_noreturn(E_ERROR, Second array member is not a valid method);
}
-
+
if (Z_TYPE_PP(obj) == IS_STRING) {
ce = zend_fetch_class_by_name(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj), NULL, 0 TSRMLS_CC);
if (UNEXPECTED(ce == NULL)) {
@@ -2415,7 +2415,7 @@
}
EX(called_scope) = ce;
EX(object) = NULL;
-
+
if (ce-get_static_method) {
EX(fbc) = ce-get_static_method(ce, Z_STRVAL_PP(method), Z_STRLEN_PP(method) TSRMLS_CC);
} else {
@@ -4509,17 +4509,17 @@
if (Z_TYPE_P(offset) != IS_LONG) {
if (Z_TYPE_P(offset) = IS_BOOL /* simple scalar types */
-|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
+ || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
- ZVAL_COPY_VALUE(tmp, offset);
- zval_copy_ctor(tmp);
- convert_to_long(tmp);
- offset = tmp;
+ZVAL_COPY_VALUE(tmp, offset);
+zval_copy_ctor(tmp);
+convert_to_long(tmp);
+offset = tmp;
} else {
/* can not be converted to proper offset, return not set */
result = 0;
+ }
}
- }
if (Z_TYPE_P(offset) == IS_LONG) {
if (opline-extended_value ZEND_ISSET) {
if (offset-value.lval = 0 offset-value.lval Z_STRLEN_PP(container)) {
Modified: php/php-src/branches/PHP_5_4/Zend/zend_vm_execute.h
===
--- php/php-src/branches/PHP_5_4/Zend/zend_vm_execute.h 2012-01-26 01:27:54 UTC (rev 322773)
+++ php/php-src/branches/PHP_5_4/Zend/zend_vm_execute.h 2012-01-26 01:28:37 UTC (rev 322774)
@@ -1247,8 +1247,8 @@
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
} else if (IS_CONST != IS_CONST
- EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY)
- zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
+EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY)
+zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
zend_class_entry *ce;
zval **method = NULL;
zval **obj = NULL;
@@ -1548,8 +1548,8 @@
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
} else if (IS_TMP_VAR != IS_CONST
- EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY)
- zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
+EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY)
+zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
zend_class_entry *ce;
zval **method = NULL;
zval **obj = NULL;
@@ -1711,8 +1711,8 @@
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
} else if (IS_VAR != IS_CONST
- EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY)
- zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
+EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY)
+zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
zend_class_entry *ce;
zval **method = NULL;
zval **obj = NULL;
@@ -1907,8 +1907,8 @@
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
} else if (IS_CV != IS_CONST
- EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY)
- zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
+EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY)
+zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
zend_class_entry *ce;
zval **method = NULL;
zval **obj = NULL;
@@ -14039,17 +14039,17 @@
if (Z_TYPE_P(offset) != IS_LONG) {
if (Z_TYPE_P(offset) = IS_BOOL /* simple scalar types */
-|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
+ || (Z_TYPE_P(offset) == IS_STRING /* or
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS ext/ftp/ftp.c ext/openssl/xp_ssl.c
scottmac Thu, 26 Jan 2012 05:15:57 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322785
Log:
MFH r322485
Fix possible attack in SSL sockets with SSL 3.0 / TLS 1.0.
CVE-2011-3389
Changed paths:
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/ext/ftp/ftp.c
U php/php-src/branches/PHP_5_4/ext/openssl/xp_ssl.c
Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS 2012-01-26 04:16:32 UTC (rev 322784)
+++ php/php-src/branches/PHP_5_4/NEWS 2012-01-26 05:15:57 UTC (rev 322785)
@@ -1,6 +1,8 @@
PHPNEWS
|||
-?? Jan 2012, PHP 5.4.0
+?? Jan 2012, PHP 5.4.0 RC 7
+- Fix possible attack in SSL sockets with SSL 3.0 / TLS 1.0.
+ CVE-2011-3389. (Scott)
19 Jan 2012, PHP 5.4.0 RC6
Modified: php/php-src/branches/PHP_5_4/ext/ftp/ftp.c
===
--- php/php-src/branches/PHP_5_4/ext/ftp/ftp.c 2012-01-26 04:16:32 UTC (rev
322784)
+++ php/php-src/branches/PHP_5_4/ext/ftp/ftp.c 2012-01-26 05:15:57 UTC (rev
322785)
@@ -243,6 +243,7 @@
{
#if HAVE_OPENSSL_EXT
SSL_CTX *ctx = NULL;
+ long ssl_ctx_options = SSL_OP_ALL;
#endif
if (ftp == NULL) {
return 0;
@@ -279,7 +280,10 @@
return 0;
}
- SSL_CTX_set_options(ctx, SSL_OP_ALL);
+#if OPENSSL_VERSION_NUMBER = 0x0090605fL
+ ssl_ctx_options = ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
+#endif
+ SSL_CTX_set_options(ctx, ssl_ctx_options);
ftp-ssl_handle = SSL_new(ctx);
if (ftp-ssl_handle == NULL) {
@@ -1495,6 +1499,7 @@
#if HAVE_OPENSSL_EXT
SSL_CTX *ctx;
+ long ssl_ctx_options = SSL_OP_ALL;
#endif
if (data-fd != -1) {
@@ -1521,7 +1526,10 @@
return 0;
}
- SSL_CTX_set_options(ctx, SSL_OP_ALL);
+#if OPENSSL_VERSION_NUMBER = 0x0090605fL
+ ssl_ctx_options = ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
+#endif
+ SSL_CTX_set_options(ctx, ssl_ctx_options);
data-ssl_handle = SSL_new(ctx);
if (data-ssl_handle == NULL) {
Modified: php/php-src/branches/PHP_5_4/ext/openssl/xp_ssl.c
===
--- php/php-src/branches/PHP_5_4/ext/openssl/xp_ssl.c 2012-01-26 04:16:32 UTC
(rev 322784)
+++ php/php-src/branches/PHP_5_4/ext/openssl/xp_ssl.c 2012-01-26 05:15:57 UTC
(rev 322785)
@@ -310,6 +310,7 @@
TSRMLS_DC)
{
SSL_METHOD *method;
+ long ssl_ctx_options = SSL_OP_ALL;
if (sslsock-ssl_handle) {
if (sslsock-s.is_blocked) {
@@ -377,7 +378,10 @@
return -1;
}
- SSL_CTX_set_options(sslsock-ctx, SSL_OP_ALL);
+#if OPENSSL_VERSION_NUMBER = 0x0090605fL
+ ssl_ctx_options = ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
+#endif
+ SSL_CTX_set_options(sslsock-ctx, ssl_ctx_options);
#if OPENSSL_VERSION_NUMBER = 0x0090806fL
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
