Merge branch 'master' into 2.0.4

Author: rlerdorf

config.m4

@@ -1,7 +1,3 @@
-dnl
-dnl $Id$
-dnl
-
 PHP_ARG_ENABLE(oauth, for oauth support,
 [  --enable-oauth          Include oauth support])
 
@@ -21,7 +17,7 @@ if test "$PHP_OAUTH" != "no"; then
         AC_MSG_CHECKING(for cURL in default path)
         have_curl=no
         for i in /usr/local /usr; do
-          if test -r $i/include/curl/easy.h; then
+          if test -r $i/include/curl/easy.h -o -r $i/include/x86_64-linux-gnu/curl/easy.h; then
             have_curl=yes
             CURL_DIR=$i
             AC_MSG_RESULT(found in $i)

config.w32

@@ -1,4 +1,3 @@
-// $Id$
 // vim:ft=javascript
 
 ARG_WITH("oauth", "oAuth support", "no");

oauth.c

@@ -9,8 +9,6 @@
 +----------------------------------------------------------------------+
 */
 
-/* $Id$ */
-
 #include "php_oauth.h"
 #include "provider.h"
 
@@ -196,7 +194,6 @@ void soo_handle_error(php_so_object *soo, long errorCode, char *msg, char *respo
 }
 /* }}} */
 
