Merge pull request #1649 from sjinks/1.2.5

[1.2.5] Phalcon'Queue\Beanstalk::watch() bug fix
phalcon · Dec 9, 2013 · 727e876 · 727e876
2 parents 68a6a2d + a9d5e3e
commit 727e876
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -14,6 +14,7 @@
  - Fixed parsing of annotations containing / (#1480)
  - Make sure that 'persistent' is resolved only when accessed for the first time (#1637)
  - Fix Phalcon\Session\Bag::remove() (#1637)
+ - Bug fixes in beanstalkd protocol implementation
 
 1.2.4
  - Fixed broken ACL inheritance (#905)

diff --git a/build/32bits/phalcon.c b/build/32bits/phalcon.c
@@ -99629,7 +99629,7 @@ static PHP_METHOD(Phalcon_Queue_Beanstalk, watch){
 
 	PHALCON_OBS_VAR(status);
 	phalcon_array_fetch_long(&status, response, 0, PH_NOISY);
-	if (PHALCON_IS_STRING(status, "WATCH")) {
+	if (PHALCON_IS_STRING(status, "WATCHING")) {
 		PHALCON_OBS_VAR(watching_tube);
 		phalcon_array_fetch_long(&watching_tube, response, 1, PH_NOISY);
 		RETURN_CCTOR(watching_tube);

diff --git a/build/64bits/phalcon.c b/build/64bits/phalcon.c
@@ -99629,7 +99629,7 @@ static PHP_METHOD(Phalcon_Queue_Beanstalk, watch){
 
 	PHALCON_OBS_VAR(status);
 	phalcon_array_fetch_long(&status, response, 0, PH_NOISY);
-	if (PHALCON_IS_STRING(status, "WATCH")) {
+	if (PHALCON_IS_STRING(status, "WATCHING")) {
 		PHALCON_OBS_VAR(watching_tube);
 		phalcon_array_fetch_long(&watching_tube, response, 1, PH_NOISY);
 		RETURN_CCTOR(watching_tube);

diff --git a/build/safe/phalcon.c b/build/safe/phalcon.c
@@ -99629,7 +99629,7 @@ static PHP_METHOD(Phalcon_Queue_Beanstalk, watch){
 
 	PHALCON_OBS_VAR(status);
 	phalcon_array_fetch_long(&status, response, 0, PH_NOISY);
-	if (PHALCON_IS_STRING(status, "WATCH")) {
+	if (PHALCON_IS_STRING(status, "WATCHING")) {
 		PHALCON_OBS_VAR(watching_tube);
 		phalcon_array_fetch_long(&watching_tube, response, 1, PH_NOISY);
 		RETURN_CCTOR(watching_tube);

diff --git a/ext/queue/beanstalk.c b/ext/queue/beanstalk.c
@@ -352,7 +352,7 @@ PHP_METHOD(Phalcon_Queue_Beanstalk, watch){
 
 	PHALCON_OBS_VAR(status);
 	phalcon_array_fetch_long(&status, response, 0, PH_NOISY);
-	if (PHALCON_IS_STRING(status, "WATCH")) {
+	if (PHALCON_IS_STRING(status, "WATCHING")) {
 		PHALCON_OBS_VAR(watching_tube);
 		phalcon_array_fetch_long(&watching_tube, response, 1, PH_NOISY);
 		RETURN_CCTOR(watching_tube);