Merge branch 'master' into jsond

Author: bukka

.travis.yml

@@ -1,8 +1,4 @@
-language: php
-
-php:
-    # We only specify one version so we only get one worker
-    - 5.4
+language: c
 
 branches:
     except:
@@ -33,6 +29,7 @@ before_install:
     - sudo apt-get install -y libenchant-dev libaspell-dev libpspell-dev librecode-dev
     - sudo cp ./travis/de /var/lib/locales/supported.d/de
     - sudo dpkg-reconfigure locales
+    - ./travis/install.sh
 
 before_script:
     # Compile PHP
@@ -46,5 +43,5 @@ before_script:
 
 # Run PHPs run-tests.php 
 script:
-    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120 -s
+    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120
     - ./sapi/cli/php sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg sapi/phpdbg/phpdbg

CODING_STANDARDS

@@ -42,7 +42,7 @@ Exceptions:
 
 4.  When writing functions that deal with strings, be sure to remember
     that PHP holds the length property of each string, and that it
-    shouldn't be calculated with strlen().  Write your functions in a such
+    shouldn't be calculated with strlen().  Write your functions in such
     a way so that they'll take advantage of the length property, both
     for efficiency and in order for them to be binary-safe.
     Functions that change strings and obtain their new lengths while

INSTALL

@@ -155,7 +155,7 @@ Table of Contents
    a  list  of all available options along with short explanations running
    ./configure   --help.   Our  manual  documents  the  different  options
    separately.  You  will find the core options in the appendix, while the
-   different  extension  specific  options  are  descibed on the reference
+   different  extension  specific  options  are  described on the reference
    pages.
 
    When  PHP  is  configured,  you  are  ready  to build the module and/or

NEWS

@@ -2,9 +2,6 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 20??, PHP 7.0.0
 
--Fileinfo:
-  . Fixed bug #66242 (libmagic: don't assume char is signed). (ArdB)
-
 - CLI server:
   . Refactor MIME type handling to use a hash table instead of linear search.
     (Adam)
@@ -20,37 +17,81 @@ PHP                                                                        NEWS
   . Implemented FR #38409 (parse_ini_file() looses the type of booleans). (Tjerk)
   . Fixed #67959 (Segfault when calling phpversion('spl')). (Florian)
   . Implemented the RFC `Catchable "Call to a member function bar() on a
-    non-object"` (Timm)
+    non-object"`. (Timm)
+  . Added options parameter for unserialize allowing to specify acceptable
+    classes (https://wiki.php.net/rfc/secure_unserialize). (Stas)
+  . Fixed bug #68185 ("Inconsistent insteadof definition."- incorrectly triggered). (Julien)
+  . Fixed bug #65419 (Inside trait, self::class != __CLASS__). (Julien)
+  . Fixed bug #65576 (Constructor from trait conflicts with inherited
+    constructor). (dunglas at gmail dot com)
+  . Removed ZEND_ACC_FINAL_CLASS, promoting ZEND_ACC_FINAL as final class 
+    modifier. (Guilherme Blanco)
 
-- Reflection
-  . Fixed inheritance chain of Reflector interface (Tjerk)
+- Date:
+  . Fixed day_of_week function as it could sometimes return negative values
+    internally. (Derick)
 
 - DBA:
   . Fixed bug #62490 (dba_delete returns true on missing item (inifile)). (Mike)
 
+- DOM:
+  . Made DOMNode::textContent writeable. (Tjerk)
+
+- GD:
+  . Made fontFetch's path parser thread-safe. (Sara)
+
+- Fileinfo:
+  . Fixed bug #66242 (libmagic: don't assume char is signed). (ArdB)
+
+- Filter:
+  . New FILTER_VALIDATE_DOMAIN and better RFC conformance for FILTER_VALIDATE_URL. (Kevin Dunglas)
+
 - FPM:
   . Fixed bug #65933 (Cannot specify config lines longer than 1024 bytes). (Chris Wright)
+  . Implement request #67106 (Split main fpm config). (Elan Ruusamäe, Remi)
 
-- Standard:
-  . Removed call_user_method() and call_user_method_array() functions. (Kalle)
-  . Fix user session handlers (See rfc:session.user.return-value). (Sara)
-  . Added intdiv() function. (Andrea)
-  . Improved precision of log() function for base 2 and 10. (Marc Bennewitz)
+- LiteSpeed:
+  . Updated LiteSpeed SAPI code from V5.5 to V6.6. (George Wang)
 
-- XSL:
-  . Fixed bug #64776 (The XSLT extension is not thread safe). (Mike)
+- Mcrypt:
+  . Fixed possible read after end of buffer and use after free. (Dmitry)
 
