Fixed bug #50333 Improving multi-threaded scalability by using emalloc/efree/estrdup

NEWS

@@ -45,6 +45,7 @@ PHP                                                                        NEWS
 - Openssl:
   . Added crypto_method option for the ssl stream context. (Martin Jansen)
   . Added certificate fingerprint support. (Tjerk Meesters)
+  . Added explicit TLSv1.1 and TLSv1.2 stream transports. (Daniel Lowrey)
   . Fixed bug #65729 (CN_match gives false positive). (Tjerk Meesters)
 
 - PDO_pgsql:

Zend/RFCs/003.txt

@@ -9,11 +9,11 @@ Modified:        2001-09-17
 1. Background/Need
 ==================
 
-Many internal function of PHP will reject parameters because of their
+Many internal functions of PHP will reject parameters because of their
 type (the array and variable function come to mind).  For userland
 this is not an easy task as there is no uniform way to do it.  An
 addition to the engine for requiring loose types would allow
-delevopers to know that the data passed to their functions is of the
+developers to know that the data passed to their functions are of the
 correct type and reduce the need for duplicating the same code in
 every function to check for the type of data.
 
@@ -57,7 +57,7 @@ function foo (array $var){
 ===========
 
 Mis-matches in type should be reported as fatal errors and should halt
-the execution of a script as that function can not be run and code
+the execution of a script as that function cannot be run and code
 following could not reliably run.
 
 

Zend/zend.c

@@ -921,7 +921,9 @@ ZEND_API char *get_zend_version(void) /* {{{ */
 
 void zend_activate(TSRMLS_D) /* {{{ */
 {
+#ifdef ZTS
 	virtual_cwd_activate(TSRMLS_C);
+#endif
 	gc_reset(TSRMLS_C);
 	init_compiler(TSRMLS_C);
 	init_executor(TSRMLS_C);