Merge pull request #184 from do-aki/groonga-php

php binding holds some problems of memory

Patch by do_aki. Thanks!!!

bindings/php/groonga.c

@@ -120,20 +120,11 @@ PHP_FUNCTION(grn_ctx_close)
   zval *res = NULL;
   int res_id = -1;
 
-  grn_ctx *ctx;
-  grn_rc rc;
-
-
   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &res) == FAILURE) {
     return;
   }
 
-  ZEND_FETCH_RESOURCE(ctx, grn_ctx *, &res, res_id, "grn_ctx", le_grn_ctx);
-
-  if ((rc = grn_ctx_close(ctx)) != GRN_SUCCESS) {
-    RETURN_FALSE;
-  }
-
+  zend_list_delete(Z_LVAL_P(res)); // call grn_ctx_dtor
   RETURN_TRUE;
 }
 
@@ -201,10 +192,6 @@ PHP_FUNCTION(grn_ctx_recv)
   int flags;
   unsigned int str_len, qid;
 
-  MAKE_STD_ZVAL(ret);
-
-  array_init(ret);
-  array_init(return_value);
 
   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &res) == FAILURE) {
     return;
@@ -218,6 +205,10 @@ PHP_FUNCTION(grn_ctx_recv)
     RETURN_FALSE;
   }
 
+  MAKE_STD_ZVAL(ret);
+  array_init(ret);
+  array_init(return_value);
+
   add_next_index_long(ret, flags);
   add_next_index_stringl(ret, str, str_len, 1);
 

bindings/php/tests/001.phpt

@@ -0,0 +1,29 @@
+--TEST--
+groonga connection
+--DESCRIPTION--
+required: variables_order includes "E"
+--SKIPIF--
+<?php
+if (!extension_loaded("groonga")) print "skip";
+if (!getenv('GROONGA_TEST_HOST')) print "skip";
+?>
+--FILE--
+<?php
+$host = getenv('GROONGA_TEST_HOST');
+$port = getenv('GROONGA_TEST_PORT') ? getenv('GROONGA_TEST_PORT') : 10041;
+
+$grn = grn_ctx_init();
+grn_ctx_connect($grn, $host, $port) or die("cannot connect groong server ({$host}:{$port})");
+grn_ctx_send($grn, 'table_list');
+var_dump(grn_ctx_recv($grn));
+grn_ctx_close($grn);
+--EXPECTF--
+array(1) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    string(%d) "%s"
+  }
+}