Stanislav Malyshev
2fac5e5669
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
drop precision since trigonometric functions are non-portable
2014-01-26 15:15:50 -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
de62be2682
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
XFAIL multibyte tests until they are fixed (bug 66582)
2014-01-26 15:12:19 -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
c2bb54a246
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2014-01-26 14:31:32 -08:00
Stanislav Malyshev
3f19697c0c
fix test
2014-01-26 14:31:20 -08:00
Stanislav Malyshev
e52c332b38
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2014-01-26 14:26:01 -08:00
Stanislav Malyshev
54c1e28a39
fix test
2014-01-26 14:25:49 -08:00
Stanislav Malyshev
d78c40d25d
fix test - new flag ZEND_ACC_HAS_TYPE_HINTS
2014-01-26 12:17:09 -08:00
Derick Rethans
2e65908643
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-26 14:02:44 +01: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
6d6850b3b8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test bug62479.phpt
2014-01-25 23:27:21 -08: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
ea0769f00e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Implement ldap_modify_batch.
2014-01-25 22:04: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
0f79cc6eae
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-25 16:16:34 +01: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
fba2756631
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
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:12:33 +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
Andrey Hristov
350b5dddac
WS
2014-01-24 12:31:19 +02:00
Andrey Hristov
cd2cc7b8f9
Reduce code duplication a bit
2014-01-24 11:52:35 +02:00
Andrey Hristov
c1b2f1aa13
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-01-24 11:39:42 +02:00
Andrey Hristov
0c90c207a7
Backport refactoring from php-src
2014-01-24 11:39:24 +02:00
Xinchen Hui
aba775fd34
Fixed warning "No new line at end of file"
2014-01-24 10:50:41 +08:00
Will Fitch
a9b40a20fc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update gitignore and Makefile for additional entries
2014-01-23 21:35:24 -05: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
698b04270e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
refixed that test for 5.5+
5.5.10 next
2014-01-22 23:30:52 +01: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
f8e9f84a97
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed test
2014-01-22 15:40:58 +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
ca27c86110
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix zts
2014-01-22 12:05:06 +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
4247f624cb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed missing usleep() prototype in pgsql
2014-01-22 11:53:56 +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