clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 11:27:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
95,335 Commits 491 Branches 1,363 Tags 847 MiB
0723a226c3
Commit Graph

124 Commits

Author SHA1 Message Date
Anatol Belski
54d8053ac5 Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390 2016-09-23 01:52:42 +02:00
Anatol Belski
5f9df47ea8 Revert "upgraded to PCRE 8.39" 
This reverts commit 2fba646837.

PCRE-8.39 throws weird valgrind backtraces on some systems, see
http://news.php.net/php.cvs/93494 . Those could be false positives
due to some changes in JIT, still i couldn't 100% ensure this.
Thus, better we continue to ship 8.38 bundled for now, and apply
patches, if needed.
 2016-07-31 14:55:17 +02:00
Anatol Belski
2fba646837 upgraded to PCRE 8.39 
(cherry picked from commit 9d4fe9672a)
 2016-07-26 15:07:04 +02:00
Stanislav Malyshev
916c1fb3af Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Upgrade bundled PCRE to 8.38
  Fixed NEWS file entry
  fix the fix for bug #70976 (imagerotate)

Conflicts:
	ext/pcre/pcrelib/config.h
 2016-01-31 21:39:24 -08:00
Stanislav Malyshev
00788f9cfb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Upgrade bundled PCRE to 8.38
  Fixed NEWS file entry
  fix the fix for bug #70976 (imagerotate)
 2016-01-31 21:06:31 -08:00
Stanislav Malyshev
ca02d9c2d6 Upgrade bundled PCRE to 8.38 2016-01-31 20:37:47 -08:00
Lior Kaplan
7a02d138a6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #69689 (Align PCRE_MINOR with current version)
 2015-06-18 17:36:46 +03:00
Lior Kaplan
3930e1f2fa Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #69689 (Align PCRE_MINOR with current version)
 2015-06-18 17:35:54 +03:00
Lior Kaplan
ca33ae3eb2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #69689 (Align PCRE_MINOR with current version)
 2015-06-18 17:34:53 +03:00
