php
diff --git a/‎ext/imap/imap.c
+4-1 b/‎ext/imap/imap.c
+4-1
diff --git a/‎ext/imap/imap.dsp
+4-24 b/‎ext/imap/imap.dsp
+4-24
diff --git a/‎ext/mysql/php_mysql.h
-3 b/‎ext/mysql/php_mysql.h
-3
diff --git a/‎ext/pgsql/pgsql.dsp
+2-2 b/‎ext/pgsql/pgsql.dsp
+2-2
diff --git a/‎main/SAPI.c
+2 b/‎main/SAPI.c
+2
@@ -838,7 +838,7 @@ void imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
    Open an IMAP stream to a mailbox */
 PHP_FUNCTION(imap_open)
 {
-	return imap_do_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+	imap_do_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 }
 /* }}} */
 
@@ -2583,6 +2583,7 @@ PHP_FUNCTION(imap_utf7_decode)
 			case ST_DECODE0:
 				state++;
 			case ST_NORMAL:
+				;
 			}
 		}
 	}
@@ -2639,6 +2640,7 @@ PHP_FUNCTION(imap_utf7_decode)
 				*outp++ |= UNB64(*inp);
 				state = ST_DECODE0;
 			case ST_NORMAL:
+				;
 			}
 		}
 	}
@@ -2765,6 +2767,7 @@ PHP_FUNCTION(imap_utf7_encode)
 				*outp++ = B64(*inp++);
 				state = ST_ENCODE0;
 			case ST_NORMAL:
+				;
 			}
 		}
 	}
 
@@ -34,9 +34,6 @@
 #endif
 
 #if HAVE_MYSQL
-#ifndef DLEXPORT
-#define DLEXPORT
-#endif
 
 #ifdef __ZTS
 #include "TSRM.h"
 
@@ -202,6 +202,8 @@ SAPI_API void sapi_activate(SLS_D)
 				sapi_module.sapi_error(E_COMPILE_ERROR, "No content-type in POST request");
 			}
 			sapi_read_post_data(SLS_C);
+		} else {
+			SG(request_info).content_type_dup = NULL;
 		}
 		SG(request_info).cookie_data = sapi_module.read_cookies(SLS_C);
 		if (sapi_module.activate) {
Original file line number	Diff line number	Diff line change
`@@ -838,7 +838,7 @@ void imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)`
`838`	`838`	`Open an IMAP stream to a mailbox */`
`839`	`839`	`PHP_FUNCTION(imap_open)`
`840`	`840`	`{`
`841`		`- return imap_do_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);`
	`841`	`+ imap_do_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);`
`842`	`842`	`}`
`843`	`843`	`/* }}} */`
`844`	`844`
`@@ -2583,6 +2583,7 @@ PHP_FUNCTION(imap_utf7_decode)`
`2583`	`2583`	`case ST_DECODE0:`
`2584`	`2584`	`state++;`
`2585`	`2585`	`case ST_NORMAL:`
	`2586`	`+ ;`
`2586`	`2587`	`}`
`2587`	`2588`	`}`
`2588`	`2589`	`}`
`@@ -2639,6 +2640,7 @@ PHP_FUNCTION(imap_utf7_decode)`
`2639`	`2640`	`outp++ \|= UNB64(inp);`
`2640`	`2641`	`state = ST_DECODE0;`
`2641`	`2642`	`case ST_NORMAL:`
	`2643`	`+ ;`
`2642`	`2644`	`}`
`2643`	`2645`	`}`
`2644`	`2646`	`}`
`@@ -2765,6 +2767,7 @@ PHP_FUNCTION(imap_utf7_encode)`
`2765`	`2767`	`outp++ = B64(inp++);`
`2766`	`2768`	`state = ST_ENCODE0;`
`2767`	`2769`	`case ST_NORMAL:`
	`2770`	`+ ;`
`2768`	`2771`	`}`
`2769`	`2772`	`}`
`2770`	`2773`	`}`
Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,8 @@ SAPI_API void sapi_activate(SLS_D)`
`202`	`202`	`sapi_module.sapi_error(E_COMPILE_ERROR, "No content-type in POST request");`
`203`	`203`	`}`
`204`	`204`	`sapi_read_post_data(SLS_C);`
	`205`	`+ } else {`
	`206`	`+ SG(request_info).content_type_dup = NULL;`
`205`	`207`	`}`
`206`	`208`	`SG(request_info).cookie_data = sapi_module.read_cookies(SLS_C);`
`207`	`209`	`if (sapi_module.activate) {`