clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,209 Commits 494 Branches 1,367 Tags 801 MiB
f863d89b5c
Commit Graph

82209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
f863d89b5c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #69732 (can induce segmentation fault with basic php code).

Conflicts:
	Zend/zend_vm_execute.h
 2015-06-01 12:17:32 +03:00
Dmitry Stogov
9031a902e3 Fixed bug #69732 (can induce segmentation fault with basic php code). 2015-06-01 11:40:14 +03:00
Stanislav Malyshev
4758505b27 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  improve fix for Bug #69545
 2015-05-31 17:30:29 -07:00
Stanislav Malyshev
8746163153 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  improve fix for Bug #69545
 2015-05-31 17:29:53 -07:00
Stanislav Malyshev
0765623d69 improve fix for Bug #69545 2015-05-31 17:29:00 -07:00
Anatol Belski
34bcd69f82 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix phpize mode for manifest embedding
 2015-05-31 23:02:01 +02:00
Anatol Belski
f029a2856b fix phpize mode for manifest embedding 2015-05-31 23:01:21 +02:00
Anatol Belski
6f1c006b6d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  split the original test to check behaviour diff on 32- and 64-bit
  recovered original meaning of SXE xpath test
 2015-05-31 21:30:46 +02:00
Christoph M. Becker
b24fedbd24 split the original test to check behaviour diff on 32- and 64-bit 2015-05-31 21:28:44 +02:00
Christoph M. Becker
e44b040faf recovered original meaning of SXE xpath test 2015-05-31 21:27:02 +02:00
Anatol Belski
021effbe97 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  backport the basic code to properly recognize win 8.1 and 10
  backport the manifest changes for makefile
  backport the manifest changes in js
  add default manifest
  add test
 2015-05-31 19:32:21 +02:00
Anatol Belski
1e9522021a backport the basic code to properly recognize win 8.1 and 10 2015-05-31 19:01:58 +02:00
Anatol Belski
31d59bf915 backport the manifest changes for makefile 2015-05-31 18:59:00 +02:00
Anatol Belski
50d4ea90b3 backport the manifest changes in js 2015-05-31 18:53:51 +02:00
Anatol Belski
7e731e4d9d add default manifest 2015-05-31 18:17:58 +02:00
Anatol Belski
05351f9ccb add test 2015-05-31 18:13:33 +02: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
Anatol Belski
ff30d0319a updated NEWS 2015-05-29 21:18:37 +02:00
Anatol Belski
8e02be16d7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Refactored the fix for bug #66084, by cmb@php.net
  Merge the fix for #69703 to 5.5 per request from Julien
 2015-05-29 21:18:04 +02:00
Anatol Belski
5683b6fa39 Refactored the fix for bug #66084, by cmb@php.net 2015-05-29 21:16:56 +02:00
Nikita Popov
e7d0ca39e5 Preserve VARIADIC flag for Closure::__invoke() 
The 13 arguments are for the benefit of PHP 7, where the first
twelve use the bitmask.
 2015-05-29 11:07:23 +02:00
Kalle Sommer Nielsen
c4e9651b58 Merge the fix for #69703 to 5.5 per request from Julien 2015-05-28 16:54:02 +02:00
Kalle Sommer Nielsen
424005a301 Shouldn't have been committed, so revert 2015-05-28 14:37:52 +02:00
Kalle Sommer Nielsen
de696d851f Fixed bug #69703 (Use __builtin_clzl on PowerPC) -- Patch by dja at axtens dot net 
# Julien, even though 5.5 is still non security mode I don't think we should merge this patch but I leave the choice with you
 2015-05-28 14:30:18 +02:00
Remi Collet
7611d1c41b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Relax a little this test, because random is not reliable
 2015-05-28 10:37:39 +02:00
Remi Collet
09b92a3a54 Relax a little this test, because random is not reliable 
Usual values are 3500-3950, but >4000 can happen.
 2015-05-28 10:35:19 +02:00
Ferenc Kovacs
482c69bf63 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  empty commit to trigger a github mirror
 2015-05-28 02:09:12 +02:00
Ferenc Kovacs
00d8e26d71 empty commit to trigger a github mirror 2015-05-28 02:08:48 +02:00
Ferenc Kovacs
4d8ae36695 move to 5.6.11-dev 2015-05-28 02:05:50 +02:00
Xinchen Hui
1f077cc4f4 Merge branch 'PHP-5.5' into PHP-5.6 2015-05-26 16:24:39 +08:00
Xinchen Hui
76a290d0be Fixed C89 2015-05-26 16:24:18 +08:00
Remi Collet
c630779648 NEWS 2015-05-24 09:39:44 +02:00
Remi Collet
565de1ae64 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fixed Bug #69479 GD fails to build with newer libvpx
 2015-05-24 09:39:20 +02:00
Remi Collet
4cab20bbb4 NEWS 2015-05-24 09:39:03 +02:00
Remi Collet
e807e07bfa Fixed Bug #69479 GD fails to build with newer libvpx 
From upstream d41eb72cd4

Fix build with latest libvpx 1.4.0

These new constants exist at least since 1.0.0
Compatibility ones have been droped in 1.4.0
 2015-05-24 09:37:12 +02:00
Anatol Belski
4e002b4412 updated NEWS 2015-05-23 23:02:09 +02:00
Anatol Belski
f3cec08e65 increase the internal post data buffer 
This brings speedup and fixes issues with var parsing. Default BUFSIZ
on Windows is 512 bytes which causes too much reallocation work.
 2015-05-23 18:44:39 +02:00
Anatol Belski
0bc3a74334 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2015-05-22 21:27:19 +02:00
Anatol Belski
d9c266f4c9 fix test 
Sometimes the path is unixified, sometimes not, so better don't
care about the slash in this case.
 2015-05-22 21:25:52 +02:00
Lior Kaplan
2e2cbcc926 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add entry for bug #69354, fixed in 5.5.25
  Add entry about PCRE upgrade (rev 95fa7279)
  Add CVE for bugs in 5.5.25
 2015-05-22 11:18:32 +03:00
Lior Kaplan
827d2c1415 Add entry for bug #69354, fixed in 5.5.25 2015-05-22 11:17:01 +03:00
Lior Kaplan
f736934af0 Add CVE for bugs in 5.6.9 2015-05-22 11:15:36 +03:00
Lior Kaplan
7ecab5d23f Add entry about PCRE upgrade (rev 95fa7279) 2015-05-22 11:02:01 +03:00
Lior Kaplan
c9ac441fe8 Add CVE for bugs in 5.5.25 2015-05-22 10:58:28 +03:00
Remi Collet
68e368ed34 NEWS 2015-05-21 14:07:02 +02:00
Remi Collet
17d5ebe76e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #69680 (phar symlink in binary directory broken).
  Make the phar symlink relative
 2015-05-21 14:06:26 +02:00
Remi Collet
a7de68f98a Fixed bug #69680 (phar symlink in binary directory broken). 
Relative symlink are better, as relative to link directory.
 2015-05-21 14:05:15 +02:00
ponce
c3d983f3af Make the phar symlink relative 
or we got a symlink pointing to the build files
thanks also to remicollet
 2015-05-21 14:03:18 +02:00