Merge branch 'PHP-5.5'

* PHP-5.5: spelling
srgoogleguy · Dec 25, 2012 · ba6317b · ba6317b
2 parents 245dbb0 + 8e6bf9e
commit ba6317b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -1598,8 +1598,8 @@ static zend_always_inline zend_execute_data *i_create_execute_data_from_op_array
 	 * a copy of previous execute_data and passed parameters.
 	 */
 	if (UNEXPECTED((op_array->fn_flags & ZEND_ACC_GENERATOR) != 0)) {
-		/* Prepend the regular stack frame with copy on prev_execute_data
-		 * and passed arguments
+		/* Prepend the regular stack frame with a copy of prev_execute_data
+		 * and the passed arguments
 		 */
 		int args_count = zend_vm_stack_get_args_count_ex(EG(current_execute_data));
 		size_t args_size = ZEND_MM_ALIGNED_SIZE(sizeof(zval*)) * (args_count + 1);
@@ -1616,7 +1616,7 @@ static zend_always_inline zend_execute_data *i_create_execute_data_from_op_array
 		EX(prev_execute_data)->function_state.function = (zend_function*)op_array;
 		EX(prev_execute_data)->function_state.arguments = (void**)((char*)ZEND_VM_STACK_ELEMETS(EG(argument_stack)) + ZEND_MM_ALIGNED_SIZE(sizeof(zval*)) * args_count);
 
-		/* copy arguemnts */
+		/* copy arguments */
 		*EX(prev_execute_data)->function_state.arguments = (void*)(zend_uintptr_t)args_count;
 		if (args_count > 0) {
 			zval **arg_src = (zval**)zend_vm_stack_get_arg_ex(EG(current_execute_data), 1);