archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
130921 commits 526 branches 1434 tags 877 MiB
Commit graph

932 commits

Author SHA1 Message Date
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
Dmitry Stogov
9e70d7672d Move zend_object->guards into additional slot of zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced. 2015-02-04 15:24:13 +03:00
Anatol Belski
aa5e34d79e remove unused var 2015-01-30 10:28:57 +01:00
Derick Rethans
a3a529411e Merge branch 'PHP-5.6' 2015-01-20 21:44:36 +00: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
Nikita Popov
9c5eaac18b Remove mktime() and gmmktime() $is_dst parameter 2015-01-17 18:26:45 +01:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08: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
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Sara Golemon
365f428d46 Allow the third arg to DateTime(Immutable)::createFromFormat() to be null. 
Permit the same meaning as not passing the arg at all.
 2014-12-30 13:58:59 -08:00
Dmitry Stogov
6a992e4583 Improves strtotime() function. 2014-12-19 05:07:47 +03:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01: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
9924a08558 Merge branch 'pull-request/878' 
* pull-request/878:
  #68268: DatePeriod: Getter for start date, end date and interval
 2014-11-30 20:37:37 -08:00
Stanislav Malyshev
c64949626d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Adds test cases for openssl EC improvements
  Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
  Fixes memory leak introduced in 2b9af967

Conflicts:
	ext/openssl/openssl.c
 2014-11-30 18:32:56 -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
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
Anatol Belski
b0499545ee fix datatype mismatches 2014-10-30 20:06:51 +01:00
m.bennewitz
846a72a73a #68268: DatePeriod: Getter for start date, end date and interval 2014-10-20 08:27:56 +00:00
Florian MARGAINE
9680829389 DateTimeZone::getOffset() now accepts a DateTimeInterface 
Fixes #68062

Should be backported to PHP-5.6 and PHP-5.5.

Conflicts:
	ext/date/tests/bug67118.phpt
 2014-10-04 16:06:04 +01: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
Nikita Popov
e33f3d3b7c Move smart_str implementation into Zend/ 
So we can use it there as well...

For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
 2014-09-21 20:49:39 +02:00
Anatol Belski
b9677d313d avoid strlen usage in loop 2014-09-20 20:05:27 +02:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Dmitry Stogov
3bc8a958c5 Fixed useless or duplicated IS_INTERNED() checks 2014-09-19 15:41:01 +04:00
Dmitry Stogov
88d7ca44f6 Refactored INI subsystem to use zend_string* instead of char* 2014-09-01 20:57:33 +04:00
Anatol Belski
039f512289 fix signature 2014-08-27 22:01:43 +02:00
Anatol Belski
257ed4061a 's' works with size_t round 2 2014-08-27 20:49:33 +02:00
Anatol Belski
5882446b8b revert an accident 2014-08-27 20:49:32 +02:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Anatol Belski
202e8db1dc fixed several long vs zend_long casts 2014-08-26 11:26:53 +02:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski
4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
80a3b9ca40 bring back the logic to parse 64 bit props also in 32 bit build 2014-08-24 11:48:57 +02:00
Anatol Belski
70de6180d5 fixes to %pd format usage 2014-08-24 02:35:34 +02:00
Anatol Belski
e49e163a9e fixes to date 2014-08-18 18:57:55 +02:00
Anatol Belski
c586133d07 rename zval_get_long and fixes to some string functions 2014-08-18 08:39:39 +02:00
Anatol Belski
cb25136f4e fix macros in the 5 basic extensions 2014-08-16 11:37:14 +02:00
Dmitry Stogov
7497c8793d Merge branch 'master' into phpng 
* master: (51 commits)
  Update Git rules
  Back to -dev (with EOL notice in NEWS)
  new NEWS block for the next release
  It's 2014 already, fix copyright year where user visible
  PHP 5.3.29
  Some changes were lost in the merge commit of #66091
  Updated NEWS for #66091
  Fixed #66091
  Updated NEWS for #66091
  Updated NEWS for #66091
  Fixed #66091
  updated NEWS
  updated NEWS
  updated NEWS
  backported the fix for bug #41577
  NEWS entry for e6d93a1 / d73d44c
  restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
  Revert "Merge branch 'pull-request/694' into PHP-5.6"
  PHP 5.3.29RC1
  Fix missing type checks in various functions
  ...

Conflicts:
	ext/date/php_date.c
	ext/standard/math.c
 2014-08-14 23:30:49 +04:00
Xinchen Hui
c749fe2067 cleanup 2014-08-14 12:15:24 +08:00
Dmitry Stogov
a08b7b7701 cleanup 2014-08-13 19:43:34 +04:00
Tjerk Meesters
7fbc99e390 Some changes were lost in the merge commit of #66091 2014-08-13 20:57:10 +08:00
Tjerk Meesters
4b85f1d46a Fixed #66091 2014-08-13 20:24:43 +08:00