-- GD:
-  . Made fontFetch's path parser thread-safe. (Sara)
+- pcntl:
+  . Fixed bug #60509 (pcntl_signal doesn't decrease ref-count of old handler
+    when setting SIG_DFL). (Julien)
+
+- PDO_mysql:
+  . Fixed bug #68424 (Add new PDO mysql connection attr to control multi
+    statements option). (peter dot wolanin at acquia dot com)
+
+- Reflection
+  . Fixed inheritance chain of Reflector interface (Tjerk)
 
 - Session:
   . Fixed bug #67694 (Regression in session_regenerate_id()). (Tjerk)
 
+- SOAP:
+  . Fixed bug #68361 (Segmentation fault on SoapClient::__getTypes).
+    (Laruence)
+
 - SPL:
   . Implemented #67886 (SplPriorityQueue/SplHeap doesn't expose extractFlags
     nor curruption state). (Julien)
+  . Fixed bug #66405 (RecursiveDirectoryIterator::CURRENT_AS_PATHNAME
+    breaks the RecursiveIterator). (Paul Garvin)
+  . Fixed bug #68479 (Added escape parameter to SplFileObject::fputcsv). (Salathe)
 
-- DOM:
-  . Made DOMNode::textContent writeable. (Tjerk)
+- Standard:
+  . Removed call_user_method() and call_user_method_array() functions. (Kalle)
+  . Fix user session handlers (See rfc:session.user.return-value). (Sara)
+  . Added intdiv() function. (Andrea)
+  . Improved precision of log() function for base 2 and 10. (Marc Bennewitz)
+
+- Streams:
+  . Fixed bug #68532 (convert.base64-encode omits padding bytes).
+    (blaesius at krumedia dot de)
+
+- XSL:
+  . Fixed bug #64776 (The XSLT extension is not thread safe). (Mike)
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

README.TESTING

@@ -123,7 +123,7 @@ MYMAIL=qa-test@domain.com
 TMPDIR=/var/tmp
 TODAY=`date +"%Y%m%d"`
 
-# Make sure compilation enviroment is correct
+# Make sure compilation environment is correct
 CONFIGURE_OPTS='--disable-all --enable-cli --with-pcre'
 export MAKE=gmake
 export CC=gcc

README.TESTING2

@@ -8,7 +8,7 @@ the original run-tests.php script.  server-tests is *not* used by
 'make test'.  server-tests was developed to provide support for
 testing PHP under it's primary environment, HTTP, and can run the
 PHP tests under any of the SAPI modules that are direct executables, 
-or are accessable via HTTP.
+or are accessible via HTTP.
 
 [New features]
 ----------------
@@ -95,7 +95,7 @@ include:
   $filename     full native path to file, will become PATH_TRANSLATED
   $filepath     =dirname($filename)
   $scriptname   this is what will become SCRIPT_NAME unless you override it
-  $docroot      the equivelant of DOCUMENT_ROOT under Apache
+  $docroot      the equivalent of DOCUMENT_ROOT under Apache
   $cwd          the directory that the test is being initiated from
   $this->conf   all server-tests configuration vars
   $this->env    all environment variables that will get passed to the test
@@ -105,7 +105,7 @@ include:
 This section is also eval'd, and is similar in nature to --ENV--.  However,
 this section is used to build the url used in an HTTP request.  Valid values
 to set in this section would include:
-  SCRIPT_NAME   The inital part of the request url
+  SCRIPT_NAME   The initial part of the request url
   PATH_INFO     The pathinfo part of a request url
   FRAGMENT      The fragment section of a url (after #)
   QUERY_STRING  The query part of a url (after ?)

TSRM/tsrm_win32.c

@@ -106,31 +106,35 @@ TSRM_API void tsrm_win32_shutdown(void)
 char * tsrm_win32_get_path_sid_key(const char *pathname TSRMLS_DC)
 {
 	PSID pSid = TWG(impersonation_token_sid);
-	DWORD sid_len = pSid ? GetLengthSid(pSid) : 0;
 	TCHAR *ptcSid = NULL;
 	char *bucket_key = NULL;
+	size_t ptc_sid_len, pathname_len;
+
+	pathname_len = strlen(pathname);
 
 	if (!pSid) {
-		bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname) + 1);
+		bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pathname_len + 1);
 		if (!bucket_key) {
 			return NULL;
 		}
-		memcpy(bucket_key, pathname, strlen(pathname));
+		memcpy(bucket_key, pathname, pathname_len);
 		return bucket_key;
 	}
 
 	if (!ConvertSidToStringSid(pSid, &ptcSid)) {
 		return NULL;
 	}
 
-	bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname) + strlen(ptcSid) + 1);
+
+	ptc_sid_len = strlen(ptcSid);
+	bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pathname_len + ptc_sid_len + 1);
 	if (!bucket_key) {
 		LocalFree(ptcSid);
 		return NULL;
 	}
 
