mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-13 03:44:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
75,225 Commits 503 Branches 1,384 Tags 807 MiB
a87125c1e8
Commit Graph

75225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrey Hristov
a87125c1e8 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-28 15:24:45 +02:00
Andrey Hristov
eafe070f86 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2014-01-28 15:23:54 +02:00
Andrey Hristov
d3faae03ec add new consts 2014-01-28 15:23:41 +02:00
Bob Weinand
e8bf18bd9f Merge branch 'PHP-5.4' into PHP-5.5 2014-01-28 13:33:44 +01:00
Bob Weinand
e9b4bca5a0 Fixed arginfo of PDO::__construct() to match the docs and zend_parse_parameters definition. 2014-01-28 13:31:52 +01:00
Yasuo Ohgaki
de99fd7301 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Remove obsolete description
 2014-01-27 18:55:50 +09:00
Yasuo Ohgaki
4dee63ca1c Remove obsolete description 2014-01-27 18:41:31 +09:00
Stanislav Malyshev
fed80ee605 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix English and improve by Stas. Thanks :)
  Update source docs
  Revert "Update source docs"
  Update source docs
 2014-01-26 17:20:21 -08:00
Yasuo Ohgaki
d65ddb633d Fix English and improve by Stas. Thanks :) 2014-01-26 17:20:13 -08:00
Yasuo Ohgaki
f496aac1f6 Update source docs 2014-01-26 17:20:12 -08:00
Yasuo Ohgaki
76c098395d Revert "Update source docs" 
This reverts commit 10d06cd4ff.
 2014-01-26 17:20:12 -08:00
Yasuo Ohgaki
60bcf84dda Update source docs 2014-01-26 17:20:12 -08:00
Stanislav Malyshev
498d94d137 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  drop precision since trigonometric functions are non-portable
  XFAIL multibyte tests until they are fixed (bug 66582)
 2014-01-26 15:51:27 -08:00
Stanislav Malyshev
d5560faaa3 drop precision since trigonometric functions are non-portable 
See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility
 2014-01-26 15:51:17 -08:00
Stanislav Malyshev
f49965b487 XFAIL multibyte tests until they are fixed (bug 66582) 2014-01-26 15:51:17 -08:00
Stanislav Malyshev
1dcaa109a1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  drop precision since trigonometric functions are non-portable
 2014-01-26 15:15:38 -08:00
Stanislav Malyshev
35cb180d9e drop precision since trigonometric functions are non-portable 
See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility
 2014-01-26 15:14:16 -08:00
Stanislav Malyshev
dfe6628440 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  XFAIL multibyte tests until they are fixed (bug 66582)
 2014-01-26 15:12:00 -08:00
Stanislav Malyshev
cd0bf6fc3a XFAIL multibyte tests until they are fixed (bug 66582) 2014-01-26 15:11:15 -08:00
Stanislav Malyshev
3f19697c0c fix test 2014-01-26 14:31:20 -08:00
Derick Rethans
7399386a20 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-26 14:02:37 +01:00
Derick Rethans
251b914afa Merge branch '45543-timezone-set' into PHP-5.4 2014-01-26 14:02:19 +01:00
Derick Rethans
22dba2f5f3 Fixed bug #45543: DateTime::setTimezone can not set timezones without ID. 2014-01-26 14:01:58 +01:00
Stanislav Malyshev
ce1e1bb5d8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test bug62479.phpt
 2014-01-25 23:26:29 -08:00
Stanislav Malyshev
4e308abf28 fix test bug62479.phpt 2014-01-25 23:25:39 -08:00
Stanislav Malyshev
6fca805b3b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Implement ldap_modify_batch.

Conflicts:
	ext/ldap/ldap.c
 2014-01-25 22:04:28 -08:00
Stanislav Malyshev
0742de587a Merge branch 'pull-request/571' into PHP-5.4 
* pull-request/571:
  Implement ldap_modify_batch.
 2014-01-25 21:59:57 -08:00
Derick Rethans
93ede745bc Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/date/lib/parse_date.c
 2014-01-25 16:16:23 +01:00
Derick Rethans
fb16bff2ba Merge branch '44780-fallback' into PHP-5.4 2014-01-25 16:15:50 +01:00
Derick Rethans
e6ab180394 Fixed bug #44780: some time zone offsets not recognized by timezone_name_from_abbr. 2014-01-25 16:14:51 +01:00
Ferenc Kovacs
0ed477b408 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix the primary qa email address and update the list of available people being able to add moderators to our lists
  Revert "Fix #62479: Some chars not parsed in passwords"
  Fix #62479: Some chars not parsed in passwords
 2014-01-24 16:11:56 +01:00
Ferenc Kovacs
69af357182 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix the primary qa email address and update the list of available people being able to add moderators to our lists
  Revert "Fix #62479: Some chars not parsed in passwords"
  Fix #62479: Some chars not parsed in passwords
 2014-01-24 16:07:29 +01:00
Ferenc Kovacs
4b48b29988 fix the primary qa email address and update the list of available people being able to add moderators to our lists 2014-01-24 16:06:58 +01:00
Will Fitch
c0acb9d5f6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update gitignore and Makefile for additional entries
 2014-01-23 21:34:57 -05:00
Will Fitch
c4c10a222e Update gitignore and Makefile for additional entries 2014-01-23 21:28:45 -05:00
Anatol Belski
c0fcd3d6b0 refixed that test for 5.5+ 2014-01-22 23:30:14 +01:00
Ondřej Hošek
c0e3429904 Implement ldap_modify_batch. 2014-01-22 18:54:11 +01:00
Julien Pauli
706d67787a 5.5.10 next 2014-01-22 18:28:09 +01:00
Anatol Belski
0436b85d9f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed test
 2014-01-22 15:40:19 +01:00
Anatol Belski
0eff7176de fixed test 2014-01-22 15:39:49 +01:00
Anatol Belski
6d1d8ec330 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix zts
 2014-01-22 12:04:25 +01:00
Anatol Belski
34792280bc fix zts 2014-01-22 12:03:54 +01:00
Anatol Belski
e67ef24227 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed missing usleep() prototype in pgsql
 2014-01-22 11:53:32 +01:00
Anatol Belski
7bcf01f39a fixed missing usleep() prototype in pgsql 2014-01-22 11:52:52 +01:00
Yasuo Ohgaki
fa224b1c58 Fixed previous commit may delete unwanted cookies. 2014-01-22 19:23:01 +09:00
Yasuo Ohgaki
58f94345a7 Fixed previous commit may delete unwanted cookies. Sync tests from upper branches. 2014-01-22 19:21:25 +09:00
Yasuo Ohgaki
383423a1ee Re-fixed bug #66469 2014-01-22 13:46:59 +09:00
Yasuo Ohgaki
a27e51fd4e Re-fixed bug #66469 2014-01-22 13:40:58 +09:00
Stanislav Malyshev
eb6d1fcd3c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix CVE ref for bug #66060
  5.4.26 next
  fix news

Conflicts:
	configure.in
	main/php_version.h
 2014-01-21 13:28:03 -08:00
Stanislav Malyshev
093ff4b624 fix CVE ref for bug #66060 2014-01-21 13:27:18 -08:00