]> granicus.if.org Git - php/commitdiff
Remove usage of pointless COOKIE_SET_COOKIE constant.
authorMartin Jansen <martin@divbyzero.net>
Sun, 18 May 2014 08:45:31 +0000 (10:45 +0200)
committerMartin Jansen <martin@divbyzero.net>
Sun, 18 May 2014 08:45:31 +0000 (10:45 +0200)
ext/session/session.c
ext/standard/head.c
ext/standard/head.h

index c5d710096d3c5e888a3eead2c0e5b8ab29698090..62ebaf28a1455ae60cae8f9be45f5bd17edd81ab 100644 (file)
@@ -1355,7 +1355,7 @@ static void php_session_send_cookie(TSRMLS_D) /* {{{ */
        e_session_name = php_url_encode(PS(session_name), strlen(PS(session_name)), NULL);
        e_id = php_url_encode(PS(id), strlen(PS(id)), NULL);
 
-       smart_str_appends(&ncookie, COOKIE_SET_COOKIE);
+       smart_str_appends(&ncookie, "Set-Cookie: ");
        smart_str_appends(&ncookie, e_session_name);
        smart_str_appendc(&ncookie, '=');
        smart_str_appends(&ncookie, e_id);
index 6ede184df26af13481fdd22c6a1a3ab5f4ffbc30..0316903bc64259ef2754eec449537230368ee4a4 100644 (file)
@@ -117,10 +117,10 @@ PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, t
                 * pick an expiry date in the past
                 */
                dt = php_format_date("D, d-M-Y H:i:s T", sizeof("D, d-M-Y H:i:s T")-1, 1, 0 TSRMLS_CC);
-               snprintf(cookie, len + 100, "%s%s=deleted; expires=%s; Max-Age=0", COOKIE_SET_COOKIE, name, dt);
+               snprintf(cookie, len + 100, "Set-Cookie: %s=deleted; expires=%s; Max-Age=0", name, dt);
                efree(dt);
        } else {
-               snprintf(cookie, len + 100, "%s%s=%s", COOKIE_SET_COOKIE, name, value ? encoded_value : "");
+               snprintf(cookie, len + 100, "Set-Cookie: %s=%s", name, value ? encoded_value : "");
                if (expires > 0) {
                        const char *p;
                        char tsdelta[13];
index cb9a7f48230109051a37ea2467e7a40ca3872a7b..59b1518676e78ffd75bb1db7a4b5ca613a961f7e 100644 (file)
@@ -21,7 +21,6 @@
 #ifndef HEAD_H
 #define HEAD_H
 
-#define COOKIE_SET_COOKIE "Set-Cookie: "
 #define COOKIE_EXPIRES    "; expires="
 #define COOKIE_MAX_AGE    "; Max-Age="
 #define COOKIE_DOMAIN     "; domain="