sapi_srm sapi_srm/srm.c

Date:      Fri Apr 29 20:53:54 CEST 2005
User:      Rob Richards
Directory: sapi_srm

Log Message:
- Add support needed for exceptions in PHP 5


Modified files:
           sapi_srm/srm.c                   (version: 1.66)

[FILE: /sapi_srm/srm.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sapi_srm/srm.c:1.65 Sat Apr 09 10:04:03 2005 GMT
+++ sapi_srm/srm.c Fri Apr 29 16:53:53 2005 GMT
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: cvstemp,v 1.65 2005/04/09 12:04:03 rrichards Exp $ */
+/* $Id: cvstemp,v 1.66 2005/04/29 18:53:53 rrichards Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -421,7 +421,18 @@
                                printf("[Event  ] Error occured calling PHP 
function\n");
                        } else {
                                /* Add result to return queue */
+                               
+#ifdef ZEND_ENGINE_2
+                               if (EG(exception)) {
+                                       result = zval_to_srmval(EG(exception));
+                                       zend_clear_exception(TSRMLS_C);
+                                       VALP_SET_EXCEPTION(result);
+                               } else {
+                                       result = zval_to_srmval(&ret_val);
+                               }
+#else
                                result = zval_to_srmval(&ret_val);
+#endif
                        }
 
                        FREE_ZVAL(php_cmd);