diff -Nru wikidiff2-1.2+git03ea59f/debian/changelog wikidiff2-1.4.1/debian/changelog
--- wikidiff2-1.2+git03ea59f/debian/changelog	2016-04-05 23:29:55.000000000 +0000
+++ wikidiff2-1.4.1/debian/changelog	2016-08-31 02:08:33.000000000 +0000
@@ -1,30 +1,22 @@
-wikidiff2 (1.2+git03ea59f-1ubuntu3) xenial; urgency=medium
+wikidiff2 (1.4.1-1) unstable; urgency=medium
 
-  * Fix phpapi invocation to use php-config not php-config5 (LP: #1565912).
+  * Add watch file
+  * New upstream version 1.4.1
+  * Remove php7 patch, included in upstream version
+  * Remove PHP configuration, recommend MW 1.27.1+
+  * Add accidentally-removed php:Depends substvar
 
- -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Tue, 05 Apr 2016 12:10:29 -0700
+ -- Kunal Mehta <legoktm@member.fsf.org>  Tue, 30 Aug 2016 19:08:33 -0700
 
-wikidiff2 (1.2+git03ea59f-1ubuntu2) xenial; urgency=medium
+wikidiff2 (1.2+git03ea59f-2) unstable; urgency=medium
 
-  * debian/patches/update-to-php7.0-string-api.patch: Add proper DEP3
-    headers.
-  * d/maintscript: add prior-version argument to mv_conffile (LP:
-    #1565912).
+  * Update for PHP7 support, patch from upstream (Closes: #821633, #821720)
+  * Update dependencies for PHP7
+  * Standards version 3.9.8
+  * Add myself (Kunal Mehta) to uploaders list, removed Jonathon
+  * Improved extended description (Closes: #763753)
 
- -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Mon, 04 Apr 2016 13:50:47 -0700
-
-wikidiff2 (1.2+git03ea59f-1ubuntu1) xenial; urgency=medium
-
-  * Update to PHP7.0 dependencies (LP: #1565912).
-  * Add maintscript helper to migrate from php5 to php7 configuration.
-
- -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Mon, 04 Apr 2016 10:33:14 -0700
-
-wikidiff2 (1.2+git03ea59f-1build1) vivid; urgency=medium
-
-  * No change rebuild against PHP 5.6 (phpapi-20131226).
-
- -- Robie Basak <robie.basak@ubuntu.com>  Tue, 27 Jan 2015 16:00:21 +0000
+ -- Kunal Mehta <legoktm@member.fsf.org>  Fri, 17 Jun 2016 17:01:21 -0700
 
 wikidiff2 (1.2+git03ea59f-1) unstable; urgency=medium
 
diff -Nru wikidiff2-1.2+git03ea59f/debian/control wikidiff2-1.4.1/debian/control
--- wikidiff2-1.2+git03ea59f/debian/control	2016-04-04 20:32:14.000000000 +0000
+++ wikidiff2-1.4.1/debian/control	2016-08-31 01:43:17.000000000 +0000
@@ -1,22 +1,20 @@
 Source: wikidiff2
 Section: php
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Mediawiki Maintenance Team <pkg-mediawiki-devel@lists.alioth.debian.org>
-Uploaders: Romain Beauxis <toots@rastageeks.org>, Jonathan Wiltshire <jmw@debian.org>
+Maintainer: Mediawiki Maintenance Team <pkg-mediawiki-devel@lists.alioth.debian.org>
+Uploaders: Romain Beauxis <toots@rastageeks.org>, Kunal Mehta <legoktm@member.fsf.org>
 Build-Depends: debhelper (>= 9), php-dev, libthai-dev, pkg-config, php-cli
 Homepage: http://www.mediawiki.org/wiki/Extension:Wikidiff2
-Standards-Version: 3.9.5
+Standards-Version: 3.9.8
 Vcs-Git: git://anonscm.debian.org/collab-maint/wikidiff2.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/wikidiff2.git
 
 Package: php-wikidiff2
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
 Depends: php | php-cli, ${misc:Depends}, ${shlibs:Depends}, ${php:Depends}
-Recommends: mediawiki
+Recommends: mediawiki (>= 1:1.27.1-1)
 Description: external diff engine for mediawiki
- Wikidiff2 is PHP 5 module providing external diff 
+ Wikidiff2 is a PHP module providing external diff
  engine for MediaWiki. It performs word-level 
  (space-delimited) diffs on general text, and 
  character-level diffs on text composed of characters 
diff -Nru wikidiff2-1.2+git03ea59f/debian/etc/mediawiki-extensions/extensions-available/wikidiff2.php wikidiff2-1.4.1/debian/etc/mediawiki-extensions/extensions-available/wikidiff2.php
--- wikidiff2-1.2+git03ea59f/debian/etc/mediawiki-extensions/extensions-available/wikidiff2.php	2014-06-21 22:17:14.000000000 +0000
+++ wikidiff2-1.4.1/debian/etc/mediawiki-extensions/extensions-available/wikidiff2.php	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<?php
-
-$wgExtensionCredits['wikidiff2'][] = array(
-    'name' => 'Wikidiff2',
-    'version' => '',
-    'author' => 'Tim Starling',
-    'description' => 'external diff engine for MediaWiki',
-    'url' => 'https://www.mediawiki.org/wiki/Extension:Wikidiff2'
-);
-
-$wgExternalDiffEngine = 'wikidiff2';
diff -Nru wikidiff2-1.2+git03ea59f/debian/etc/mediawiki-extensions/extensions-enabled/wikidiff2.php wikidiff2-1.4.1/debian/etc/mediawiki-extensions/extensions-enabled/wikidiff2.php
--- wikidiff2-1.2+git03ea59f/debian/etc/mediawiki-extensions/extensions-enabled/wikidiff2.php	2014-06-21 22:17:14.000000000 +0000
+++ wikidiff2-1.4.1/debian/etc/mediawiki-extensions/extensions-enabled/wikidiff2.php	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<?php
-
-$wgExtensionCredits['wikidiff2'][] = array(
-    'name' => 'Wikidiff2',
-    'version' => '',
-    'author' => 'Tim Starling',
-    'description' => 'external diff engine for MediaWiki',
-    'url' => 'https://www.mediawiki.org/wiki/Extension:Wikidiff2'
-);
-
-$wgExternalDiffEngine = 'wikidiff2';
diff -Nru wikidiff2-1.2+git03ea59f/debian/install wikidiff2-1.4.1/debian/install
--- wikidiff2-1.2+git03ea59f/debian/install	2016-04-04 20:32:14.000000000 +0000
+++ wikidiff2-1.4.1/debian/install	2016-08-31 01:43:17.000000000 +0000
@@ -1,2 +1 @@
 wikidiff2.ini 	etc/php/7.0/mods-available
-debian/etc/mediawiki-extensions	etc
diff -Nru wikidiff2-1.2+git03ea59f/debian/maintscript wikidiff2-1.4.1/debian/maintscript
--- wikidiff2-1.2+git03ea59f/debian/maintscript	2016-04-04 21:53:23.000000000 +0000
+++ wikidiff2-1.4.1/debian/maintscript	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-mv_conffile /etc/php5/mods-available/wikidiff2.ini /etc/php/7.0/mods-available/wikidiff2.ini 1.2+git03ea59f-1ubuntu1~
diff -Nru wikidiff2-1.2+git03ea59f/debian/patches/series wikidiff2-1.4.1/debian/patches/series
--- wikidiff2-1.2+git03ea59f/debian/patches/series	2016-04-04 20:32:14.000000000 +0000
+++ wikidiff2-1.4.1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-update-to-php7.0-string-api.patch
diff -Nru wikidiff2-1.2+git03ea59f/debian/patches/update-to-php7.0-string-api.patch wikidiff2-1.4.1/debian/patches/update-to-php7.0-string-api.patch
--- wikidiff2-1.2+git03ea59f/debian/patches/update-to-php7.0-string-api.patch	2016-04-04 21:53:23.000000000 +0000
+++ wikidiff2-1.4.1/debian/patches/update-to-php7.0-string-api.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-Description: Update to PHP7.0 string API
-Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1565912
-
---- wikidiff2-1.2+git03ea59f.orig/php_wikidiff2.cpp
-+++ wikidiff2-1.2+git03ea59f/php_wikidiff2.cpp
-@@ -97,7 +97,7 @@ PHP_FUNCTION(wikidiff2_do_diff)
- 		Wikidiff2::String text1String(text1, text1_len);
- 		Wikidiff2::String text2String(text2, text2_len);
- 		const Wikidiff2::String & ret = wikidiff2.execute(text1String, text2String, numContextLines);
--		RETURN_STRINGL( const_cast<char*>(ret.data()), ret.size(), 1);
-+		RETVAL_STRINGL( const_cast<char*>(ret.data()), ret.size());
- 	} catch (std::bad_alloc &e) {
- 		zend_error(E_WARNING, "Out of memory in wikidiff2_do_diff().");
- 	} catch (...) {
-@@ -131,7 +131,7 @@ PHP_FUNCTION(wikidiff2_inline_diff)
- 		Wikidiff2::String text1String(text1, text1_len);
- 		Wikidiff2::String text2String(text2, text2_len);
- 		const Wikidiff2::String& ret = wikidiff2.execute(text1String, text2String, numContextLines);
--		RETURN_STRINGL( const_cast<char*>(ret.data()), ret.size(), 1);
-+		RETVAL_STRINGL( const_cast<char*>(ret.data()), ret.size());
- 	} catch (std::bad_alloc &e) {
- 		zend_error(E_WARNING, "Out of memory in wikidiff2_inline_diff().");
- 	} catch (...) {
diff -Nru wikidiff2-1.2+git03ea59f/debian/php-wikidiff2.maintscript wikidiff2-1.4.1/debian/php-wikidiff2.maintscript
--- wikidiff2-1.2+git03ea59f/debian/php-wikidiff2.maintscript	1970-01-01 00:00:00.000000000 +0000
+++ wikidiff2-1.4.1/debian/php-wikidiff2.maintscript	2016-08-31 01:43:17.000000000 +0000
@@ -0,0 +1,3 @@
+rm_conffile /etc/mediawiki-extensions/extensions-enabled/wikidiff2.php 1.4.1-1
+rm_conffile /etc/mediawiki-extensions/extensions-available/wikidiff2.php 1.4.1-1
+
diff -Nru wikidiff2-1.2+git03ea59f/debian/rules wikidiff2-1.4.1/debian/rules
--- wikidiff2-1.2+git03ea59f/debian/rules	2016-04-05 23:29:55.000000000 +0000
+++ wikidiff2-1.4.1/debian/rules	2016-08-31 02:08:09.000000000 +0000
@@ -8,11 +8,8 @@
 	dh $@
 
 override_dh_auto_configure:
-	# Slightly hacked here to make it work with other PHP installations
-	# earlier in the path, so I don't have to make chroots. Really it should just
-	# be phpize && dh_auto_configure.
 	/usr/bin/phpize
-	dh_auto_configure -- --with-php-config=/usr/bin/php-config
+	dh_auto_configure
 
 override_dh_auto_test:
 	NO_INTERACTION=1 make test
@@ -23,3 +20,7 @@
 override_dh_gencontrol:
 	echo "php:Depends=phpapi-$(shell php-config --phpapi)" >> debian/php-wikidiff2.substvars
 	dh_gencontrol
+
+override_dh_auto_clean:
+	/usr/bin/phpize --clean
+	dh_auto_clean
diff -Nru wikidiff2-1.2+git03ea59f/debian/upstream/signing-key.asc wikidiff2-1.4.1/debian/upstream/signing-key.asc
--- wikidiff2-1.2+git03ea59f/debian/upstream/signing-key.asc	1970-01-01 00:00:00.000000000 +0000
+++ wikidiff2-1.4.1/debian/upstream/signing-key.asc	2016-08-31 00:09:32.000000000 +0000
@@ -0,0 +1,348 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+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
+AKCuSkj6F2+R4WtCozxxpO3/riMqlQ==
+=UPzx
+-----END PGP PUBLIC KEY BLOCK-----
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+mQGiBD+15hMRBADs9MYjme432XKUG6L1MBIR3VFsp2Z5YxO6HWTvBPfSrHs+DOwV
+LZUvGpz7qBwVWwXEZp9TNGbknc4awQyhkUnO7uYh5uUo8q2n3W0WPStejbDXf2K4
+yCD97KlNNmjITeAb2lM1V3Cfl18GiilreXw+RLCShDnaJzMgUXGqYYFWYwCg4HCu
+4yxUXsdlb6OgEoYtCWLGz1kD/1GfS6Mvz7OAANByYIR3yDcm6ongSeJsP/R3o3Rj
+cYGBl1Qty7YFhkXXNLD2Tl5Pr+p1oU4eigviNHH2KwA0K1UScrBIBEX0VBjDTzqn
+o66B1QvUUet5ZF/zyMYx8fEwNkCtqBZ70dPtdXSDZ3WbppekRzcOY6WdcXtUrgIM
+qgOlA/9ZLY3gHvVbeoGRv4y19lapg9Qw5bX/SMPARqZheId5fzarLYYbqyyq0WKg
+Wtwa+oSKtj4IeMmP368QHkDTNTKFFRoBKnHmXwSiCNbRHR6mydDJUPe/6ARspZ8N
+jOATFNBzF8cofNvkgzQyDbxX7C9VuS+uH+cc7/PnvrlHBehkhbQeQnJpb24gVmli
+YmVyIDxicmlvbkBwb2JveC5jb20+iEYEEBECAAYFAkGXHSwACgkQpmyHQ2O4INGZ
+0ACgyVtyhKokesgml7UoKBiUAdnmRRYAn28wKeyzTXOXTa/V2eBWmjA3Ga2AiEYE
+EBECAAYFAkTdr2oACgkQO6hoAbFDvpJOLgCgi3SKddv0Zf3fUrDZ+JjP43SRkyIA
+oM2Nd4Nco9w9r5+zBQZ9WjHqNX9jiEYEEBECAAYFAkXGghoACgkQ8dWXmXayDCwi
+VQCdGFgHqtFlNwgXWllOw+WsxJ0wX/0An3FbiB/nfo/9osCtoBslwXehJmqPiEYE
+EhECAAYFAkArOY8ACgkQCnqz33PgIYOIOgCfZcPUP8siqBQY2V9j2pU1CVCff/QA
+n0xQ7aPuGka895MO22NM3p3SovhpiEYEEhECAAYFAkL4ROIACgkQwq/V6u582tIB
+mQCdFRYtQnYnUqSTtzQP7J+f8hFTdhQAoOKXp8GffTq+5TDTQ1btlfTbsxCQiEYE
+EhECAAYFAkNc6zYACgkQzUPRnjbgE937BACeJxu9LfPLsh92yYGR5ucqFWT49qQA
+oLcDZ2eCTsW4rlszlqbsQZRk3PmNiEYEEhECAAYFAkWgDgAACgkQoYVPneVrO07/
+oACeOgtRBpvMfUZN6+hnAAglEfO8pRUAoIRcyupP9nbVW+NyIcK4kH7FaRWHiEYE
+ExECAAYFAkGXMcIACgkQpmyHQ2O4INFm2wCeNzGzOzdU2hMup+f81vPlzKQIDxUA
+n0cQIR/P7+fZcBQmpAvOGJLVj1itiEYEExECAAYFAkfq4HwACgkQceDWCowXta/M
+4gCgjLJ9pIoxPsMq8tNHpVtyJP80UEQAoLcLdxwbwjr5bNeB1nhy22GJlf2+iFsE
+ExECABsFAj+15hMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQwRnhpk1wk46kjQCg
+2xD8wJytyPkNTO/E6fFwPgXryfEAoJLuHaT2TziFQljs5LZiS5VIvCaxuQENBD+1
+5hYQBAC/NfdKe+mlk7CXwFW0wxTP2SDXTJkpWnIQ1iR510vjj3ApxQ+5HNKWzsgy
+g73cppuqv6UotGhMOXyrvCT8PnT4A6BHUTnukbf7C+l5MFq6mPTHwlrI4+cr8Iei
+ptut0JqZeDcilO53kdWhlHqMSyb4bKTGBKHxIzDOvlPXjqqOqwADBgQAn8oS1AJ9
+XjLlYPMMvXlsYhRRgPXlm9+4NH4pbDhbimfRv94up0sOgWL0zexcKhJnlJEzhp8q
+aPN6CYuuDvDlf9E7P/5BkkmtDcWlvLizLOkt1wJgLTCy75qiOYdwYKVZrbJW5MTG
+VvmcEU+qGljSt3VgJSdFfwW1LnMZpgAwqu+IRgQYEQIABgUCP7XmFgAKCRDBGeGm
+TXCTjvw5AKCml8QDP1MylnoC8FT5Qbj6MSVDvQCgidaCcIseRx4VcUnVMuBcT8i8
+C8I=
+=T2xL
+-----END PGP PUBLIC KEY BLOCK-----
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+mQGiBE6l9PgRBADWXujraR0NZ8O/mR6pzPWTFOB79HDdzlSyvel2WGhekbQVPYXu
+/sFSknzFu/Tp1up8q9MmNVVDkB/ItNaDuUYt3qZxbuNot1OChnelu0mFztLc4GeB
+e6RvrzYwRBQGZIsfATrFSBXoTheDeap/oyIYrDShnDPFgeLllueK8GCBHwCg9mSJ
+JBLkkrmG36jiSiiX+WwpCrsEAMHQkgdASU6LfwwExzAI2gEG57voDxYAfLrQsUxA
+5BTxYnfT0CgmjeL6q7QdnljZ0ljFzkOkXTi14ylvOHyyA/smm8dUuzJzFAbQ91r8
+7KZyRpFRZLEdn0LkAa8X5XefzZLqJvLaL1i+0WCtUk1WH4nBP7UImNfAnze7y5PH
+txTuA/9PGB3uQIdj6jADLmXc3LVCUy0RzFvFfaZiETJ7NklEDKkUNzY9Jx0EGsG+
+D8AMG6r0/H3peBL96vBJYUFwrJN6JAjaDoBCdOwaLKcA+X/A9NYsawoc0iC4JTr1
+uYZh8gp3i2VUTJAC6qSRxOGWgX6Y2fmo3F1VbO3K3Je7X12sIbQeU2FtIFJlZWQg
+PHJlZWR5QHdpa2ltZWRpYS5vcmc+iGAEExECACAFAk6l9PgCGwMGCwkIBwMCBBUC
+CAMEFgIDAQIeAQIXgAAKCRCbabMQnTu3sIPtAKCTkL5JCewq6BVgfu6FfubEh0Vc
+9wCg2ZwfRGnCnFbY8leFmZZOZ7FawLW5Ag0ETqX0/RAIAO5TUda94oOWaNFOTJKy
+peemVOSO2El4g082CXnBNfPBAoi3DN6usC4r9rWboWes/BKDcHXO03jGhHJTVhCX
+A1TaOiBZ3Pqj3Jurhwkj9mLUaqBCBlrNgStYRbUT7VpYETkxZ1t6Xx6Z/sQc+Gaf
+MR2BVQYMG5bSOzA6g/Mx6+iaJRxXLB3Q1yLIRtGRN2Cd6hBghkdinanCxZ7Gzold
+jyuquhk0ngLXP8u547ADk/6QLwYdpRTeOs+OVS9sEfvOsPl504bX8D+7cBwn8Db+
+ORRiOuS3Njsq7UTDHCCiQLZCb6Vreo5gaLv3JnZvZfChLuGaaBemjCkQKOKsNwX5
+5NcAAwUIAI3RZSSh2cDO3SA5chSUQ2mA5Jkz9ttbfQOX+0amaaapDCoRdvTb8sOB
+hCmmQ77W8In5wlJKoDARzYfHcv/kyNvA8sQCD0qHrNHXHDO1I5MHPaB3XYFPSu2p
+/hxowcKJPpKkj3baYP+M3wG+DJOaEJmYKsjfS+aVXAZNmRf8OivMpKbuKyHzhiGB
+0of+MInAOhCkG7fNVt/1FOVyfm4XC81i4EdhXOlMLOzleXP7+Rl5Jq8Vw3uH4Qii
+Sh64WgQ/w6aEqZiZ7rMNXKLyRbecZ9xNC5QjMjG76ReaOFy/w3gDwj/C5g/A7+sQ
+oQ/o3qyuyEuZCzaIVi3+Rc6KbHu5W6KISQQYEQIACQUCTqX0/QIbDAAKCRCbabMQ
+nTu3sDRkAJ0TO7cLbNSWsSCXkv+jyEYCOQQisQCgrkpI+hdvkeFrQqM8caTt/64j
+KpU=
+=kbNd
+-----END PGP PUBLIC KEY BLOCK-----
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+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
+=XRoj
+-----END PGP PUBLIC KEY BLOCK-----
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+mQENBEpLx/4BCAC28CU/Zz51uOWjVNq5QO4m+BPWeKuRFTvxgR97h8glhDE6IsTq
+KKOKgJER1IeqvDweYC204aBaL6x0jb9rtYLVQqAve0VFKjW/EQZZV6adXha/MnEc
+fGuWJBrod9sGiavhUz8PF7dUzOhQT2SrFhB1X4ZBEbzPXW5yuLFFvnvAnQoHDZuC
+wcX+YuohfB7pqGJ7A6NeQDgmUbjNUMdtIh6E4Je7DN25Mwdxfo+o8pmORZVTef/i
+CQdEfdPReNeWaNzdYf6TEElt9bDhGcJFwfrABzq1UXU7OO3UH5EOUU0Glmr8r8hr
+zIz/ILwzkg+QWBkWdJmeN5rfG22hFMkKfUB3ABEBAAG0J01hcmsgQS4gSGVyc2hi
+ZXJnZXIgPG1haEBldmVyeWJvZHkub3JnPokBPQQTAQgAJwUCSkvH/gIbAwUJEswD
+AAULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRB5Vu5Hf5AaMLY/B/0e8JLhKNLa
+udb+fO4H8gYVYefqw+P1u/qzq/FqMPtK9DQI0cezk9h5vvY94UI1S9ftgUtXE+x5
+Ssl+pRrHYs3/4RcJ9/FLnWent4upH2NjGonKcV9fXi9VkIjjvm5R9bQ3jvSNEat7
+7y7rvP2mRrJe8vt9KhDYRRc32XmhPsnl6gDTbPH2Fve/EsRDP9IvrOOZLxfUuqNQ
+Ak5hTJPeFKolyxG39K2PswN002d0e8d2zRKlNkD3Bz/LtL1vII6U04q1F88ydk41
+h4WYLBJGI662hgoDk204YBIhEKrOe2wtq9qvvo/Z4d5SDzvciOIEnHecdpMk+ExD
+HR/Q2esTMrA9iEYEEBEIAAYFAkpL0OkACgkQc17xCi38v/VW3ACg4M0GDYeGTFaD
+IOGqq2Yf6D9vcVQAoKygkMplrgnJL/zVpPqAHXQacbBOiEYEEBECAAYFAkqs/EAA
+CgkQ0+gKWp5CJQpFpQCdFwXS7J2Ay9y+I0Cj/y8DMhA2+z0AoK1n5/pYPhkudclO
+5ufjO2ymBfytiHgEEBEIADgFAkrGEuIxGmh0dHA6Ly93d3cuc2lsZnJlZWQubmV0
+L2Rvd25sb2FkL2NlcnQtcG9saWN5LmFzYwAKCRAlXfqy7QDTEoa7AJ9QItf1cv5t
+SQ+TetRbs0IpzQEojgCg0Na4JCw7aErEVzAqbKa/sFHSwcW5AQ0ESkvKRAEIALkv
+FtrPSq1/EpoUEAeA9XaiH2Sa9MUZ4XHWHeV1Hkno/NL0RbdStMx1BetL5FONb09c
+g/EdAkRRIe/42vCNSYWEgHwFgsoeBFLCPvTbSYHynO2iwoo4a2iPLEW3VuDtpAH7
+c2aEoS4mnbBsJVfU0or3gIvPXWBTnFRDWYVBID4fR9El35pTaxATZGjtXQuu0nv6
++qTUzLvOiNonrISYBw5bWfDxYlFgrfrXQjf84mzT4SoLKO/aHSFASTpblM/LKMIi
+sk0xB36HECbYdJ+H5kVVz55gsaSPG+2tehF+K62mWcog/xurmeY9n2VXq4kIuABO
+PfCvdVWEl2Ywv/u9uKcAEQEAAYkBJQQYAQgADwUCSkvKRAIbDAUJEswDAAAKCRB5
+Vu5Hf5AaMJh2CACepDsJUVOBmNEYmBdxOM+1dZGzxmmHkKP9QkHpHq1B2ZnXjb4e
+rYUlTYUTdxgFj2FBVwvHMfFq8wBHYcHCWBUOe6Wnn/gPQnhLo3hJ5/Rgdqc4Wglm
+uKnNS6BWFSQEBUWTIttQTsYicfOWrbld6H3s1qm3+MPhE3LgtIyP9iaEy4XW7hLp
+xYs/JqjeGNv23yaL34HQiIvqJK1wLevjRKUNMK+udwRgEJZs2e2wOtp/ULE//goY
+7eAT+uvDZJ+kcNkRQYAbB2I5o+6GA6XTdnz1IpOF2HReyV3SHCc85Seq2ueUFID6
+uMiCZfq2natpCwPD2qAWQyapAQ1A/UUqntsf
+=f8Nf
+-----END PGP PUBLIC KEY BLOCK-----
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.13 (MingW32)
+
+mQENBFM0SiIBCADvlDdkeZhR6IkRQLQMMaZBciSgQfCHi10eZ+87FyWCe32wvlkt
+ineuss+cg0BltvdiVkc3uJl5RmJJv8paGvdlsPeZOGfoBUiFt6TajtumPnp4amU8
+wvhaPZ0pN/nz2QVQuUlR4Jet57ienQDPOETnmrRrCJVqYVdQqV5TQEB5NkVyV2qx
+MAKXMEIzLgcOffYbgLedHdDIock9r2DowlKUQtNozUTQoSOnCwkQFrahPosWLkYB
+7CKHnoeRmXtNdWenbFUhvnirSXbsHLmvlapilNDfQXil95YHTrQikphCcNf9Z4mK
+0TpCpl79Fb79GiDTmuZd5GkEYZRVytG3tHyVABEBAAG0JE1hcmt1cyBHbGFzZXIg
+PGdsYXNlckBoYWxsb3dlbHQuYml6PokBPgQTAQIAKAUCUzRKIgIbAwUJCWYBgAYL
+CQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQlGsCVl3ACqcaHAgA1Ak3YE6qmcTA
+Hnqz7N35HbP95Xv9xU3Daw2XrxC5lFlQFR/vW4Pe9gPnUyH5d+cQZbOw6AJI7QCp
+kd5Y1sNXbW5L4TGr5QbyaC7QBlnhHchlNNDYO4f/W4vN4Dofphzs0P0GqQI0Qk9+
+tUOxzUejZS1CrvNJbzJZWTRwleQ1HG4uXaFJv+viiNdkVi2u1/5CBtqTWc66QNEg
+WFL16PI2Wla+ClCkjYE2Q2H+Rm0FQf1szZuSeNtf6Q+01zYaAvpf+7Tl8IAJxFgL
+HdE5Z4aOet6F8VU2cUp8KTV5JIUwrDkJ/SUMHVBTdbHblGDUh4YOjAYdjz6zbjNW
+KPvZ+GQ54LkBDQRTNEoiAQgAwlrZ5aPGFrKUFoex3nYVXY3z+5f/zvC30530wDZU
+sBRuTY6ZlFs3Z/7FD8GecJnq9iY2eSLY7ED3IzNqnfObGX9tejpZMhxn7K5Kp98l
+JFw8wLU1CYz1j2demmX6hQokH/ji/joiSmb0tV38v7X7lRk4warY1mlSA0jwAgzI
++MvrLk4bepu3Q+bFXL9m+M/GXcPxRx00uWdvy3uR6Z6L2q7iZWcinFMWfKxb2Y8j
+ELHj7iqMbqkaLjyKWNtPHP49D6tG1flSFc68bxKE8mOBQ20ntLQrYrOXk/o11Lux
+UlkutTpAePxYMvC5sooldiJ6vgETK5JhyPiegTREoexGgwARAQABiQElBBgBAgAP
+BQJTNEoiAhsMBQkJZgGAAAoJEJRrAlZdwAqnjA4H/i07dFJTDg61T+UeF1nw3XZT
+CpcKLC25ukVfm4Wuh9BT177DzH5ToInrP32ha9FCCC4LoXVaRxGgNLvZfhNCNcHZ
+jCVYAFBmzRWh8lE7okFhhyaX9Ta31oJpo9hOWCy9MNHJITx0YgDlUc0fFb3rodH+
+QeLikkASSuJ5deLaPjDVL6IiiUS+UzhCiU1YE1rPm9co8atJDNZGGbVdZ2dbr5ox
+cuxVGndtnTXP+onv6Hbaf/ppMYxdwiLSwMSIEOQoVEXumJHW+G2Qq7ROrZmZUasf
+9AWnFoBvSo9zXpbgedVaAr1Vk+i/UALTtAjfJ2OH3bJswJfFzbunGoOYxDIc+8I=
+=vhcr
+-----END PGP PUBLIC KEY BLOCK-----
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
+Comment: GPGTools - https://gpgtools.org
+
+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
+=ysCu
+-----END PGP PUBLIC KEY BLOCK-----
diff -Nru wikidiff2-1.2+git03ea59f/debian/watch wikidiff2-1.4.1/debian/watch
--- wikidiff2-1.2+git03ea59f/debian/watch	1970-01-01 00:00:00.000000000 +0000
+++ wikidiff2-1.4.1/debian/watch	2016-08-31 00:04:28.000000000 +0000
@@ -0,0 +1,4 @@
+version=3
+
+opts="dversionmangle=s/^[0-9]+://;s/\+dfsg$//,pgpsigurlmangle=s/$/.sig/" \
+https://releases.wikimedia.org/wikidiff2/ wikidiff2-([0-9.]*).tar.gz
diff -Nru wikidiff2-1.2+git03ea59f/DiffEngine.h wikidiff2-1.4.1/DiffEngine.h
--- wikidiff2-1.2+git03ea59f/DiffEngine.h	2014-03-07 00:31:14.000000000 +0000
+++ wikidiff2-1.4.1/DiffEngine.h	2016-08-30 23:48:52.000000000 +0000
@@ -58,7 +58,8 @@
 		typedef std::vector<T, WD2_ALLOCATOR<T> > ValueVector;
 		typedef std::vector<DiffOp<T>, WD2_ALLOCATOR<T> > DiffOpVector;
 
-		Diff(const ValueVector & from_lines, const ValueVector & to_lines);
+		Diff(const ValueVector & from_lines, const ValueVector & to_lines,
+			long long bailoutComplexity = 0);
 
 		virtual void add_edit(const DiffOp<T> & edit) {
 			edits.push_back(edit);
@@ -91,7 +92,7 @@
  */
 
 template<typename T>
-class _DiffEngine
+class DiffEngine
 {
 	public:
 		// Vectors
@@ -116,16 +117,17 @@
 		typedef std::set<T, std::less<T>, WD2_ALLOCATOR<T> > ValueSet;
 #endif
 
-		_DiffEngine() : done(false) {}
+		DiffEngine() : done(false) {}
 		void clear();
 		void diff (const ValueVector & from_lines,
-				const ValueVector & to_lines, Diff<T> & diff);
-		int _lcs_pos (int ypos);
-		void _compareseq (int xoff, int xlim, int yoff, int ylim);
-		void _shift_boundaries (const ValueVector & lines, BoolVector & changed,
+				const ValueVector & to_lines, Diff<T> & diff,
+				long long bailoutComplexity = 0);
+		int lcs_pos (int ypos);
+		void compareseq (int xoff, int xlim, int yoff, int ylim);
+		void shift_boundaries (const ValueVector & lines, BoolVector & changed,
 				const BoolVector & other_changed);
 	protected:
-		int _diag (int xoff, int xlim, int yoff, int ylim, int nchunks,
+		int diag (int xoff, int xlim, int yoff, int ylim, int nchunks,
 				IntPairVector & seps);
 
 		BoolVector xchanged, ychanged;
@@ -139,10 +141,10 @@
 };
 
 //-----------------------------------------------------------------------------
-// _DiffEngine implementation
+// DiffEngine implementation
 //-----------------------------------------------------------------------------
 template<typename T>
-void _DiffEngine<T>::clear()
+void DiffEngine<T>::clear()
 {
 	xchanged.clear();
 	ychanged.clear();
@@ -156,8 +158,9 @@
 }
 
 template<typename T>
-void _DiffEngine<T>::diff (const ValueVector & from_lines,
-		const ValueVector & to_lines, Diff<T> & diff)
+void DiffEngine<T>::diff (const ValueVector & from_lines,
+		const ValueVector & to_lines, Diff<T> & diff,
+		long long bailoutComplexity /* = 0 */)
 {
 	int n_from = (int)from_lines.size();
 	int n_to = (int)to_lines.size();
@@ -185,6 +188,26 @@
 		xchanged[xi] = ychanged[yi] = false;
 	}
 
+	long long complexity = (long long)(n_from - skip - endskip)
+		* (n_to - skip - endskip);
+
+	// If too complex, just output "whole left side replaced with right"
+	if (bailoutComplexity > 0 && complexity > bailoutComplexity) {
+		PointerVector del;
+		PointerVector add;
+
+		for (xi = 0; xi < n_from; xi++) {
+			del.push_back(&from_lines[xi]);
+		}
+		for (yi = 0; yi < n_to; yi++) {
+			add.push_back(&to_lines[yi]);
+		}
+		diff.add_edit(DiffOp<T>(DiffOp<T>::change, del, add));
+
+		done = true;
+		return;
+	}
+
 	// Ignore lines which do not exist in both files.
 	ValueSet xhash, yhash;
 	for (xi = skip; xi < n_from - endskip; xi++) {
@@ -208,11 +231,11 @@
 	}
 
 	// Find the LCS.
-	_compareseq(0, xv.size(), 0, yv.size());
+	compareseq(0, xv.size(), 0, yv.size());
 
 	// Merge edits when possible
-	_shift_boundaries(from_lines, xchanged, ychanged);
-	_shift_boundaries(to_lines, ychanged, xchanged);
+	shift_boundaries(from_lines, xchanged, ychanged);
+	shift_boundaries(to_lines, ychanged, xchanged);
 
 	// Compute the edit operations.
 	xi = yi = 0;
@@ -271,7 +294,7 @@
  * of the portions it is going to specify.
  */
 template <typename T>
-int _DiffEngine<T>::_diag (int xoff, int xlim, int yoff, int ylim, int nchunks,
+int DiffEngine<T>::diag (int xoff, int xlim, int yoff, int ylim, int nchunks,
 		IntPairVector & seps)
 {
 	using std::swap;
@@ -328,7 +351,7 @@
 
 			for (y = pMatches->begin(); y != pMatches->end(); ++y) {
 				if (!in_seq.count(*y)) {
-					k = _lcs_pos(*y);
+					k = lcs_pos(*y);
 					assert(k > 0);
 					copy(ymids.begin() + (k-1) * nchunks, ymids.begin() + k * nchunks,
 							ymids.begin() + k * nchunks);
@@ -345,7 +368,7 @@
 					seq[k] = *y;
 					in_seq.insert(*y);
 				} else if (!in_seq.count(*y)) {
-					k = _lcs_pos(*y);
+					k = lcs_pos(*y);
 					assert(k > 0);
 					copy(ymids.begin() + (k-1) * nchunks, ymids.begin() + k * nchunks,
 							ymids.begin() + k * nchunks);
@@ -369,7 +392,7 @@
 }
 
 template <typename T>
-int _DiffEngine<T>::_lcs_pos (int ypos) {
+int DiffEngine<T>::lcs_pos (int ypos) {
 	int end = lcs;
 	if (end == 0 || ypos > seq[end]) {
 		seq[++lcs] = ypos;
@@ -406,7 +429,7 @@
  * All line numbers are origin-0 and discarded lines are not counted.
  */
 template <typename T>
-void _DiffEngine<T>::_compareseq (int xoff, int xlim, int yoff, int ylim) {
+void DiffEngine<T>::compareseq (int xoff, int xlim, int yoff, int ylim) {
 	using std::pair;
 
 	IntPairVector seps;
@@ -431,7 +454,7 @@
 		//nchunks = sqrt(min(xlim - xoff, ylim - yoff) / 2.5);
 		//nchunks = max(2,min(8,(int)nchunks));
 		int nchunks = std::min(MAX_CHUNKS-1, std::min(xlim - xoff, ylim - yoff)) + 1;
-		lcs = _diag(xoff, xlim, yoff, ylim, nchunks, seps);
+		lcs = diag(xoff, xlim, yoff, ylim, nchunks, seps);
 	}
 
 	if (lcs == 0) {
@@ -446,7 +469,7 @@
 		IntPairVector::iterator pt1, pt2;
 		pt1 = pt2 = seps.begin();
 		while (++pt2 != seps.end()) {
-			_compareseq (pt1->first, pt2->first, pt1->second, pt2->second);
+			compareseq (pt1->first, pt2->first, pt1->second, pt2->second);
 			pt1 = pt2;
 		}
 	}
@@ -465,7 +488,7 @@
  * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
  */
 template <typename T>
-void _DiffEngine<T>::_shift_boundaries (const ValueVector & lines, BoolVector & changed,
+void DiffEngine<T>::shift_boundaries (const ValueVector & lines, BoolVector & changed,
 		const BoolVector & other_changed)
 {
 	int i = 0;
@@ -571,10 +594,11 @@
 //-----------------------------------------------------------------------------
 
 template<typename T>
-Diff<T>::Diff(const ValueVector & from_lines, const ValueVector & to_lines)
+Diff<T>::Diff(const ValueVector & from_lines, const ValueVector & to_lines,
+	long long bailoutComplexity)
 {
-	_DiffEngine<T> engine;
-	engine.diff(from_lines, to_lines, *this);
+	DiffEngine<T> engine;
+	engine.diff(from_lines, to_lines, *this, bailoutComplexity);
 }
 
 #endif
diff -Nru wikidiff2-1.2+git03ea59f/.gitignore wikidiff2-1.4.1/.gitignore
--- wikidiff2-1.2+git03ea59f/.gitignore	2014-03-07 00:31:14.000000000 +0000
+++ wikidiff2-1.4.1/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-.svn
-*~
-*.kate-swp
-.*.swp
-*.in
-*.lo
-*.la
-*.m4
-Makefile*
-config.*
-
-.deps
-configure
-install-sh
-libtool
-ltmain.sh
-missing
-mkinstalldirs
-run-tests.php
-
-.libs
-autom4te.cache
-build
-modules
-
diff -Nru wikidiff2-1.2+git03ea59f/hhvm_wikidiff2.cpp wikidiff2-1.4.1/hhvm_wikidiff2.cpp
--- wikidiff2-1.2+git03ea59f/hhvm_wikidiff2.cpp	2014-03-07 00:31:14.000000000 +0000
+++ wikidiff2-1.4.1/hhvm_wikidiff2.cpp	2016-08-30 23:48:52.000000000 +0000
@@ -1,6 +1,8 @@
 /* $Id$ */
 
-#include "hphp/runtime/base/base-includes.h"
+#include "hphp/util/lock.h"
+#include "hphp/runtime/ext/extension.h"
+#include "hphp/util/compatibility.h"
 #include "hphp/util/alloc.h"
 #include "Wikidiff2.h"
 #include "TableDiff.h"
@@ -71,6 +73,3 @@
 HHVM_GET_MODULE(wikidiff2)
 
 } // namespace HPHP
-
-
-
diff -Nru wikidiff2-1.2+git03ea59f/InlineDiff.cpp wikidiff2-1.4.1/InlineDiff.cpp
--- wikidiff2-1.2+git03ea59f/InlineDiff.cpp	2014-03-07 00:31:14.000000000 +0000
+++ wikidiff2-1.4.1/InlineDiff.cpp	2016-08-30 23:48:52.000000000 +0000
@@ -16,7 +16,7 @@
 
 	explodeWords(text1, words1);
 	explodeWords(text2, words2);
-	WordDiff worddiff(words1, words2);
+	WordDiff worddiff(words1, words2, MAX_WORD_LEVEL_DIFF_COMPLEXITY);
 	String word;
 
 	result += "<div class=\"mw-diff-inline-changed\">";
diff -Nru wikidiff2-1.2+git03ea59f/php_wikidiff2.cpp wikidiff2-1.4.1/php_wikidiff2.cpp
--- wikidiff2-1.2+git03ea59f/php_wikidiff2.cpp	2014-03-07 00:31:14.000000000 +0000
+++ wikidiff2-1.4.1/php_wikidiff2.cpp	2016-08-30 23:48:52.000000000 +0000
@@ -12,6 +12,12 @@
 #include "TableDiff.h"
 #include "InlineDiff.h"
 
+#if PHP_MAJOR_VERSION >= 7
+#define COMPAT_RETURN_STRINGL(s, l) { RETURN_STRINGL(s, l); return; }
+#else
+#define COMPAT_RETURN_STRINGL(s, l) { RETURN_STRINGL(s, l, 1); return; }
+#endif
+
 static int le_wikidiff2;
 
 zend_function_entry wikidiff2_functions[] = {
@@ -81,9 +87,15 @@
 	char *text1 = NULL;
 	char *text2 = NULL;
 	int argc = ZEND_NUM_ARGS();
+#if PHP_MAJOR_VERSION >= 7
+	size_t text1_len;
+	size_t text2_len;
+	zend_long numContextLines;
+#else
 	int text1_len;
 	int text2_len;
 	long numContextLines;
+#endif
 
 	if (zend_parse_parameters(argc TSRMLS_CC, "ssl", &text1, &text1_len, &text2,
 		&text2_len, &numContextLines) == FAILURE)
@@ -96,8 +108,8 @@
 		TableDiff wikidiff2;
 		Wikidiff2::String text1String(text1, text1_len);
 		Wikidiff2::String text2String(text2, text2_len);
-		const Wikidiff2::String & ret = wikidiff2.execute(text1String, text2String, numContextLines);
-		RETURN_STRINGL( const_cast<char*>(ret.data()), ret.size(), 1);
+		const Wikidiff2::String & ret = wikidiff2.execute(text1String, text2String, (int)numContextLines);
+		COMPAT_RETURN_STRINGL( const_cast<char*>(ret.data()), ret.size());
 	} catch (std::bad_alloc &e) {
 		zend_error(E_WARNING, "Out of memory in wikidiff2_do_diff().");
 	} catch (...) {
@@ -115,9 +127,15 @@
 	char *text1 = NULL;
 	char *text2 = NULL;
 	int argc = ZEND_NUM_ARGS();
+#if PHP_MAJOR_VERSION >= 7
+	size_t text1_len;
+	size_t text2_len;
+	zend_long numContextLines;
+#else
 	int text1_len;
 	int text2_len;
 	long numContextLines;
+#endif
 
 	if (zend_parse_parameters(argc TSRMLS_CC, "ssl", &text1, &text1_len, &text2,
 		&text2_len, &numContextLines) == FAILURE)
@@ -130,8 +148,8 @@
 		InlineDiff wikidiff2;
 		Wikidiff2::String text1String(text1, text1_len);
 		Wikidiff2::String text2String(text2, text2_len);
-		const Wikidiff2::String& ret = wikidiff2.execute(text1String, text2String, numContextLines);
-		RETURN_STRINGL( const_cast<char*>(ret.data()), ret.size(), 1);
+		const Wikidiff2::String& ret = wikidiff2.execute(text1String, text2String, (int)numContextLines);
+		COMPAT_RETURN_STRINGL( const_cast<char*>(ret.data()), ret.size());
 	} catch (std::bad_alloc &e) {
 		zend_error(E_WARNING, "Out of memory in wikidiff2_inline_diff().");
 	} catch (...) {
diff -Nru wikidiff2-1.2+git03ea59f/README wikidiff2-1.4.1/README
--- wikidiff2-1.2+git03ea59f/README	2014-03-07 00:31:14.000000000 +0000
+++ wikidiff2-1.4.1/README	2016-08-30 23:48:52.000000000 +0000
@@ -1,4 +1,4 @@
-Wikidiff2 is partly based on the original wikidiff, partly on DifferenceEngine.php, and partly my own work. It performs word-level (space-delimited) diffs on general text, and character-level diffs on text composed of characters from the Japanese and Thai alphabets and the unified han. Japanese, Chinese and Thai do not use spaces to separate words. The input is assumed to be UTF-8 encoded. Invalid UTF-8 may cause undesirable operation, such as truncation of the output, so the input should be validated by the application. The input text should have unix-style line endings.
+Wikidiff2 is partly based on the original wikidiff, partly on DifferenceEngine.php, and partly Tim Starling's own work. It performs word-level (space-delimited) diffs on general text, and character-level diffs on text composed of characters from the Japanese and Thai alphabets and the unified han. Japanese, Chinese and Thai do not use spaces to separate words. The input is assumed to be UTF-8 encoded. Invalid UTF-8 may cause undesirable operation, such as truncation of the output, so the input should be validated by the application. The input text should have unix-style line endings.
 
 The output is an HTML fragment -- a number of HTML table rows with the rest of the document structure omitted. The characters "<", ">" and "&" will be HTML-escaped in the output.
 
@@ -19,29 +19,22 @@
 
 * libthai, a Thai language support library
   http://linux.thai.net/plone/TLWG/libthai/
+  On Debian-based systems, you need libthai0 and libthai-dev packages
 
-To compile and install it:
+== Compilation and installation with Zend PHP ==
 
 $ phpize
 $ ./configure
 $ make
 $ sudo make install
 
-== Changelog ==
+== Compilation and installation with HHVM ==
+
+$ hphpize
+$ cmake .
+$ make
+$ sudo make install
 
-2013-08-07
-* (bug 52616) Use <ins> and <del> for insertions and deletions
 
-2012-01-03
-* (bug 26354) Add class to dummy cells containing &nbsp;
-* (bug 25697) Add &#160; to empty context lines
-
-2010-09-30
-* Automatically use CXXFLAGS=-Wno-write-strings
-
-2010-06-14
-* Converted the extension from swig to PHP native.
-* Added Thai word break support
-* Added PHP allocator support
 
 vim: wrap
diff -Nru wikidiff2-1.2+git03ea59f/TableDiff.cpp wikidiff2-1.4.1/TableDiff.cpp
--- wikidiff2-1.2+git03ea59f/TableDiff.cpp	2014-03-07 00:31:14.000000000 +0000
+++ wikidiff2-1.4.1/TableDiff.cpp	2016-08-30 23:48:52.000000000 +0000
@@ -29,7 +29,7 @@
 
 	explodeWords(text1, words1);
 	explodeWords(text2, words2);
-	WordDiff worddiff(words1, words2);
+	WordDiff worddiff(words1, words2, MAX_WORD_LEVEL_DIFF_COMPLEXITY);
 
 	//debugPrintWordDiff(worddiff);
 
diff -Nru wikidiff2-1.2+git03ea59f/tests/003.phpt wikidiff2-1.4.1/tests/003.phpt
--- wikidiff2-1.2+git03ea59f/tests/003.phpt	2014-03-07 00:31:14.000000000 +0000
+++ wikidiff2-1.4.1/tests/003.phpt	2016-08-30 23:48:52.000000000 +0000
@@ -1,5 +1,5 @@
 --TEST--
-Diff test C: https://bugzilla.wikimedia.org/show_bug.cgi?id=27993
+Diff test C: https://phabricator.wikimedia.org/T29993
 --SKIPIF--
 <?php if (!extension_loaded("wikidiff2")) print "skip"; ?>
 --FILE--
diff -Nru wikidiff2-1.2+git03ea59f/tests/005.phpt wikidiff2-1.4.1/tests/005.phpt
--- wikidiff2-1.2+git03ea59f/tests/005.phpt	1970-01-01 00:00:00.000000000 +0000
+++ wikidiff2-1.4.1/tests/005.phpt	2016-08-30 23:48:52.000000000 +0000
@@ -0,0 +1,25 @@
+--TEST--
+Diff test E: small change in a big paragraph
+--SKIPIF--
+<?php if (!extension_loaded("wikidiff2")) print "skip"; ?>
+--FILE--
+<?php
+$x = str_repeat( 'test ', 2002 );
+$y = str_repeat( 'test ', 1001 ) . 'bloody ' . str_repeat( 'test ', 1001 );
+
+#---------------------------------------------------
+
+print wikidiff2_do_diff( $x, $y, 2 );
+
+?>
+--EXPECT--
+<tr>
+  <td colspan="2" class="diff-lineno"><!--LINE 1--></td>
+  <td colspan="2" class="diff-lineno"><!--LINE 1--></td>
+</tr>
+<tr>
+  <td class="diff-marker">−</td>
+  <td class="diff-deletedline"><div>test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test </div></td>
+  <td class="diff-marker">+</td>
+  <td class="diff-addedline"><div>test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test<ins class="diffchange diffchange-inline"> bloody</ins> test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test </div></td>
+</tr>
diff -Nru wikidiff2-1.2+git03ea59f/tests/006.phpt wikidiff2-1.4.1/tests/006.phpt
--- wikidiff2-1.2+git03ea59f/tests/006.phpt	1970-01-01 00:00:00.000000000 +0000
+++ wikidiff2-1.4.1/tests/006.phpt	2016-08-30 23:48:52.000000000 +0000
@@ -0,0 +1,18 @@
+--TEST--
+Diff test F: don't diff reeeal long paragraph-level changes
+--SKIPIF--
+<?php if (!extension_loaded("wikidiff2")) print "skip"; ?>
+--FILE--
+<?php
+$x = str_repeat( 'a ', 6500 );
+$y = str_repeat( 'b ', 6000 ) . "\n" . str_repeat( 'b ', 500 );
+
+#---------------------------------------------------
+
+print wikidiff2_inline_diff( $x, $y, 2 );
+
+?>
+--EXPECT--
+<div class="mw-diff-inline-header"><!-- LINES 1,1 --></div>
+<div class="mw-diff-inline-changed"><del>a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a </del><ins>b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b </ins></div>
+<div class="mw-diff-inline-added"><ins>b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b </ins></div>
diff -Nru wikidiff2-1.2+git03ea59f/Wikidiff2.cpp wikidiff2-1.4.1/Wikidiff2.cpp
--- wikidiff2-1.2+git03ea59f/Wikidiff2.cpp	2014-03-07 00:31:14.000000000 +0000
+++ wikidiff2-1.4.1/Wikidiff2.cpp	2016-08-30 23:48:52.000000000 +0000
@@ -218,12 +218,6 @@
 // have to check this somehow.
 void Wikidiff2::explodeWords(const String & text, WordVector &words)
 {
-	// Don't try to do a word-level diff on very long lines
-	if (text.size() > MAX_DIFF_LINE) {
-		words.push_back(Word(text.begin(), text.end(), text.end()));
-		return;
-	}
-
 	// Decode the UTF-8 in the string.
 	// * Save the character sizes (in bytes)
 	// * Convert the string to TIS-620, which is the internal character set of libthai.
diff -Nru wikidiff2-1.2+git03ea59f/Wikidiff2.h wikidiff2-1.4.1/Wikidiff2.h
--- wikidiff2-1.2+git03ea59f/Wikidiff2.h	2014-03-07 00:31:14.000000000 +0000
+++ wikidiff2-1.4.1/Wikidiff2.h	2016-08-30 23:48:52.000000000 +0000
@@ -1,8 +1,6 @@
 #ifndef WIKIDIFF2_H
 #define WIKIDIFF2_H
 
-#define MAX_DIFF_LINE 10000
-
 /** Set WD2_USE_STD_ALLOCATOR depending on whether we're compiling as a PHP module or not */
 #if defined(HAVE_CONFIG_H)
 	#define WD2_ALLOCATOR PhpAllocator
@@ -33,6 +31,7 @@
 		inline const String & getResult() const;
 
 	protected:
+		enum { MAX_WORD_LEVEL_DIFF_COMPLEXITY = 40000000 };
 		String result;
 
 		virtual void diffLines(const StringVector & lines1, const StringVector & lines2,
@@ -85,4 +84,3 @@
 }
 
 #endif
-