From: Bryan Duxbury <bryanduxbury@apache.org>
Date: Wed, 6 Oct 2010 00:23:30 +0000 (+0000)
Subject: THRIFT-941. php:  Make PHP C Extension use the defined Protocol writeMessageBegin... 
X-Git-Tag: 0.6.0~137
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=ded25bbe0d82ce151c633addd3b96d5c3e0c4dc1;p=common%2Fthrift.git

THRIFT-941. php:  Make PHP C Extension use the defined Protocol writeMessageBegin function

This patch causes the C extension to call into user-land to get the correct writeMessageBegin function.

Patch: Chris Goffinet

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@1004864 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp b/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp
index 8348a97b..3c2cc8c6 100644
--- a/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp
+++ b/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp
@@ -375,6 +375,8 @@ void binary_deserialize_spec(zval* zthis, PHPInputTransport& transport, HashTabl
 void binary_serialize_spec(zval* zthis, PHPOutputTransport& transport, HashTable* spec);
 void binary_serialize(int8_t thrift_typeID, PHPOutputTransport& transport, zval** value, HashTable* fieldspec);
 void skip_element(long thrift_typeID, PHPInputTransport& transport);
+void protocol_writeMessageBegin(zval *transport, const char* method_name, int32_t msgtype, int32_t seqID);
+
 
 // Create a PHP object given a typename and call the ctor, optionally passing up to 2 arguments
 void createObject(char* obj_typename, zval* return_value, int nargs = 0, zval* arg1 = NULL, zval* arg2 = NULL) {
@@ -644,6 +646,28 @@ void skip_element(long thrift_typeID, PHPInputTransport& transport) {
   throw_tprotocolexception(errbuf, INVALID_DATA);
 }
 
+void protocol_writeMessageBegin(zval* transport, const char* method_name, int32_t msgtype, int32_t seqID) {
+  zval *args[3];
+
+  MAKE_STD_ZVAL(args[0]);
+  ZVAL_STRINGL(args[0], (char*)method_name, strlen(method_name), 0);
+
+  MAKE_STD_ZVAL(args[1]);
+  ZVAL_LONG(args[1], msgtype);
+
+  MAKE_STD_ZVAL(args[2]);
+  ZVAL_LONG(args[2], seqID);
+
+  TSRMLS_FETCH();
+  zval ret;
+  ZVAL_NULL(&ret);
+  zval writeMessagefn;
+  ZVAL_STRING(&writeMessagefn, "writeMessageBegin", 0);
+  TSRMLS_FETCH();
+  call_user_function(EG(function_table), &transport, &writeMessagefn, &ret, 3, args TSRMLS_CC);
+  zval_dtor(&ret);
+}
+
 void binary_serialize_hashtable_key(int8_t keytype, PHPOutputTransport& transport, HashTable* ht, HashPosition& ht_pos) {
   bool keytype_is_numeric = (!((keytype == T_STRING) || (keytype == T_UTF8) || (keytype == T_UTF16)));
 
@@ -913,8 +937,10 @@ PHP_FUNCTION(thrift_protocol_write_binary) {
     RETURN_NULL();
   }
 
+
   try {
     PHPOutputTransport transport(*args[0]);
+    zval *protocol = *args[0];
     const char* method_name = Z_STRVAL_PP(args[1]);
     convert_to_long(*args[2]);
     int32_t msgtype = Z_LVAL_PP(args[2]);
@@ -925,18 +951,7 @@ PHP_FUNCTION(thrift_protocol_write_binary) {
     bool strictWrite = Z_BVAL_PP(args[5]);
     efree(args);
     args = NULL;
-
-    if (strictWrite) {
-      int32_t version = VERSION_1 | msgtype;
-      transport.writeI32(version);
-      transport.writeString(method_name, strlen(method_name));
-      transport.writeI32(seqID);
-    } else {
-      transport.writeString(method_name, strlen(method_name));
-      transport.writeI8(msgtype);
-      transport.writeI32(seqID);
-    }
-
+    protocol_writeMessageBegin(protocol, method_name, msgtype, seqID);
     zval* spec = zend_read_static_property(zend_get_class_entry(request_struct TSRMLS_CC), "_TSPEC", 6, false TSRMLS_CC);
     if (Z_TYPE_P(spec) != IS_ARRAY) {
         throw_tprotocolexception("Attempt to send non-Thrift object", INVALID_DATA);