mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-15 12:54:57 +08:00
Code Issues Packages Projects Releases Wiki Activity
80,370 Commits 503 Branches 1,384 Tags 820 MiB
92f108801e
Commit Graph

80370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Lowrey
546a32e2b3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #67850: Build when OpenSSL compiled without SSLv3 support

Conflicts:
	ext/openssl/xp_ssl.c
 2014-08-25 18:16:38 +02:00
Daniel Lowrey
640214701c Bug #67850: Build when OpenSSL compiled without SSLv3 support 2014-08-25 17:28:09 +02:00
Lior Kaplan
6e87b01e95 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
 2014-08-25 00:30:40 +03:00
Lior Kaplan
c8b3bce407 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
 2014-08-25 00:30:01 +03:00
Lior Kaplan
bda1cc6946 Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk> 2014-08-25 00:29:05 +03:00
Ferenc Kovacs
86966a092b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  this test depends on the simplexml ext, not just on xml
 2014-08-24 00:09:31 +02:00
Ferenc Kovacs
a90d05a430 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  this test depends on the simplexml ext, not just on xml
 2014-08-24 00:09:00 +02:00
Ferenc Kovacs
cb41a7bad1 this test depends on the simplexml ext, not just on xml 2014-08-24 00:08:09 +02:00
Keyur Govande
437612f656 Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036) 2014-08-23 14:17:37 +00:00
Tjerk Meesters
ce9bdae33f Fixed #67694: Regression in session_regenerate_id() 2014-08-23 09:18:02 +08:00
Michael Wallner
3b82c4e520 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix bug #67865
  updated NEWS to fit last release
  NEWS
  Fix bug #67878 program_prefix not honoured in man pages
 2014-08-21 22:45:33 +02:00
Michael Wallner
c4fb183b9f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #67865
 2014-08-21 22:43:25 +02:00
Michael Wallner
54fbbded37 fix bug #67865 2014-08-21 22:41:36 +02:00
Julien Pauli
dbbf1c2a3c updated NEWS to fit last release 2014-08-21 11:34:38 +02:00
Remi Collet
76c2a9f4f4 NEWS 2014-08-21 09:14:39 +02:00
Remi Collet
e02616866f Fix bug #67878 program_prefix not honoured in man pages 
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
 2014-08-21 09:14:38 +02:00
Remi Collet
43ed561222 NEWS 2014-08-21 09:14:16 +02:00
Remi Collet
e9166fec62 Fix bug #67878 program_prefix not honoured in man pages 
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
 2014-08-21 09:14:16 +02:00
Anatol Belski
d3ca974ff5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  avoid clash when stdint.h was included after win32/php_stdint.h
 2014-08-21 09:09:29 +02:00
Anatol Belski
713e9a7eaa avoid clash when stdint.h was included after win32/php_stdint.h 2014-08-21 09:08:44 +02:00
Stanislav Malyshev
89d3a356d1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2014-08-20 14:44:33 -07:00
Stanislav Malyshev
6da2a977fc fix test 2014-08-20 14:44:25 -07:00
Stanislav Malyshev
2dfabd8b51 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2014-08-20 14:43:22 -07:00
Stanislav Malyshev
6424bf659d fix test 2014-08-20 14:42:48 -07:00
Remi Collet
42e1df9b01 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
 2014-08-20 15:17:20 +02:00
Remi Collet
825ddbb3c6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
 2014-08-20 15:17:05 +02:00
Remi Collet
9185cfd539 NEWS 2014-08-20 15:16:53 +02:00
Remi Collet
f4120e53c8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed variable corruption under win x64
 2014-08-20 15:10:54 +02:00
Remi Collet
6d19358ae0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed variable corruption under win x64
 2014-08-20 15:10:02 +02:00
Anatol Belski
20941b71aa fixed variable corruption under win x64 2014-08-20 15:08:52 +02:00
Lior Kaplan
96f812e411 Add NEWS entry for bug #67730 2014-08-20 01:34:57 +03:00
Lior Kaplan
ac0c864c63 Add CVE ID for bug #67539 2014-08-20 01:18:15 +03:00
Lior Kaplan
6aa7466492 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add NEWS entry for bug #67492
  Add NEWS entry for bug #67730
  Add NEWS entry for bug #67730
  Add CVE ID for bug #67539
 2014-08-20 01:16:04 +03:00
Lior Kaplan
d382d6f3dc Add NEWS entry for bug #67492 
Included in 5.5.14 with commit d9c5a1d
 2014-08-20 01:10:38 +03:00
Lior Kaplan
9360b6eeee Add NEWS entry for bug #67730 2014-08-20 01:05:22 +03:00
Lior Kaplan
aa6dc6c108 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add NEWS entry for bug #67730
  Add CVE ID for bug #67539
 2014-08-20 01:01:23 +03:00
Lior Kaplan
276bead9c4 Add NEWS entry for bug #67730 
Included in 5.4.32 with commit 706aefb
 2014-08-20 00:54:19 +03:00
Lior Kaplan
359bc0ee2f Add CVE ID for bug #67539 2014-08-20 00:51:37 +03:00
Sara Golemon
a309dda777 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Switch use of strtok() to gd_strtok_r()
 2014-08-19 13:22:14 -07:00
Sara Golemon
ac4569621d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Switch use of strtok() to gd_strtok_r()

Conflicts:
	NEWS
 2014-08-19 13:17:56 -07:00
Sara Golemon
cbe1597b74 Switch use of strtok() to gd_strtok_r() 
strtok() is not thread safe, so this will potentially break in
very bad ways if used in ZTS mode.

I'm not sure why gd_strtok_r() exists since it seems to do the
same thing as strtok_r(), but I'll assume it's a portability
decision and do as the Romans do.
 2014-08-19 13:16:44 -07:00
Stanislav Malyshev
fae17a00f5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1
 2014-08-19 01:34:25 -07:00
Stanislav Malyshev
b278be894f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1
 2014-08-19 01:34:09 -07:00
Stanislav Malyshev
5a7039035c 5.4.32 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (Darwin)
 
 iF4EABEIAAYFAlPzCaMACgkQL3lWvF2gS10pnwD9GYeG82QTI20oVqzQ4dVF+yks
 xC5ph0RvUVXbJy8ADn4A/2Of7Q520LQYkxZHN0JDTb3EBaTvhG5sF6Yo1gTpJPKS
 =NoE4
 -----END PGP SIGNATURE-----

Merge tag 'PHP-5.4.32' into PHP-5.4

5.4.32

* tag 'PHP-5.4.32':
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1

Conflicts:
	configure.in
	main/php_version.h
 2014-08-19 01:33:45 -07:00
Stanislav Malyshev
eb2360602e 5.4.32 2014-08-19 00:40:27 -07:00
Remi Collet
cdd987b16c NEWS 2014-08-19 08:41:42 +02:00
Remi Collet
230804b08d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
 2014-08-19 08:41:14 +02:00
Remi Collet
335d89ec4d NEWS 2014-08-19 08:40:58 +02:00
Remi Collet
5e9e0a2c74 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
 2014-08-19 08:40:30 +02:00
Remi Collet
88c48a4b95 NEWS 2014-08-19 08:40:18 +02:00