Un-deprecate simple add/replace header API, use it

Suggestion from Jakub.

Author: NattyNarwhal

ext/session/session.c

@@ -1351,7 +1351,6 @@ static void php_session_remove_cookie(void) {
 
 static zend_result php_session_send_cookie(void)
 {
-	sapi_header_line header_line = {0};
 	smart_str ncookie = {0};
 	zend_string *date_fmt = NULL;
 	zend_string *e_id;
@@ -1417,9 +1416,9 @@ static zend_result php_session_send_cookie(void)
 	smart_str_0(&ncookie);
 
 	php_session_remove_cookie(); /* remove already sent session ID cookie */
-	header_line.line = ZSTR_VAL(ncookie.s);
-	header_line.line_len = ZSTR_LEN(ncookie.s);
-	sapi_header_op(SAPI_HEADER_ADD, &header_line);
+	/*	'replace' must be 0 here, else a previous Set-Cookie
+		header, probably sent with setcookie() will be replaced! */
+	sapi_add_header_ex(estrndup(ZSTR_VAL(ncookie.s), ZSTR_LEN(ncookie.s)), ZSTR_LEN(ncookie.s), 0, 0);
 	smart_str_free(&ncookie);
 
 	return SUCCESS;

main/SAPI.h

@@ -200,7 +200,6 @@ typedef enum {					/* Parameter: 			*/
 BEGIN_EXTERN_C()
 SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg);
 
-/* Deprecated functions. Use sapi_header_op instead. */
 SAPI_API int sapi_add_header_ex(const char *header_line, size_t header_line_len, bool duplicate, bool replace);
 #define sapi_add_header(a, b, c) sapi_add_header_ex((a),(b),(c),1)