-	memcpy(bucket_key, ptcSid, strlen(ptcSid));
-	memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname) + 1);
+	memcpy(bucket_key, ptcSid, ptc_sid_len);
+	memcpy(bucket_key + ptc_sid_len, pathname, pathname_len + 1);
 
 	LocalFree(ptcSid);
 	return bucket_key;
@@ -139,11 +143,8 @@ char * tsrm_win32_get_path_sid_key(const char *pathname TSRMLS_DC)
 
 PSID tsrm_win32_get_token_sid(HANDLE hToken)
 {
-	BOOL bSuccess = FALSE;
 	DWORD dwLength = 0;
 	PTOKEN_USER pTokenUser = NULL;
-	PSID sid;
-	PSID *ppsid = &sid;
 	DWORD sid_len;
 	PSID pResultSid = NULL;
 
@@ -204,7 +205,6 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
 	BYTE * psec_desc = NULL;
 	BOOL fAccess = FALSE;
 
-	BOOL bucket_key_alloc = FALSE;
 	realpath_cache_bucket * bucket = NULL;
 	char * real_path = NULL;
 
@@ -242,7 +242,6 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
 		 was impersonating already, this function uses that impersonation context.
 		*/
 		if(!OpenThreadToken(GetCurrentThread(), TOKEN_ALL_ACCESS, TRUE, &thread_token)) {
-			DWORD err = GetLastError();
 			if (GetLastError() == ERROR_NO_TOKEN) {
 				if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &thread_token)) {
 					 TWG(impersonation_token) = NULL;
@@ -722,4 +721,52 @@ TSRM_API char *realpath(char *orig_path, char *buffer)
 	return buffer;
 }
 
+#if HAVE_UTIME
+static zend_always_inline void UnixTimeToFileTime(time_t t, LPFILETIME pft) /* {{{ */
+{
+	// Note that LONGLONG is a 64-bit value
+	LONGLONG ll;
+
+	ll = Int32x32To64(t, 10000000) + 116444736000000000;
+	pft->dwLowDateTime = (DWORD)ll;
+	pft->dwHighDateTime = ll >> 32;
+}
+/* }}} */
+
+TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
+{
+	FILETIME mtime, atime;
+	HANDLE hFile;
+
+	hFile = CreateFile(filename, GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, NULL,
+				 OPEN_ALWAYS, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+
+	/* OPEN_ALWAYS mode sets the last error to ERROR_ALREADY_EXISTS but
+	   the CreateFile operation succeeds */
+	if (GetLastError() == ERROR_ALREADY_EXISTS) {
+		SetLastError(0);
+	}
+
+	if ( hFile == INVALID_HANDLE_VALUE ) {
+		return -1;
+	}
+
+	if (!buf) {
+		SYSTEMTIME st;
+		GetSystemTime(&st);
+		SystemTimeToFileTime(&st, &mtime);
+		atime = mtime;
+	} else {
+		UnixTimeToFileTime(buf->modtime, &mtime);
+		UnixTimeToFileTime(buf->actime, &atime);
+	}
+	if (!SetFileTime(hFile, NULL, &atime, &mtime)) {
+		CloseHandle(hFile);
+		return -1;
+	}
+	CloseHandle(hFile);
+	return 1;
+}
+/* }}} */
+#endif
 #endif

TSRM/tsrm_win32.h

@@ -23,6 +23,9 @@
 
 #include "TSRM.h"
 #include <windows.h>
+#if HAVE_UTIME
+# include <sys/utime.h>
+#endif
 
 struct ipc_perm {
 	int			key;

UPGRADING

@@ -63,6 +63,7 @@ PHP X.Y UPGRADE NOTES
 
 - FPM
   . Fixed bug #65933 (Cannot specify config lines longer than 1024 bytes).
+  . Listen = port now listen on all addresses (IPv6 and IPv4-mapped).
 
 ========================================
 4. Deprecated Functionality
@@ -76,12 +77,18 @@ PHP X.Y UPGRADE NOTES
 - parse_ini_file():
 - parse_ini_string():
   Added scanner mode INI_SCANNER_TYPED to yield typed .ini values.
+- unserialize():
+  Added second parameter for unserialize function 
+  (RFC: https://wiki.php.net/rfc/secure_unserialize) allowing to specify
+  acceptable classes: 
+  unserialize($foo, ["allowed_classes" => ["MyClass", "MyClass2"]);
 
 
 ========================================
 6. New Functions
 ========================================
-
+- GMP
+  Added gmp_random_seed()
 
 ========================================
 7. New Classes and Interfaces
@@ -126,7 +133,7 @@ PHP X.Y UPGRADE NOTES
 ========================================
 
 - Core
-  . Instead of being undefined and platform-dependant, NaN and Infinity will
+  . Instead of being undefined and platform-dependent, NaN and Infinity will
     always be zero when casted to integer.
   . Calling a method on a non-object no longer raises a fatal error; see
     also: https://wiki.php.net/rfc/catchable-call-to-member-of-non-object