- Use Set-Cookie for consistency with SetCookie() (and possibly for adherence with

  with some clients?)
- Remove unnecessary directive from configuration-parser.y

diff --git a/ext/session/session.c b/ext/session/session.c
index 358c8958db60100e698e718af311b8fe2e082218..15018c8d2306fadaedae57e5b892971d10f7289d 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -422,7 +422,7 @@ static void _php_session_save_current_state(PSLS_D)
        PS(mod)->close(&PS(mod_data));
 }
 
-#define COOKIE_FMT             "Set-cookie: %s=%s"
+#define COOKIE_FMT             "Set-Cookie: %s=%s"
 #define COOKIE_EXPIRES "; expires="
 #define COOKIE_PATH            "; path="
 #define COOKIE_DOMAIN  "; domain="

diff --git a/main/configuration-parser.y b/main/configuration-parser.y
index 4f5d47b7ba97e524c484e1ce05f4c8e6276cf317..079edd4bb4ba23d075f30d96cc0cc5d30b0a18bf 100644 (file)
--- a/main/configuration-parser.y
+++ b/main/configuration-parser.y
@@ -40,7 +40,6 @@
 #include "win32/wfile.h"
 #endif
 
-#undef YYSTYPE
 #define YYSTYPE pval
 
 #define PARSING_MODE_CFG 0