-
 zend_string *soo_sign_hmac(php_so_object *soo, char *message, const char *cs, const char *ts, const oauth_sig_context *ctx) /* {{{ */
 {
 	zval args[4], retval, func;
@@ -234,7 +231,7 @@ zend_string *soo_sign_hmac(php_so_object *soo, char *message, const char *cs, co
 }
 /* }}} */
 
-zend_string *soo_sign_rsa(php_so_object *soo, char *message, const oauth_sig_context *ctx)
+zend_string *soo_sign_rsa(php_so_object *soo, char *message, const oauth_sig_context *ctx) /* {{{ */
 {
 	zval args[3], func, retval;
 	zend_string *result;
@@ -249,6 +246,7 @@ zend_string *soo_sign_rsa(php_so_object *soo, char *message, const oauth_sig_con
 	/* TODO: add support for other algorithms instead of OPENSSL_ALGO_SHA1 */
 
 	ZVAL_STRING(&args[0], message);
+	ZVAL_NULL(&args[1]);
 	ZVAL_DUP(&args[2], &ctx->privatekey);
 
 	call_user_function_ex(EG(function_table), NULL, &func, &retval, 3, args, 0, NULL);
@@ -274,7 +272,7 @@ zend_string *soo_sign_plain(php_so_object *soo, const char *cs, const char *ts)
 }
 /* }}} */
 
-oauth_sig_context *oauth_create_sig_context(const char *sigmethod)
+oauth_sig_context *oauth_create_sig_context(const char *sigmethod) /* {{{ */
 {
 	oauth_sig_context *ctx;
 
@@ -291,8 +289,9 @@ oauth_sig_context *oauth_create_sig_context(const char *sigmethod)
 
 	return ctx;
 }
+/* }}} */
 
-zend_string *soo_sign(php_so_object *soo, char *message, zval *cs, zval *ts, const oauth_sig_context *ctx)
+zend_string *soo_sign(php_so_object *soo, char *message, zval *cs, zval *ts, const oauth_sig_context *ctx) /* {{{ */
 {
 	const char *csec = cs?Z_STRVAL_P(cs):"", *tsec = ts?Z_STRVAL_P(ts):"";
 
@@ -305,6 +304,7 @@ zend_string *soo_sign(php_so_object *soo, char *message, zval *cs, zval *ts, con
 	}
 	return NULL;
 }
+/* }}} */
 
 static inline zval *soo_get_property(php_so_object *soo, char *prop_name) /* {{{ */
 {
@@ -340,7 +340,7 @@ zend_string *oauth_url_encode(char *url, int url_len) /* {{{ */
 }
 /* }}} */
 
-zend_string *oauth_http_encode_value(zval *v)
+zend_string *oauth_http_encode_value(zval *v) /* {{{ */
 {
 	zend_string *param_value = NULL;
 
@@ -356,8 +356,9 @@ zend_string *oauth_http_encode_value(zval *v)
 
 	return param_value;
 }
+/* }}} */
 
-static int oauth_strcmp(zval *first, zval *second)
+static int oauth_strcmp(zval *first, zval *second) /* {{{ */
 {
 	int result;
 	result = string_compare_function(first, second);
@@ -370,17 +371,19 @@ static int oauth_strcmp(zval *first, zval *second)
 
 	return 0;
 }
+/* }}} */
 
-static int oauth_compare_value(const void *a, const void *b)
+static int oauth_compare_value(const void *a, const void *b) /* {{{ */
 {
 	Bucket *f, *s;
 	f = (Bucket *)a;
 	s = (Bucket *)b;
 
 	return oauth_strcmp(&f->val, &s->val);
 }
+/* }}} */
 
-static int oauth_compare_key(const void *a, const void *b)
+static int oauth_compare_key(const void *a, const void *b) /* {{{ */
 {
 	zval first, second;
 	int result;
@@ -405,9 +408,10 @@ static int oauth_compare_key(const void *a, const void *b)
 	zval_ptr_dtor(&second);
 	return result;
 }
+/* }}} */
 
 /* build url-encoded string from args, optionally starting with & */
-int oauth_http_build_query(php_so_object *soo, smart_string *s, HashTable *args, zend_bool prepend_amp)
+int oauth_http_build_query(php_so_object *soo, smart_string *s, HashTable *args, zend_bool prepend_amp) /* {{{ */
 {
 	zval *cur_val;
 	zend_string *cur_key, *arg_key, *param_value;
@@ -537,9 +541,10 @@ int oauth_http_build_query(php_so_object *soo, smart_string *s, HashTable *args,
 	}
 	return numargs;
 }
+/* }}} */
 
 /* retrieves parameter value from the _GET or _POST superglobal */
-void get_request_param(char *arg_name, char **return_val, int *return_len)
+void get_request_param(char *arg_name, char **return_val, int *return_len) /* {{{ */
 {
 	zval *ptr;
 	if (
@@ -553,12 +558,12 @@ void get_request_param(char *arg_name, char **return_val, int *return_len)
 	*return_val = NULL;
 	*return_len = 0;
 }
+/* }}} */
 
 /*
  * This function does not currently care to respect parameter precedence, in the sense that if a common param is defined
  * in POST/GET or Authorization header, the precendence is defined by: OAuth Core 1.0 section 9.1.1
  */
-
 zend_string *oauth_generate_sig_base(php_so_object *soo, const char *http_method, const char *uri, HashTable *post_args, HashTable *extra_args) /* {{{ */
 {
 	zval params;
@@ -665,7 +670,8 @@ zend_string *oauth_generate_sig_base(php_so_object *soo, const char *http_method
 }
 /* }}} */
 
-static void oauth_set_debug_info(php_so_object *soo) {
+static void oauth_set_debug_info(php_so_object *soo) /* {{{ */
+{
 	zval *debugInfo;
 	if (soo->debug_info) {
 		debugInfo = &soo->debugArr;
@@ -690,6 +696,7 @@ static void oauth_set_debug_info(php_so_object *soo) {
 		ZVAL_UNDEF(&soo->debugArr);
 	}
 }
+/* }}} */
 
 static int add_arg_for_req(HashTable *ht, const char *arg, const char *val) /* {{{ */
 {
@@ -702,7 +709,7 @@ static int add_arg_for_req(HashTable *ht, const char *arg, const char *val) /* {
 }
 /* }}} */
 
-void oauth_add_signature_header(HashTable *request_headers, HashTable *oauth_args, smart_string *header)
+void oauth_add_signature_header(HashTable *request_headers, HashTable *oauth_args, smart_string *header) /* {{{ */
 {
 	smart_string sheader = {0};
 	zend_bool prepend_comma = FALSE;
@@ -711,13 +718,14 @@ void oauth_add_signature_header(HashTable *request_headers, HashTable *oauth_arg
 	zend_string *param_name, *param_val;
 	zend_string *cur_key;
 	ulong num_key;
+	HashPosition pos;
 
 	smart_string_appends(&sheader, "OAuth ");
 
-	for (zend_hash_internal_pointer_reset(oauth_args);
-			(curval = zend_hash_get_current_data(oauth_args)) != NULL;
-			zend_hash_move_forward(oauth_args)) {
-		zend_hash_get_current_key(oauth_args, &cur_key, &num_key);
+	for (zend_hash_internal_pointer_reset_ex(oauth_args, &pos);
+			(curval = zend_hash_get_current_data_ex(oauth_args, &pos)) != NULL;
+				zend_hash_move_forward_ex(oauth_args, &pos)) {
+		zend_hash_get_current_key_ex(oauth_args, &cur_key, &num_key, &pos);
 
 		if (prepend_comma) {
 			smart_string_appendc(&sheader, ',');
@@ -744,6 +752,7 @@ void oauth_add_signature_header(HashTable *request_headers, HashTable *oauth_arg
 	}
 	smart_string_free(&sheader);
 }
+/* }}} */
 
 #define HTTP_RESPONSE_CAAS(zvalp, header, storkey) { \
 	if (0==strncasecmp(Z_STRVAL_P(zvalp),header,sizeof(header)-1)) { \
@@ -782,8 +791,8 @@ static long make_req_streams(php_so_object *soo, const char *url, const smart_st
 	sc = php_stream_context_alloc();
 
 	if (payload->len) {
-		smart_string_0(payload);
 		ZVAL_STRINGL(&zpayload, payload->c, payload->len);
+		Z_STRVAL(zpayload)[Z_STRLEN(zpayload)] = '\0';
 		php_stream_context_set_option(sc, "http", "content", &zpayload);
 		zval_ptr_dtor(&zpayload);
 		/**
@@ -988,7 +997,7 @@ int oauth_debug_handler(CURL *ch, curl_infotype type, char *data, size_t data_le
 }
 /* }}} */
 
-static size_t soo_read_header(void *ptr, size_t size, size_t nmemb, void *ctx)
+static size_t soo_read_header(void *ptr, size_t size, size_t nmemb, void *ctx) /* {{{ */
 {
 	char *header;
 	size_t hlen, vpos = sizeof("Location:") - 1;
@@ -1024,6 +1033,7 @@ static size_t soo_read_header(void *ptr, size_t size, size_t nmemb, void *ctx)
 	}
 	return hlen;
 }
+/* }}} */
 
 long make_req_curl(php_so_object *soo, const char *url, const smart_string *payload, const char *http_method, HashTable *request_headers) /* {{{ */
 {
@@ -1038,6 +1048,7 @@ long make_req_curl(php_so_object *soo, const char *url, const smart_string *payl
 	ulong num_key;
 	smart_string sheader = {0};
 	zend_string *cur_key;
+	HashPosition pos;
 
 	zca_info = soo_get_property(soo, OAUTH_ATTR_CA_INFO);
 	zca_path = soo_get_property(soo, OAUTH_ATTR_CA_PATH);
@@ -1046,11 +1057,11 @@ long make_req_curl(php_so_object *soo, const char *url, const smart_string *payl
 	curl = curl_easy_init();
 
 	if (request_headers) {
-		for (zend_hash_internal_pointer_reset(request_headers);
-				(cur_val = zend_hash_get_current_data(request_headers)) != NULL;
-				zend_hash_move_forward(request_headers)) {
+		for (zend_hash_internal_pointer_reset_ex(request_headers, &pos);
+				(cur_val = zend_hash_get_current_data_ex(request_headers, &pos)) != NULL;
+				zend_hash_move_forward_ex(request_headers, &pos)) {
 			/* check if a string based key is used */
-			switch (zend_hash_get_current_key(request_headers, &cur_key, &num_key)) {
+			switch (zend_hash_get_current_key_ex(request_headers, &cur_key, &num_key, &pos)) {
 				case HASH_KEY_IS_STRING:
 					smart_string_appendl(&sheader, ZSTR_VAL(cur_key), ZSTR_LEN(cur_key));
 					break;
@@ -1440,7 +1451,7 @@ static long oauth_fetch(php_so_object *soo, const char *url, const char *method,
 	}
 
 	/* additional http headers can be passed */
-	if (!request_headers) {
+	if (!request_headers || !zend_hash_num_elements(Z_ARRVAL_P(request_headers))) {
 		ALLOC_HASHTABLE(rheaders);
 		zend_hash_init(rheaders, 0, NULL, ZVAL_PTR_DTOR, 0);
 		need_to_free_rheaders = 1;
@@ -1655,6 +1666,8 @@ static long oauth_fetch(php_so_object *soo, const char *url, const char *method,
 }
 /* }}} */
 
+/* {{{ proto bool setRSACertificate(string $cert)
+       Sets the RSA certificate */
 SO_METHOD(setRSACertificate)
 {
 	char *key;
@@ -1688,6 +1701,7 @@ SO_METHOD(setRSACertificate)
 		return;
 	}
 }
+/* }}} */
 
 /* {{{ proto string oauth_urlencode(string uri)
    URI encoding according to RFC 3986, note: is not utf8 capable until the underlying phpapi is */
@@ -1859,7 +1873,7 @@ SO_METHOD(__construct)
 }
 /* }}} */
 
-void oauth_free_privatekey(zval *privatekey)
+void oauth_free_privatekey(zval *privatekey) /* {{{ */
 {
 	zval func, retval;
 	zval args[1];
@@ -1876,6 +1890,7 @@ void oauth_free_privatekey(zval *privatekey)
 
 	zval_ptr_dtor(privatekey);
 }
+/* }}} */
 
 /* {{{ proto array OAuth::setCAPath(string ca_path, string ca_info)
    Set the Certificate Authority information */
@@ -2109,7 +2124,6 @@ SO_METHOD(disableSSLChecks)
 }
 /* }}} */
 
-
 /* {{{ proto bool OAuth::setSSLChecks(long sslcheck)
    Tweak specific SSL checks for requests (be careful using this for production) */
 SO_METHOD(setSSLChecks)
@@ -2134,7 +2148,6 @@ SO_METHOD(setSSLChecks)
 }
 /* }}} */
 
-
 /* {{{ proto bool OAuth::setVersion(string version)
    Set oauth_version for requests (default 1.0) */
 SO_METHOD(setVersion)
@@ -2248,6 +2261,8 @@ SO_METHOD(setNonce)
 }
 /* }}} */
 
+/* {{{ proto bool setTimestamp(string $timestamp)
+Sets the OAuth timestamp for subsequent requests */
 SO_METHOD(setTimestamp)
 {
 	php_so_object *soo;
@@ -2272,6 +2287,7 @@ SO_METHOD(setTimestamp)
 
 	RETURN_TRUE;
 }
+/* }}} */
 
 /* {{{ proto bool OAuth::setToken(string token, string token_secret)
    Set a request or access token and token secret to be used in subsequent requests */
@@ -2487,6 +2503,8 @@ SO_METHOD(getLastResponse)
 }
 /* }}} */
 
+/* {{{ proto string getLastResponseHeaders(void)
+Get headers for last response */
 SO_METHOD(getLastResponseHeaders)
 {
 	php_so_object *soo;
@@ -2501,6 +2519,7 @@ SO_METHOD(getLastResponseHeaders)
 	}
 	RETURN_FALSE;
 }
+/* }}} */
 
 /* {{{ proto string OAuth::getRequestHeader(string http_method, string url [, string|array extra_parameters ])
    Generate OAuth header string signature based on the final HTTP method, URL and a string/array of parameters */
@@ -2801,7 +2820,6 @@ PHP_MINFO_FUNCTION(oauth)
 #else
 	php_info_print_table_row(2, "Request engine support", "php_streams");
 #endif
-	php_info_print_table_row(2, "source version", "$Id$");
 	php_info_print_table_row(2, "version", OAUTH_EXT_VER);
 	php_info_print_table_end();
 }

package.xml

@@ -53,6 +53,7 @@ Requirements: ext/hash (now a part of PHP core)
   <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
   <notes>
     * Bump version in header
+    * fix php_pcre_match_impl call in 7.4+ (Remi)
   </notes>
   <contents>
     <dir name="/">

php_oauth.h

@@ -8,8 +8,6 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id$ */
-
 #ifndef PHP_OAUTH_H
 #define PHP_OAUTH_H
 
@@ -55,7 +53,6 @@
 #endif
 
 #define PHP_OAUTH_VERSION 2.0.4
-
 #define __stringify_1(x)    #x
 #define __stringify(x)      __stringify_1(x)
 #define __OAUTH_EXT_VER PHP_OAUTH_VERSION