com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_c ompile.c
| From: | Dmitry Stogov | Date: | Wed, 29 May 2013 07:12:43 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_c ompile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72251@lists.php.net to get a copy of this message | ||
Commit: 8b515fa00ad844af82158449ee3d5d1c72a93451
Author: Dmitry Stogov <dmitry@zend.com> Wed, 29 May 2013 11:12:43 +0400
Parents: bcdac7526d2f48014e1e5f44d1449f8b841ff9e8 13e5c97ffd75821c01bbec79c1d2233c50d36b0e
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8b515fa00ad844af82158449ee3d5d1c72a93451
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed incorrect argument number
Conflicts:
Zend/zend_compile.c
Changed paths:
MM Zend/zend_compile.c
Diff:
diff --cc Zend/zend_compile.c
index 82275ce,0fd1deb..3959517
--- a/Zend/zend_compile..c
+++ b/Zend/zend_compile.c
@@@ -5478,8 -4018,8 +5478,8 @@@ void zend_do_shell_exec(znode *result,
opline->opcode = ZEND_SEND_VAR;
break;
}
- opline->op1 = *cmd;
- opline->op2.u.opline_num = 1;
+ SET_NODE(opline->op1, cmd);
- opline->op2.opline_num = 0;
++ opline->op2.opline_num = 1;
opline->extended_value = ZEND_DO_FCALL;
SET_UNUSED(opline->op2);