Patch ampq_queue-patch.c for amqp Bug #62628

Patch version 2012-07-21 06:27 UTC

• 2012-07-21 06:27 UTC [diff to current]

Developer: cg-php@charlesgentry.com

diff --git a/amqp-1.0.4/amqp_queue.c b/amqp-1.0.4-fix/amqp_queue.c
index 44975fd..4ab87fa 100644
--- a/amqp-1.0.4/amqp_queue.c
+++ b/amqp-1.0.4-fix/amqp_queue.c
@@ -951,7 +951,7 @@ PHP_METHOD(amqp_queue_class, consume)
                        }

                        /* Check if user land function wants to bail */
-                       if (Z_TYPE_P(return_value) == IS_BOOL && !Z_BVAL_P(return_value)) {
+                       if (EG( exception ) ||(Z_TYPE_P(return_value) == IS_BOOL && !Z_BVAL_P(return_value)) ){
                                function_call_succeeded = 0;
                        }