php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 15:38:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
78,109 Commits 549 Branches 1,485 Tags
2fac5e566994faa6cf5dfdb0d79d8f20717cb2ad
Commit Graph

33283 Commits

Author SHA1 Message Date
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 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 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 e6ab180394 Fixed bug #44780: some time zone offsets not recognized by timezone_name_from_abbr. 2014-01-25 16:14:51 +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 0c90c207a7 Backport refactoring from php-src 2014-01-24 11:39:24 +02: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
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
Yasuo Ohgaki 3cc6c6c587 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed previous commit may delete unwanted cookies.
  Re-fixed bug #66469
 2014-01-22 19:23:17 +09: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 26a2bed185 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Re-fixed bug #66469
 2014-01-22 13:47:55 +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
Anatol Belski 6e3fae4390 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed post deactivate signature in ext\libxml
 2014-01-21 17:14:56 +01:00
Anatol Belski c6f2581c39 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed post deactivate signature in ext\libxml
 2014-01-21 17:14:32 +01:00
Anatol Belski fb721cefe7 fixed post deactivate signature in ext\libxml 2014-01-21 17:08:59 +01:00
Johannes Schlüter 4d43e2efdb Merge branch 'PHP-5.5' into PHP-5.6 2014-01-21 16:38:32 +01:00
Johannes Schlüter 09eb3cf381 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-21 16:37:02 +01:00
Johannes Schlüter 2311ba7d3f Fix bug #66283 (Segmentation fault after memory_limit) 
There are situations where mysqlnd dupliates zvals while freeing result
sets. If the memory_limit is reached during this operation the engine
will bailout. This patch makes sure that a later attempt (during
RSHIUTDOWN) won't cause a double free, instead we rely on the engine to
free emalloc()ed memory after bailout.
 2014-01-21 16:28:30 +01:00
Xinchen Hui dc5f36ffe1 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-20 21:25:26 +08:00