From: Michael Wallner <mike@php.net>
Date: Fri, 24 Sep 2021 14:05:53 +0000 (+0200)
Subject: s/SG(...)/.../
X-Git-Tag: v1.0.3~5
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=d7ee20a222f4bdf5b93a0ff6273d03a001949d0e;p=m6w6%2Fext-apfd

s/SG(...)/.../
---

diff --git a/php_apfd.c b/php_apfd.c
index 48e767f..4159620 100644
--- a/php_apfd.c
+++ b/php_apfd.c
@@ -100,13 +100,15 @@ PHP_RINIT_FUNCTION(apfd)
 # define TSRMLS_C
 # define TSRMLS_CC
 #endif
+	sapi_request_info *req = &SG(request_info);
+
 	/* populate form data on non-POST requests */
-	if (SG(request_info).request_method && strcasecmp(SG(request_info).request_method, "POST") && SG(request_info).content_type && *SG(request_info).content_type) {
-		char *ct_str, *ct_dup = estrdup(SG(request_info).content_type);
+	if (req->request_method && strcasecmp(req->request_method, "POST") && req->content_type && *req->content_type) {
+		char *ct_str, *ct_dup = estrdup(req->content_type);
 		size_t ct_end = strcspn(ct_dup, ";, ");
 		sapi_post_entry *post_entry = NULL;
 
-		SG(request_info).content_type_dup = ct_dup;
+		req->content_type_dup = ct_dup;
 
 		ct_str = zend_str_tolower_dup(ct_dup, ct_end);
 		if ((post_entry = apfd_get_post_entry(ct_str, ct_end TSRMLS_CC))) {
@@ -114,7 +116,7 @@ PHP_RINIT_FUNCTION(apfd)
 
 			apfd_backup(&apfd TSRMLS_CC);
 
-			SG(request_info).post_entry = post_entry;
+			req->post_entry = post_entry;
 
 			if (post_entry->post_reader) {
 				post_entry->post_reader(TSRMLS_C);
@@ -130,9 +132,9 @@ PHP_RINIT_FUNCTION(apfd)
 		}
 		efree(ct_str);
 
-		if (SG(request_info).content_type_dup) {
-			efree(SG(request_info).content_type_dup);
-			SG(request_info).content_type_dup = NULL;
+		if (req->content_type_dup) {
+			efree(req->content_type_dup);
+			req->content_type_dup = NULL;
 		}
 	}