Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

* origin/PHP-5.6: (170 commits)
  Fixed possible crash because of race conditions on modifying constants in shared memory
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530 	error_log=syslog ignored"
  --enable-fpm for the travis build
  fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here
  NEWS
  NEWS
  Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
  adding NEWS entry for the fix for bug #65641
  Updated NEWS file for recent phpdbg fixes
  Fixed issue krakjoe/phpdbg#94 - List behavior is inconsistent
  Fix issue krakjoe/phpdbg#97 - list now appends a newline if there is none The prompt should always ensure it is on a newline
  Fixed test
  Inform about back command existence in help - Fixes krakjoe/phpdbg#100 No way to list the current stack/frames
  Fix issue krakjoe/phpdbg#98 break if does not seem to work
  Fix issue krakjoe/phpdbg#99 register function has the same behavior as run
  Fix readline/libedit (Thanks to @remicollet)
  Replace incorrect `E` command with `ev` in watch help
  ...

Conflicts:
	Zend/zend_compile.c
	ext/standard/basic_functions.c
	ext/standard/http_fopen_wrapper.c
	ext/standard/var.c
	ext/tokenizer/tokenizer_data.c
	sapi/phpdbg/phpdbg_list.c

1 files changed, 0 insertions, 120 deletions

diff --git a/win32/build/svnclean.js b/win32/build/svnclean.js
deleted file mode 100644
index c5f92a3883..0000000000
--- a/win32/build/svnclean.js
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-  +----------------------------------------------------------------------+
-  | PHP Version 5                                                        |
-  +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2009 The PHP Group                                |
-  +----------------------------------------------------------------------+
-  | This source file is subject to version 3.01 of the PHP license,      |
-  | that is bundled with this package in the file LICENSE, and is        |
-  | available through the world-wide-web at the following url:           |
-  | http://www.php.net/license/3_01.txt                                  |
-  | If you did not receive a copy of the PHP license and are unable to   |
-  | obtain it through the world-wide-web, please send a note to          |
-  | license@php.net so we can mail you a copy immediately.               |
-  +----------------------------------------------------------------------+
-  | Author: Wez Furlong <wez@thebrainroom.com>                           |
-  |         Pierre A. Joye <pierre@php.net>                              |
-  +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-// Cleans up files that do not belong in the repository
-
-var FSO = WScript.CreateObject("Scripting.FileSystemObject");
-var WshShell = WScript.CreateObject("WScript.Shell");
-var STDOUT = WScript.StdOut;
-
-/* svn propget svn:ignore dirname */
-function find_ignore(dirname)
-{
-	dirname = "" + dirname;
-	dirname_len = dirname.length;
-
-	if (!FSO.FolderExists(dirname) || (dirname_len >= 4 && 
-	dirname.substring(dirname_len - 4) == ".svn")) {
-		return;
-	}
-
-	var f = FSO.GetFolder(dirname);
-	var fc = new Enumerator(f.SubFolders);
-
-	for (; !fc.atEnd(); fc.moveNext()) {
-		find_ignore(fc.item());
-	}
-
-	kill_from_ignore(dirname);
-}
-
-/* recursive remove using ignore props style wildcard matching;
- * note that FSO.DeleteFolder and FSO.DeleteFile methods both
- * accept wildcards, but that they are dangerous to use eg:
- * "*.php" will match "*.phpt" */
-function rm_r(filename)
-{
-	if (FSO.FolderExists(filename)) {
-		var fc = new Enumerator(FSO.GetFolder(filename).SubFolders);
-
-		for (; !fc.atEnd(); fc.moveNext()) {
-			rm_r(fc.item());
-		}
-
-		fc = new Enumerator(FSO.GetFolder(filename).Files);
-
-		for (; !fc.atEnd(); fc.moveNext()) {
-			FSO.DeleteFile(fc.item(), true);
-		}
-
-		FSO.DeleteFolder(filename, true);
-	} else if (FSO.FileExists(filename)) {
-		FSO.DeleteFile(filename, true);
-	} else {
-		/* we need to handle wildcards here */
-		var foldername = FSO.GetParentFolderName(filename);
-
-		if (foldername == "")
-			foldername = ".";
-
-		var filename = FSO.GetFileName(filename);
-
-		var retext = filename.replace(/\./g, '\\.');
-		retext = '^' + retext.replace(/\*/g, '.*') + "$";
-		var re = new RegExp(retext);
-
-		var folder = FSO.GetFolder(foldername);
-		var fc = new Enumerator(folder.SubFolders);
-		for (; !fc.atEnd(); fc.moveNext()) {
-
-			var item = FSO.GetFileName(fc.item());
-
-			if (item.match(re)) {
-				rm_r(fc.item());
-			}
-		}
-		var fc = new Enumerator(folder.Files);
-		for (; !fc.atEnd(); fc.moveNext()) {
-			item = FSO.GetFileName(fc.item());
-
-			if (item.match(re)) {
-				FSO.DeleteFile(fc.item(), true);
-			}
-		}
-	}
-}
-
-function kill_from_ignore(dirname)
-{
-	var l;
-	var e = WshShell.Exec("svn propget svn:ignore " + dirname);
-	var re = /^(config\.nice.*)|(\*)$/i;
-
-	while (!e.StdOut.atEndOfStream) {
-		l = e.StdOut.ReadLine();
-		if (l.length == 0 || re.test(l)) {
-			continue;
-		}
-		rm_r(dirname + l);
-	}
-
-}
-
-find_ignore(".");