Simplify cookie setting code in ext/session

Use the modern SAPI header ops API, including the remove prefix op we
just added.

Author: NattyNarwhal

ext/session/session.c

@@ -1341,44 +1341,22 @@ static int php_session_cache_limiter(void)
  * removes all of matching cookie. i.e. It deletes all of Set-Cookie headers.
  */
 static void php_session_remove_cookie(void) {
-	sapi_header_struct *header;
-	zend_llist *l = &SG(sapi_headers).headers;
-	zend_llist_element *next;
-	zend_llist_element *current;
 	char *session_cookie;
-	size_t session_cookie_len;
-	size_t len = sizeof("Set-Cookie")-1;
+	sapi_header_line header_line = {0};
 
 	ZEND_ASSERT(strpbrk(ZSTR_VAL(PS(session_name)), SESSION_FORBIDDEN_CHARS) == NULL);
 	session_cookie_len = spprintf(&session_cookie, 0, "Set-Cookie: %s=", ZSTR_VAL(PS(session_name)));
 
-	current = l->head;
-	while (current) {
-		header = (sapi_header_struct *)(current->data);
-		next = current->next;
-		if (header->header_len > len && header->header[len] == ':'
-			&& !strncmp(header->header, session_cookie, session_cookie_len)) {
-			if (current->prev) {
-				current->prev->next = next;
-			} else {
-				l->head = next;
-			}
-			if (next) {
-				next->prev = current->prev;
-			} else {
-				l->tail = current->prev;
-			}
-			sapi_free_header(header);
-			efree(current);
-			--l->count;
-		}
-		current = next;
-	}
+	header_line.line = session_cookie;
+	header_line.line_len = strlen(session_cookie);
+	sapi_header_op(SAPI_HEADER_DELETE_PREFIX, &header_line);
+
 	efree(session_cookie);
 }
 
 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;
@@ -1444,9 +1422,9 @@ static zend_result php_session_send_cookie(void)
 	smart_str_0(&ncookie);
 
 	php_session_remove_cookie(); /* remove already sent session ID cookie */
-	/*	'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);
+	header_line.line = ZSTR_VAL(ncookie.s);
+	header_line.line_len = ZSTR_LEN(ncookie.s);
+	sapi_header_op(SAPI_HEADER_ADD, &header_line);
 	smart_str_free(&ncookie);
 
 	return SUCCESS;