Provide zend_string wrappers for php_base64_(en|de)code

Also pull existing php_base64_decode() proxy out to an inline.
Bump PHP_API_VERSION for ABI change.

3 files changed, 12 insertions, 8 deletions

diff --git a/ext/standard/base64.c b/ext/standard/base64.c
index 5ba69c4784..4a4cbe19c0 100644
--- a/ext/standard/base64.c
+++ b/ext/standard/base64.c
@@ -127,12 +127,6 @@ void php_base64_init(void)
 */
 /* }}} */
 
-PHPAPI zend_string *php_base64_decode(const unsigned char *str, size_t length) /* {{{ */
-{
-	return php_base64_decode_ex(str, length, 0);
-}
-/* }}} */
-
 PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length, zend_bool strict) /* {{{ */
 {
 	const unsigned char *current = str;
diff --git a/ext/standard/base64.h b/ext/standard/base64.h
index 77d2da9a74..1fa901b9ce 100644
--- a/ext/standard/base64.h
+++ b/ext/standard/base64.h
@@ -25,8 +25,18 @@ PHP_FUNCTION(base64_decode);
 PHP_FUNCTION(base64_encode);
 
 PHPAPI extern zend_string *php_base64_encode(const unsigned char *, size_t);
+static inline zend_string *php_base64_encode_str(const zend_string *str) {
+	return php_base64_encode((const unsigned char*)(ZSTR_VAL(str)), ZSTR_LEN(str));
+}
+
 PHPAPI extern zend_string *php_base64_decode_ex(const unsigned char *, size_t, zend_bool);
-PHPAPI extern zend_string *php_base64_decode(const unsigned char *, size_t);
+
+static inline zend_string *php_base64_decode(const unsigned char *str, size_t len) {
+	return php_base64_decode_ex(str, len, 0);
+}
+static inline zend_string *php_base64_decode_str(const zend_string *str) {
+	return php_base64_decode_ex((const unsigned char*)(ZSTR_VAL(str)), ZSTR_LEN(str), 0);
+}
 
 #endif /* BASE64_H */
 
diff --git a/main/php.h b/main/php.h
index 53926d2321..edf810d9b4 100644
--- a/main/php.h
+++ b/main/php.h
@@ -26,7 +26,7 @@
 #include <dmalloc.h>
 #endif
 
-#define PHP_API_VERSION 20160731
+#define PHP_API_VERSION 20170715
 #define PHP_HAVE_STREAMS
 #define YYDEBUG 0
 #define PHP_DEFAULT_CHARSET "UTF-8"