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
81,984 Commits 549 Branches 1,485 Tags
5fc635548e30fe16b0f112e26db3a4a2dc69522c
Commit Graph

1287 Commits

Author SHA1 Message Date
Derick Rethans d887ef5a04 - Updated to version 2015.3 (2015c) 2015-04-14 10:51:12 +01:00
Stanislav Malyshev 2d9399af35 Revert "Merge branch 'PHP-5.5' into PHP-5.6" 
This reverts commit aa22e80b1a, reversing
changes made to 3e7f47cb03.

Conflicts:
	ext/date/php_date.c
 2015-04-01 12:49:25 -07:00
Derick Rethans 2d3868984c Merge branch 'PHP-5.5' into PHP-5.6 2015-03-31 16:35:10 +01:00
Derick Rethans ffbd380e44 Fixed bug #69336 (Issues with "last day of <monthname>"). 2015-03-31 16:35:03 +01:00
Derick Rethans 346c8f7331 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-31 11:09:23 +01:00
Derick Rethans 2c117a40a7 Export date_get_immutable_ce() so that extensions can make use of it too. 2015-03-31 11:08:56 +01:00
Stanislav Malyshev 57f835e148 oops, forgot TSRMLS_CC 2015-03-22 21:55:34 -07:00
Stanislav Malyshev aa22e80b1a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`
 2015-03-22 21:03:46 -07:00
Trevor Suarez c2e22556ba Adding a new createFromImmutable method to the DateTime class to mirror the current DateTime::createFromMutable() 2015-03-22 20:54:25 -07:00
Derick Rethans a73d0b0fb3 - Updated to version 2015.2 (2015b) 2015-03-21 14:51:11 +01:00
Derick Rethans b98a486606 - Updated to version 2015.2 (2015b) 2015-03-21 14:51:09 +01:00
Reeze Xia 1b240ff9e3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #69141 Missing arguments in reflection info for some builtin functions
 2015-02-28 16:40:06 +08:00
Reeze Xia f824f91ac9 Fixed bug #69141 Missing arguments in reflection info for some builtin functions 
This include:

- setcookie (missing "httponly")
- setrawcookie (missing "httponly")
- spl_autoload_register (missing 2 optional params)
- mktime  (missing "is_dst")
- gmmktime (missing "is_dst")
 2015-02-28 16:37:14 +08:00
Xinchen Hui 2d1a3ecd27 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-27 11:11:45 +08:00
Taoguang Chen e441d71baa fix bug#68942's patch 
Fix type confusion bug in unserialize() with DateTimeZone. https://bugs.php.net/bug.php?id=68942
 2015-02-27 10:41:53 +08:00
Stanislav Malyshev 0a331f49c1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix TS build
 2015-02-17 07:47:27 +01:00
Stanislav Malyshev 213725057e fix TS build 2015-02-17 07:47:12 +01:00
Stanislav Malyshev 78389b29f9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  Port for for bug #68552
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  - BFN
 2015-02-17 06:57:50 +01:00
Stanislav Malyshev 29a4e710de Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 2015-02-17 06:53:27 +01:00
Julien Pauli 583af4979b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
 2015-02-04 17:39:34 +01:00
Julien Pauli f51b73c833 Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)" 
This reverts commit 8e19705a93.
 2015-02-04 17:39:16 +01:00
Derick Rethans 263fb375bd - Updated to version 2015.1 (2015a) 2015-02-01 18:31:21 +00:00
Derick Rethans 4d28d12f86 - Updated to version 2015.1 (2015a) 2015-02-01 18:31:19 +00:00
Anatol Belski 24157f396c fix timelib build configuration 2015-01-21 16:22:23 +01:00
Anatol Belski bd52f4a833 make timelib_config.h inclusion configurable 2015-01-21 13:48:38 +01:00
Anatol Belski 9c88a214a4 backported the timelib cleanups to 5.6 2015-01-21 11:03:16 +01:00
Derick Rethans 1d09926e33 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-20 21:44:25 +00:00
Derick Rethans 8e19705a93 Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat) 2015-01-20 21:44:19 +00:00
Derick Rethans 6f2f2ce5cf Merge branch 'PHP-5.5' into PHP-5.6 2015-01-19 22:59:31 +00:00
Derick Rethans b0159431e3 Fixed bug #45081 (strtotime incorrectly interprets SGT time zone). 2015-01-19 22:59:24 +00:00
Xinchen Hui 0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui 73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Derick Rethans 9d4f4483cb Merge branch 'PHP-5.5' into PHP-5.6 2014-12-08 11:06:50 +00:00
Derick Rethans 5f9a68d3ef Fixed day_of_week function as it could sometimes return negative values internally. 2014-12-08 11:06:12 +00:00
Stanislav Malyshev 85bada10c1 fix ZTS 2014-11-30 21:50:29 -08:00
m.bennewitz 4675b79e65 Conflicts: 
ext/date/php_date.c
 2014-11-30 20:49:18 -08:00
Stanislav Malyshev de65eaa8c8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixes memory leak introduced in 2b9af967
 2014-11-30 18:26:39 -08:00
Stanislav Malyshev 17094017f7 Merge branch 'pull-request/914' into PHP-5.5 
* pull-request/914:
  Fixes memory leak introduced in 2b9af967
 2014-11-30 18:26:17 -08:00
Stanislav Malyshev a8dfb33db8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add my information to this test
  Add a test for the exception cases of readline_read_history
  added some tests to datetime and dateinterval functions
  added various tests for XSLTProcessor and one test for iconv extension
  teste basico da funcao timezone_version_get
 2014-11-23 17:26:28 -08:00
Stanislav Malyshev 1330491994 Merge branch 'pull-request/854' into PHP-5.5 
* pull-request/854:
  teste basico da funcao timezone_version_get
 2014-11-23 17:23:34 -08:00
Stanislav Malyshev 9d7206dcea Merge branch 'pull-request/855' into PHP-5.5 
* pull-request/855:
  added some tests to datetime and dateinterval functions
  added various tests for XSLTProcessor and one test for iconv extension
 2014-11-23 17:22:54 -08:00
Veres Lajos 4dc994571d typo fixes - https://github.com/vlajos/misspell_fixer 
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
 2014-11-23 14:33:43 -08:00
Florian MARGAINE 489bfb0af9 Fixes memory leak introduced in 2b9af967 
Fixes https://bugs.php.net/bug.php?id=68285
 2014-11-23 01:42:26 +01:00
Derick Rethans a19d96fc58 Merge branch 'PHP-5.5' into PHP-5.6 2014-11-11 14:01:26 -03:00
Derick Rethans 695a102ede - Updated to version 2014.10 (2014j) 2014-11-11 14:01:24 -03:00
Derick Rethans 25e3560546 Merge branch 'PHP-5.5' into PHP-5.6 2014-10-26 10:54:09 -04:00
Derick Rethans 22b9f16e9a - Updated to version 2014.9 (2014i) 2014-10-26 10:54:07 -04:00
Derick Rethans 0e5f475f5e Merge branch 'PHP-5.5' into PHP-5.6 2014-10-04 15:59:17 +01:00
Derick Rethans 0874ef624c Merge branch 'PHP-5.4' into PHP-5.5 2014-10-04 15:58:40 +01:00
Florian MARGAINE 046c345de5 DateTimeZone::getOffset() now accepts a DateTimeInterface 
Fixes #68062
 2014-10-04 15:58:24 +01:00