aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/php
diff options
context:
space:
mode:
Diffstat (limited to 'src/php')
-rw-r--r--src/php/ext/grpc/call.c47
-rw-r--r--src/php/ext/grpc/server.c10
2 files changed, 33 insertions, 24 deletions
diff --git a/src/php/ext/grpc/call.c b/src/php/ext/grpc/call.c
index 64b1137c2a..8a2070481e 100644
--- a/src/php/ext/grpc/call.c
+++ b/src/php/ext/grpc/call.c
@@ -100,11 +100,11 @@ zval *grpc_parse_metadata_array(grpc_metadata_array
grpc_metadata *elem;
for (i = 0; i < count; i++) {
elem = &elements[i];
- key_len = strlen(elem->key);
+ key_len = GRPC_SLICE_LENGTH(elem->key);
str_key = ecalloc(key_len + 1, sizeof(char));
- memcpy(str_key, elem->key, key_len);
- str_val = ecalloc(elem->value_length + 1, sizeof(char));
- memcpy(str_val, elem->value, elem->value_length);
+ memcpy(str_key, GRPC_SLICE_START_PTR(elem->key), key_len);
+ str_val = ecalloc(GRPC_SLICE_LENGTH(elem->value) + 1, sizeof(char));
+ memcpy(str_val, GRPC_SLICE_START_PTR(elem->value), GRPC_SLICE_LENGTH(elem->value));
if (php_grpc_zend_hash_find(array_hash, str_key, key_len, (void **)&data)
== SUCCESS) {
if (Z_TYPE_P(data) != IS_ARRAY) {
@@ -115,13 +115,13 @@ zval *grpc_parse_metadata_array(grpc_metadata_array
efree(str_val);
return NULL;
}
- php_grpc_add_next_index_stringl(data, str_val, elem->value_length,
+ php_grpc_add_next_index_stringl(data, str_val, GRPC_SLICE_LENGTH(elem->value),
false);
} else {
PHP_GRPC_MAKE_STD_ZVAL(inner_array);
array_init(inner_array);
php_grpc_add_next_index_stringl(inner_array, str_val,
- elem->value_length, false);
+ GRPC_SLICE_LENGTH(elem->value), false);
add_assoc_zval(array, str_key, inner_array);
}
}
@@ -164,7 +164,7 @@ bool create_metadata_array(zval *array, grpc_metadata_array *metadata) {
if (key_type1 != HASH_KEY_IS_STRING) {
return false;
}
- if (!grpc_header_key_is_legal(key1, strlen(key1))) {
+ if (!grpc_header_key_is_legal(grpc_slice_from_static_string(key1))) {
return false;
}
inner_array_hash = Z_ARRVAL_P(inner_array);
@@ -172,9 +172,8 @@ bool create_metadata_array(zval *array, grpc_metadata_array *metadata) {
if (Z_TYPE_P(value) != IS_STRING) {
return false;
}
- metadata->metadata[metadata->count].key = key1;
- metadata->metadata[metadata->count].value = Z_STRVAL_P(value);
- metadata->metadata[metadata->count].value_length = Z_STRLEN_P(value);
+ metadata->metadata[metadata->count].key = grpc_slice_from_copied_string(key1);
+ metadata->metadata[metadata->count].value = grpc_slice_from_copied_buffer(Z_STRVAL_P(value), Z_STRLEN_P(value));
metadata->count += 1;
PHP_GRPC_HASH_FOREACH_END()
PHP_GRPC_HASH_FOREACH_END()
@@ -229,10 +228,15 @@ PHP_METHOD(Call, __construct) {
}
add_property_zval(getThis(), "channel", channel_obj);
wrapped_grpc_timeval *deadline = Z_WRAPPED_GRPC_TIMEVAL_P(deadline_obj);
+ grpc_slice method_slice = grpc_slice_from_copied_string(method);
+ grpc_slice host_slice = host_override != NULL ?
+ grpc_slice_from_copied_string(host_override) : grpc_empty_slice();
call->wrapped =
grpc_channel_create_call(channel->wrapped, NULL, GRPC_PROPAGATE_DEFAULTS,
- completion_queue, method, host_override,
+ completion_queue, method_slice, host_override != NULL ? &host_slice : NULL,
deadline->wrapped, NULL);
+ grpc_slice_unref(method_slice);
+ grpc_slice_unref(host_slice);
call->owned = true;
}
@@ -267,8 +271,8 @@ PHP_METHOD(Call, startBatch) {
grpc_metadata_array recv_metadata;
grpc_metadata_array recv_trailing_metadata;
grpc_status_code status;
- char *status_details = NULL;
- size_t status_details_capacity = 0;
+ grpc_slice recv_status_details = grpc_empty_slice();
+ grpc_slice send_status_details = grpc_empty_slice();
grpc_byte_buffer *message;
int cancelled;
grpc_call_error error;
@@ -380,8 +384,8 @@ PHP_METHOD(Call, startBatch) {
1 TSRMLS_CC);
goto cleanup;
}
- ops[op_num].data.send_status_from_server.status_details =
- Z_STRVAL_P(inner_value);
+ send_status_details = grpc_slice_from_copied_string(Z_STRVAL_P(inner_value));
+ ops[op_num].data.send_status_from_server.status_details = &send_status_details;
} else {
zend_throw_exception(spl_ce_InvalidArgumentException,
"String status details is required",
@@ -400,9 +404,7 @@ PHP_METHOD(Call, startBatch) {
&recv_trailing_metadata;
ops[op_num].data.recv_status_on_client.status = &status;
ops[op_num].data.recv_status_on_client.status_details =
- &status_details;
- ops[op_num].data.recv_status_on_client.status_details_capacity =
- &status_details_capacity;
+ &recv_status_details;
break;
case GRPC_OP_RECV_CLOSE_ON_SERVER:
ops[op_num].data.recv_close_on_server.cancelled = &cancelled;
@@ -474,8 +476,10 @@ PHP_METHOD(Call, startBatch) {
#endif
PHP_GRPC_DELREF(array);
add_property_long(recv_status, "code", status);
- php_grpc_add_property_string(recv_status, "details", status_details,
+ char *status_details_text = grpc_slice_to_c_string(recv_status_details);
+ php_grpc_add_property_string(recv_status, "details", status_details_text,
true);
+ gpr_free(status_details_text);
add_property_zval(result, "status", recv_status);
PHP_GRPC_DELREF(recv_status);
PHP_GRPC_FREE_STD_ZVAL(recv_status);
@@ -493,9 +497,8 @@ cleanup:
grpc_metadata_array_destroy(&trailing_metadata);
grpc_metadata_array_destroy(&recv_metadata);
grpc_metadata_array_destroy(&recv_trailing_metadata);
- if (status_details != NULL) {
- gpr_free(status_details);
- }
+ grpc_slice_unref(recv_status_details);
+ grpc_slice_unref(send_status_details);
for (int i = 0; i < op_num; i++) {
if (ops[i].op == GRPC_OP_SEND_MESSAGE) {
grpc_byte_buffer_destroy(ops[i].data.send_message);
diff --git a/src/php/ext/grpc/server.c b/src/php/ext/grpc/server.c
index 2217a4f9a8..9ac5d2a3c3 100644
--- a/src/php/ext/grpc/server.c
+++ b/src/php/ext/grpc/server.c
@@ -49,6 +49,8 @@
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
#include "completion_queue.h"
#include "server.h"
@@ -149,8 +151,12 @@ PHP_METHOD(Server, requestCall) {
1 TSRMLS_CC);
goto cleanup;
}
- php_grpc_add_property_string(result, "method", details.method, true);
- php_grpc_add_property_string(result, "host", details.host, true);
+ char *method_text = grpc_slice_to_c_string(details.method);
+ char *host_text = grpc_slice_to_c_string(details.host);
+ php_grpc_add_property_string(result, "method", method_text, true);
+ php_grpc_add_property_string(result, "host", host_text, true);
+ gpr_free(method_text);
+ gpr_free(host_text);
#if PHP_MAJOR_VERSION < 7
add_property_zval(result, "call", grpc_php_wrap_call(call, true TSRMLS_CC));
add_property_zval(result, "absolute_deadline",
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-17 16:59:29 +0000