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
75,732 Commits 491 Branches 1,363 Tags 847 MiB
8f78c3b9eb
Commit Graph

75732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev
8f78c3b9eb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug 666222
 2014-06-08 19:00:42 -07:00
Levi Morrison
f47976dd9b Fix bug 666222 
This also adds some smaller, isolated tests related to bug 66622.
 2014-06-08 18:59:44 -07:00
Levi Morrison
e030efa4f6 Fix bug 666222 
This also adds some smaller, isolated tests related to bug 66622.

Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
 2014-06-08 18:59:23 -07:00
Stanislav Malyshev
38343856e1 Merge branch 'PHp-5.4' into PHP-5.5 
* PHp-5.4:
  Fixed identation on file
  Fix align indentation
 2014-06-08 15:53:26 -07:00
Jefersson Nathan
33926b19d0 Fixed identation on file 2014-06-08 14:30:01 -07:00
Jefersson Nathan
e51eaaf665 Fix align indentation 2014-06-08 14:28:51 -07:00
Stanislav Malyshev
4946dc1ab9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Added support for parsing ssl certificates using GeneralizedTime format.
 2014-06-08 14:19:16 -07:00
Paul Oehler
76a7fd893b Added support for parsing ssl certificates using GeneralizedTime format. 
fix bug #65698
fix bug #66636
 2014-06-08 14:17:58 -07:00
Stanislav Malyshev
da6abc8db4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Remove superfluous echos.
 2014-06-08 13:50:41 -07:00
Jeff Welch
5fd7c2b01d Remove superfluous echos. 2014-06-08 13:50:22 -07:00
Remi Collet
a53b884c47 NEWS 2014-06-06 14:18:29 +02:00
Remi Collet
38e11dfaee Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fix bug #67390 insecure temporary file use in the configure script
 2014-06-06 14:18:17 +02:00
Remi Collet
811f35d0ed NEWS 2014-06-06 14:17:54 +02:00
Remi Collet
91bcadd85e Fix bug #67390 insecure temporary file use in the configure script 2014-06-06 14:16:04 +02:00
Remi Collet
e31b51f9a0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  drop exec perm on doc files
 2014-06-05 17:45:41 +02:00
Remi Collet
56c9e22c1f drop exec perm on doc files 2014-06-05 17:45:22 +02:00
Remi Collet
67f1a58ac9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test for 5.4/5.5
 2014-06-05 17:34:09 +02:00
Remi Collet
127651e9ae fix test for 5.4/5.5 2014-06-05 17:33:40 +02:00
Remi Collet
ab848ea400 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add test for previous fix
 2014-06-05 14:00:15 +02:00
Remi Collet
15d8c80ead add test for previous fix 2014-06-05 14:00:00 +02:00
Remi Collet
c61c24ad79 NEWS 2014-06-05 13:46:13 +02:00
Remi Collet
9ea9064779 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fix regression introduce in fix for bug #67118
 2014-06-05 13:45:57 +02:00
Remi Collet
3f47368738 NEWS 2014-06-05 13:45:25 +02:00
Remi Collet
1fe9f1e4f5 Fix regression introduce in fix for bug #67118 
The fix was correct but break some code (at least in Horde)
This is a temporary workaround to fix regressioni in 5.4, 5.5 and 5.6

This make php_date_initialize more consistent
- on success return 1 + time initiliazed
- on failure return 0 + time = zero
  which is check by DATE_CHECK_INITIALIZED by later method call

Will restore consistency with other date classes in master.
 2014-06-05 13:39:46 +02:00
Stanislav Malyshev
4b4a5bc1d3 update news 2014-06-04 01:10:45 -07:00
Stanislav Malyshev
846e076492 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
 2014-06-04 01:10:12 -07:00
Stanislav Malyshev
e06c4f7fe5 update NEWS 2014-06-04 01:09:37 -07:00
Nuno Lopes
bf50218983 fix gcov data with some locales (again) 2014-06-03 17:22:16 -04:00
Anatol Belski
e2710310a0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed regression introduced by patch for bug #67072
 2014-06-03 20:51:18 +02:00
Anatol Belski
20568e5028 Fixed regression introduced by patch for bug #67072 
This applies to 5.4 and 5.5 only as a legacy fix.
 2014-06-03 20:43:58 +02:00
Remi Collet
97b86c3c4a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  (re)add cve number in NEWS, from 5.4.29
 2014-06-03 11:28:21 +02:00
Remi Collet
0817a2c767 (re)add cve number in NEWS, from 5.4.29 2014-06-03 11:28:07 +02:00
Remi Collet
f5333418d7 NEWS 2014-06-03 11:09:18 +02:00
Remi Collet
2d59b87527 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fix bug #67326	fileinfo: cdf_read_short_sector insufficient boundary check
 2014-06-03 11:09:04 +02:00
Remi Collet
21986f98db NEWS 2014-06-03 11:08:46 +02:00
Remi Collet
4fcb9a9d1b Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check 
Upstream fix 6d209c1c48.patch
Only revelant part applied
 2014-06-03 11:05:00 +02:00
Xinchen Hui
0218e4eb19 Update NEWs 2014-06-01 19:42:01 +08:00
Xinchen Hui
9bb5867fad Merge branch 'PHP-5.4' into PHP-5.5 2014-06-01 19:41:35 +08:00
Xinchen Hui
38be99b739 Fixed bug #67359 (Segfault in recursiveDirectoryIterator) 2014-06-01 19:41:01 +08:00
Adam Harvey
43e3a83d51 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
 2014-05-29 17:53:28 +00:00
Adam Harvey
b5d9983ff4 Check for zero-length keys in spl_array_skip_protected and don't skip them. 
Fixes bug #67360 (Missing element after ArrayObject::getIterator).
 2014-05-29 17:49:32 +00:00
Julien Pauli
4ef561c7ba added CVEs in NEWS 2014-05-28 10:59:57 +02:00
Anatol Belski
546797f329 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated libmagic.patch for 5.4+

Conflicts:
	ext/fileinfo/libmagic.patch
 2014-05-27 22:38:02 +02:00
Anatol Belski
d2765e4b8c updated libmagic.patch for 5.4+ 2014-05-27 22:36:12 +02:00
Stanislav Malyshev
a2f8c9c1ae Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
  Fix bug #67249: printf out-of-bounds read
 2014-05-27 12:10:41 -07:00
Stanislav Malyshev
76b06780d5 update NEWS 2014-05-27 11:28:53 -07:00
Stanislav Malyshev
091b7642c2 Fix bug #67249: printf out-of-bounds read 2014-05-27 11:28:22 -07:00
Julien Pauli
3b8bdb7164 5.5.13 release date 2014-05-27 14:21:16 +02:00
Matteo Beccati
abfd977410 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Escape non-printable characters in the junit XML output
 2014-05-27 12:04:17 +02:00
Matteo Beccati
92d54f81d6 Escape non-printable characters in the junit XML output 
XML doesn't allow most of the characters < 0x20 and binary output
breaks XML parsers. Such characters are not allowed as entities
either, so the generated entities are escaped in order to be printed
as text.
 2014-05-27 12:03:38 +02:00