From 20b8eb26fe6f85d1e70190a0e49d785e72293640 Mon Sep 17 00:00:00 2001
From: Antony Dovgal <tony2001@php.net>
Date: Mon, 10 Oct 2005 20:16:35 +0000
Subject: [PATCH] MF51: use proper macros and vars instead of strlen()

---
 ext/mysqli/mysqli_api.c    | 2 +-
 ext/mysqli/mysqli_nonapi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 1b9a56482d4..3490d430e14 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -571,7 +571,7 @@ PHP_FUNCTION(mysqli_stmt_execute)
 					case MYSQL_TYPE_VAR_STRING:
 						convert_to_string_ex(&stmt->param.vars[i]);
 						stmt->stmt->params[i].buffer = Z_STRVAL_PP(&stmt->param.vars[i]);
-						stmt->stmt->params[i].buffer_length = strlen(Z_STRVAL_PP(&stmt->param.vars[i]));
+						stmt->stmt->params[i].buffer_length = Z_STRLEN_PP(&stmt->param.vars[i]);
 						break;
 					case MYSQL_TYPE_DOUBLE:
 						convert_to_double_ex(&stmt->param.vars[i]);
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index bef10913a7a..b3346cc861b 100644
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -75,7 +75,7 @@ PHP_FUNCTION(mysqli_connect)
 	}
 
 #ifdef HAVE_EMBEDDED_MYSQLI
-	if (hostname && strlen(hostname)) {
+	if (hostname_len && hostname) {
 		unsigned int external=1;
 		mysql_options(mysql->mysql, MYSQL_OPT_USE_REMOTE_CONNECTION, (char *)&external);
 	} else {