[PHP-CVS] svn: /SVNROOT/ global_avail
pajoye Sun, 29 Jan 2012 09:20:28 + Revision: http://svn.php.net/viewvc?view=revisionrevision=322920 Log: - Remi Collet karma for pecl, long contributor already Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2012-01-29 06:58:22 UTC (rev 322919) +++ SVNROOT/global_avail2012-01-29 09:20:28 UTC (rev 322920) @@ -112,7 +112,7 @@ avail|dbs|web/pecl # General pecl -avail|auroraeosrose,ohill,csilles,t2k269,jhannus,moriyoshi,spankin,pqf,lebsack,acmurthy,markus,omar,dsp|pecl +avail|auroraeosrose,ohill,csilles,t2k269,jhannus,moriyoshi,spankin,pqf,lebsack,acmurthy,markus,omar,dsp,remi|pecl # access to gcov.php.net website. avail|helly,iliaa,nlopess,pronych,felixdv,felipe|web/gcov.git -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_alloc.c
derick Sun, 29 Jan 2012 11:17:07 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322921
Log:
CS fixes.
Changed paths:
U php/php-src/trunk/Zend/zend_alloc.c
Modified: php/php-src/trunk/Zend/zend_alloc.c
===
--- php/php-src/trunk/Zend/zend_alloc.c 2012-01-29 09:20:28 UTC (rev 322920)
+++ php/php-src/trunk/Zend/zend_alloc.c 2012-01-29 11:17:07 UTC (rev 322921)
@@ -1882,7 +1882,7 @@
size_t segment_size;
zend_mm_segment *segment;
int keep_rest = 0;
-#ifdef ZEND_SIGNALS
+#ifdef ZEND_SIGNALS
TSRMLS_FETCH();
#endif
@@ -2058,7 +2058,7 @@
zend_mm_block *mm_block;
zend_mm_block *next_block;
size_t size;
-#ifdef ZEND_SIGNALS
+#ifdef ZEND_SIGNALS
TSRMLS_FETCH();
#endif
if (!ZEND_MM_VALID_PTR(p)) {
@@ -2548,7 +2548,7 @@
ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC
ZEND_FILE_LINE_ORIG_DC)
{
void *p;
-#ifdef ZEND_SIGNALS
+#ifdef ZEND_SIGNALS
TSRMLS_FETCH();
#endif
HANDLE_BLOCK_INTERRUPTIONS();
@@ -2567,7 +2567,7 @@
{
int length;
char *p;
-#ifdef ZEND_SIGNALS
+#ifdef ZEND_SIGNALS
TSRMLS_FETCH();
#endif
@@ -2587,7 +2587,7 @@
ZEND_API char *_estrndup(const char *s, uint length ZEND_FILE_LINE_DC
ZEND_FILE_LINE_ORIG_DC)
{
char *p;
-#ifdef ZEND_SIGNALS
+#ifdef ZEND_SIGNALS
TSRMLS_FETCH();
#endif
@@ -2608,7 +2608,7 @@
ZEND_API char *zend_strndup(const char *s, uint length)
{
char *p;
-#ifdef ZEND_SIGNALS
+#ifdef ZEND_SIGNALS
TSRMLS_FETCH();
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /SVNROOT/ global_avail
On Jan 29, 2012, at 4:20 AM, Pierre Joye paj...@php.net wrote: pajoye Sun, 29 Jan 2012 09:20:28 + Revision: http://svn.php.net/viewvc?view=revisionrevision=322920 Log: - Remi Collet karma for pecl, long contributor already Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2012-01-29 06:58:22 UTC (rev 322919) +++ SVNROOT/global_avail2012-01-29 09:20:28 UTC (rev 322920) @@ -112,7 +112,7 @@ avail|dbs|web/pecl # General pecl -avail|auroraeosrose,ohill,csilles,t2k269,jhannus,moriyoshi,spankin,pqf,lebsack,acmurthy,markus,omar,dsp|pecl +avail|auroraeosrose,ohill,csilles,t2k269,jhannus,moriyoshi,spankin,pqf,lebsack,acmurthy,markus,omar,dsp,remi|pecl Typo there? Missing | ? -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /SVNROOT/ global_avail
On Jan 29, 2012, at 8:02 AM, Rasmus Lerdorf ras...@lerdorf.com wrote: On Jan 29, 2012, at 4:20 AM, Pierre Joye paj...@php.net wrote: pajoye Sun, 29 Jan 2012 09:20:28 + Revision: http://svn.php.net/viewvc?view=revisionrevision=322920 Log: - Remi Collet karma for pecl, long contributor already Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2012-01-29 06:58:22 UTC (rev 322919) +++ SVNROOT/global_avail2012-01-29 09:20:28 UTC (rev 322920) @@ -112,7 +112,7 @@ avail|dbs|web/pecl # General pecl -avail|auroraeosrose,ohill,csilles,t2k269,jhannus,moriyoshi,spankin,pqf,lebsack,acmurthy,markus,omar,dsp|pecl +avail|auroraeosrose,ohill,csilles,t2k269,jhannus,moriyoshi,spankin,pqf,lebsack,acmurthy,markus,omar,dsp,remi|pecl Typo there? Missing | ? Ah, never mind. The | looks exactly like l on my tablet here. -- 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/Zend/zend_execute_API.c trunk/Zend/zend_execute_API.c
derick Sun, 29 Jan 2012 15:25:40 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322922
Log:
- Reinstated correct return values after David's fix for #60218.
Bug: https://bugs.php.net/60218 (Closed) instantiating unknown class leads to
memory leak in cli
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
U php/php-src/trunk/Zend/zend_execute_API.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c2012-01-29
11:17:07 UTC (rev 322921)
+++ php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c2012-01-29
15:25:40 UTC (rev 322922)
@@ -1195,8 +1195,11 @@
}
CG(interactive) = 0;
+ retval = SUCCESS;
zend_try {
- zend_execute(new_op_array TSRMLS_CC);
+ zend_execute(new_op_array TSRMLS_CC);
+ } zend_catch {
+ retval = FAILURE;
} zend_end_try();
CG(interactive) = orig_interactive;
@@ -1218,7 +1221,6 @@
destroy_op_array(new_op_array TSRMLS_CC);
efree(new_op_array);
EG(return_value_ptr_ptr) = original_return_value_ptr_ptr;
- retval = SUCCESS;
} else {
retval = FAILURE;
}
Modified: php/php-src/trunk/Zend/zend_execute_API.c
===
--- php/php-src/trunk/Zend/zend_execute_API.c 2012-01-29 11:17:07 UTC (rev
322921)
+++ php/php-src/trunk/Zend/zend_execute_API.c 2012-01-29 15:25:40 UTC (rev
322922)
@@ -1195,8 +1195,11 @@
}
CG(interactive) = 0;
+ retval = SUCCESS;
zend_try {
zend_execute(new_op_array TSRMLS_CC);
+ } zend_catch {
+ retval = FAILURE;
} zend_end_try();
CG(interactive) = orig_interactive;
@@ -1218,7 +1221,6 @@
destroy_op_array(new_op_array TSRMLS_CC);
efree(new_op_array);
EG(return_value_ptr_ptr) = original_return_value_ptr_ptr;
- retval = SUCCESS;
} else {
retval = FAILURE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
