Fix phpGH-19197: session build fails on system with memcpy as macro. (php#19198)

devnexen · web-flow · commit bd886d21e757 · 2025-07-21T10:19:29.000+01:00
Thus ZEND_STRL macro does not expand as expected so going back
to not using it like lower branches.
diff --git a/ext/session/session.c b/ext/session/session.c
@@ -1246,7 +1246,7 @@ static inline void last_modified(void)
 		}
 
 #define LAST_MODIFIED "Last-Modified: "
-		memcpy(buf, ZEND_STRL(LAST_MODIFIED));
+		memcpy(buf, LAST_MODIFIED, sizeof(LAST_MODIFIED) - 1);
 		strcpy_gmt(buf + sizeof(LAST_MODIFIED) - 1, &sb.st_mtime);
 		ADD_HEADER(buf);
 	}
@@ -1261,7 +1261,7 @@ CACHE_LIMITER_FUNC(public)
 
 	gettimeofday(&tv, NULL);
 	now = tv.tv_sec + PS(cache_expire) * 60;
-	memcpy(buf, ZEND_STRL(EXPIRES));
+	memcpy(buf, EXPIRES, sizeof(EXPIRES) - 1);
 	strcpy_gmt(buf + sizeof(EXPIRES) - 1, &now);
 	ADD_HEADER(buf);
 

Original file line number	Diff line number	Diff line change
`@@ -1246,7 +1246,7 @@ static inline void last_modified(void)`
`1246`	`1246`	`}`
`1247`	`1247`
`1248`	`1248`	`#define LAST_MODIFIED "Last-Modified: "`
`1249`		`- memcpy(buf, ZEND_STRL(LAST_MODIFIED));`
	`1249`	`+ memcpy(buf, LAST_MODIFIED, sizeof(LAST_MODIFIED) - 1);`
`1250`	`1250`	`strcpy_gmt(buf + sizeof(LAST_MODIFIED) - 1, &sb.st_mtime);`
`1251`	`1251`	`ADD_HEADER(buf);`
`1252`	`1252`	`}`
`@@ -1261,7 +1261,7 @@ CACHE_LIMITER_FUNC(public)`
`1261`	`1261`
`1262`	`1262`	`gettimeofday(&tv, NULL);`
`1263`	`1263`	`now = tv.tv_sec + PS(cache_expire) * 60;`
`1264`		`- memcpy(buf, ZEND_STRL(EXPIRES));`
	`1264`	`+ memcpy(buf, EXPIRES, sizeof(EXPIRES) - 1);`
`1265`	`1265`	`strcpy_gmt(buf + sizeof(EXPIRES) - 1, &now);`
`1266`	`1266`	`ADD_HEADER(buf);`
`1267`	`1267`