Lior Kaplan
cc7194dd10 Fixed bug #69689 (Align PCRE_MINOR with current version) 2015-06-18 17:30:21 +03:00
Stanislav Malyshev
66153ba153 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Update PCRE version (bug #69689)
  move test
  NEWS 5.4
  fix new test
  Fixed Bug #69667 segfault in php_pgsql_meta_data
  5.4.42 next
 2015-05-30 21:19:05 -07:00
Stanislav Malyshev
60c925fd41 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update PCRE version (bug #69689)
  move test
  NEWS 5.4
  fix new test
  Fixed Bug #69667 segfault in php_pgsql_meta_data
  5.4.42 next
 2015-05-30 21:18:50 -07:00
Stanislav Malyshev
930fb8b1f3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update PCRE version (bug #69689)
  move test
  NEWS 5.4
  fix new test
  Fixed Bug #69667 segfault in php_pgsql_meta_data
  5.4.42 next

Conflicts:
	configure.in
	main/php_version.h
 2015-05-30 21:18:28 -07:00
Stanislav Malyshev
f38ca75a3c Update PCRE version (bug #69689) 2015-05-30 21:17:16 -07:00
olshevskiy87
8bdec7a248 fix typos 
Signed-off-by: olshevskiy87 <olshevskiy87@bk.ru>
 2015-05-13 22:28:35 +04:00
Stanislav Malyshev
98fe9405e2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Upgrade to PCRE 8.37 due to various bugfixes

Conflicts:
	ext/pcre/config.w32
	ext/pcre/config0.m4
	ext/pcre/pcrelib/pcre_jit_compile.c
	ext/pcre/pcrelib/sljit/sljitConfig.h
	ext/pcre/pcrelib/sljit/sljitConfigInternal.h
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeARM_64.c
	ext/pcre/pcrelib/sljit/sljitNativeARM_T2_32.c
	ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c
	ext/pcre/pcrelib/sljit/sljitNativePPC_common.c
	ext/pcre/pcrelib/sljit/sljitNativeSPARC_common.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pcre/pcrelib/sljit/sljitNativeX86_32.c
	ext/pcre/pcrelib/sljit/sljitNativeX86_64.c
	ext/pcre/pcrelib/sljit/sljitNativeX86_common.c
	ext/pcre/pcrelib/sljit/sljitUtils.c
 2015-04-29 22:34:54 -07:00
Stanislav Malyshev
428d0983cd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Upgrade to PCRE 8.37 due to various bugfixes
 2015-04-29 22:28:04 -07:00
Stanislav Malyshev
ce6db558f9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Upgrade to PCRE 8.37 due to various bugfixes
 2015-04-29 22:27:21 -07:00
Stanislav Malyshev
95fa727992 Upgrade to PCRE 8.37 due to various bugfixes 2015-04-29 22:27:07 -07:00
Anatol Belski
7ccafe40c2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix VC9 build with PCRE
  Revert "Fix segfault in ext/date since 957aa2"
 2015-04-28 14:38:45 +02:00
Anatol Belski
768bbedf82 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix VC9 build with PCRE
 2015-04-28 14:38:21 +02:00
Anatol Belski
9c5c3ff022 fix VC9 build with PCRE 2015-04-28 13:15:39 +02:00
Stanislav Malyshev
c34aba472c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Upgrade PCRE to 8.36, it fixes some crashes

Conflicts:
	ext/pcre/pcrelib/config.h
	ext/pcre/pcrelib/pcre_ucd.c
 2015-04-27 23:41:18 -07:00
Stanislav Malyshev
19ad1389aa Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Upgrade PCRE to 8.36, it fixes some crashes
 2015-04-27 23:30:57 -07:00
Stanislav Malyshev
13c32a102c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Upgrade PCRE to 8.36, it fixes some crashes
 2015-04-27 23:25:32 -07:00
Stanislav Malyshev
23917b451b Upgrade PCRE to 8.36, it fixes some crashes 
We probably will need to go to 8.37 once it is released.
 2015-04-27 23:16:54 -07:00
Lior Kaplan
3b8b1435ad Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix typo: unitialized -> uninitialized
  Fix typo: unitialized -> uninitialized

Conflicts:
	ext/xmlwriter/php_xmlwriter.c
 2015-04-01 18:30:55 +03:00
Lior Kaplan
2fd74c7f03 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix typo: unitialized -> uninitialized
 2015-04-01 18:20:26 +03:00
Lior Kaplan
59c2a55ec7 Fix typo: unitialized -> uninitialized 2015-04-01 18:17:53 +03:00
Dmitry Stogov
da5439b9c8 Re-enable PCRE JIT disabled by b436c714c6 2015-02-06 14:02:15 +03:00
Arjen Schol
b436c714c6 Upgrade pcre to 8.36 2015-02-04 14:08:41 +01:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Anatol Belski
3485925a3a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream
  remove BOM from NEWS
 2014-12-30 16:51:06 +01:00
Anatol Belski
d5123415f6 Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream 2014-12-30 16:50:22 +01:00
Veres Lajos
06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
Veres Lajos
4dc994571d typo fixes - https://github.com/vlajos/misspell_fixer 
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
 2014-11-23 14:33:43 -08:00
Lior Kaplan
543d5eb495 Merge branch 'PHP-5.6' 
* PHP-5.6:
  typofixes

Conflicts:
	ext/spl/php_spl.c
 2014-08-17 15:53:33 +03:00
Lior Kaplan
be2128c805 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typofixes
 2014-08-17 15:48:22 +03:00
Veres Lajos
3f42f2f5d1 typofixes 2014-08-17 15:44:02 +03:00
Dmitry Stogov
dd0e96cca3 Bundle pcre-8.35 with sljit support 2014-06-06 18:46:19 +04:00
Anatol Belski
c62f32c3cc Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream 
upstream patch applied
 2014-05-09 22:15:54 +02:00
Anatol Belski
23cb7bd506 pcre upgraded to 8.34 2014-02-04 10:31:07 +01:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Veres Lajos
04145dc2aa typo fixes (argument) 2013-06-10 13:36:17 -07:00
Anatol Belski
357ab3cbad merged PCRE 8.32 
- defined HAVE_CONFIG_H to simplify the future merges
- PCRE NEWS http://pcre.org/news.txt
 2013-03-03 19:06:22 +01:00
Anatoliy Belsky
276c5de0d8 Fixed bug #63284 PCRE upgrade to 8.31 2012-10-19 09:49:28 +02:00
Scott MacVicar
74b8f72017 Fix Windows build, this really should be in a patch file / README. 
I'll fix this up later.
 2011-05-13 13:51:07 +00:00
Scott MacVicar
27fc1b889a Update bundled PCRE to 8.12 2011-05-13 07:00:45 +00:00