clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 07:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
87,468 Commits 494 Branches 1,367 Tags 803 MiB
4e3e95dfc0
Commit Graph

87468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
4e3e95dfc0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fixed bug #68827 Double free with disabled ZMM
 2015-01-22 10:02:05 +01:00
Anatol Belski
a97ca0a452 updated NEWS 2015-01-22 10:01:16 +01:00
Anatol Belski
d0e75bdc59 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68827 Double free with disabled ZMM
  Fixed segfault while running with moodle
 2015-01-22 10:00:10 +01:00
Joshua Rogers
91aa340180 Fixed bug #68827 Double free with disabled ZMM 2015-01-22 09:59:13 +01:00
Xinchen Hui
201f660ae1 Merge branch 'PHP-5.6' 2015-01-22 16:39:22 +08:00
Xinchen Hui
d0928b7f97 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-22 16:39:03 +08:00
Xinchen Hui
251745c012 Fixed segfault while running with moodle 2015-01-22 16:38:34 +08:00
Popa Adrian Marius
56c5b8e399 Revert "Remove Jouni Ahto from maintainers and files as requested , anyway we have git blame/history" 
This reverts commit 7cf1450df1.
 2015-01-22 10:16:51 +02:00
Bob Weinand
4e0ae4dbbc Forgot to add test... 2015-01-21 23:54:03 +01:00
Bob Weinand
bd629428a6 Removed efree() on arena_alloc()ed memory 2015-01-21 23:52:48 +01:00
Rasmus Lerdorf
e242f871df Slightly modify and merge PR#105 from @MegaManSec 2015-01-21 11:40:27 -08:00
Rasmus Lerdorf
295926855b Slightly modify and merge PR#105 from @MegaManSec 2015-01-21 11:39:23 -08:00
Popa Adrian Marius
7cf1450df1 Remove Jouni Ahto from maintainers and files as requested , anyway we have git blame/history 2015-01-21 18:08:56 +02:00
Anatol Belski
1463115e7e Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix timelib build configuration

Conflicts:
	ext/date/config.w32
	ext/date/config0.m4
	win32/build/config.w32
	win32/build/config.w32.phpize.in
 2015-01-21 16:26:36 +01:00
Anatol Belski
24157f396c fix timelib build configuration 2015-01-21 16:22:23 +01:00
Anatol Belski
35bfa022f9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  make timelib_config.h inclusion configurable

Conflicts:
	win32/build/config.w32
	win32/build/config.w32.phpize.in
 2015-01-21 13:55:07 +01:00
Anatol Belski
bd52f4a833 make timelib_config.h inclusion configurable 2015-01-21 13:48:38 +01:00
Julien Pauli
71aa0d3566 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS
 2015-01-21 11:14:33 +01:00
Julien Pauli
bb2380edb7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
 2015-01-21 11:13:55 +01:00
Julien Pauli
88f2321a25 Updated NEWS 2015-01-21 11:10:20 +01:00
Anatol Belski
d54c07d6e4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  backported the timelib cleanups to 5.6
 2015-01-21 11:04:02 +01:00
Anatol Belski
9c88a214a4 backported the timelib cleanups to 5.6 2015-01-21 11:03:16 +01:00
Anatol Belski
8faadc22d1 make timelib use PHP's defines when it's inside PHP only 
otherwise system defines will be used
 2015-01-21 10:49:28 +01:00
Anatol Belski
2f8d40ca79 decouple timelib from php_stdint.h 2015-01-21 09:42:54 +01:00
Rasmus Lerdorf
41013ba597 Fix the most obvious issues here. 
There are other problems though
 2015-01-20 23:56:51 -08:00
Rasmus Lerdorf
f9664ce853 PHP7 API updates 2015-01-20 23:40:33 -08:00
Rasmus Lerdorf
a25054b907 int -> size_t and long -> zend_long 2015-01-20 23:11:22 -08:00
Rasmus Lerdorf
03ba4ba37e int -> size_t 
and fix the variable name
 2015-01-20 23:00:40 -08:00
Rasmus Lerdorf
030b4b29db int -> size_t 2015-01-20 22:58:31 -08:00
Rasmus Lerdorf
c5e56f7868 int -> size_t 2015-01-20 22:53:11 -08:00
Rasmus Lerdorf
bcaa06de3a int -> size_t 2015-01-20 22:51:09 -08:00
Rasmus Lerdorf
ec1278ccb2 int -> size_t 2015-01-20 22:50:17 -08:00
Rasmus Lerdorf
57f456a39b int -> size_t 2015-01-20 22:45:07 -08:00
Rasmus Lerdorf
c2465211af Missed removing a couple of _len vars 2015-01-20 22:41:18 -08:00
Xinchen Hui
fa06343d7e Fixed valgrind reported issue with setlocale 2015-01-21 12:03:19 +08:00
Xinchen Hui
88e88426df Merge branch 'PHP-5.6' 2015-01-21 11:18:27 +08:00
Xinchen Hui
57ff5a4e6f Merge branch 'PHP-5.5' into PHP-5.6 2015-01-21 11:18:08 +08:00
Xinchen Hui
20e5911d82 Fixed test fails 2015-01-21 11:17:49 +08:00
Ferenc Kovacs
135d739278 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix NEWS
 2015-01-21 01:20:10 +01:00
Ferenc Kovacs
ea44ccbd62 fix NEWS 2015-01-21 01:19:31 +01:00
Rasmus Lerdorf
dc61ac998d Finishing porting ext/imap to PHP7 
All tests pass now
 2015-01-20 15:43:08 -08: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
Stanislav Malyshev
73a5958e67 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix year
 2015-01-20 13:27:51 -08:00
Stanislav Malyshev
cca3c8a985 fix year 2015-01-20 13:27:38 -08:00
Stanislav Malyshev
b2a254fe2d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  format
  add CVE
 2015-01-20 11:59:35 -08:00
Stanislav Malyshev
53b3db43ca Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  format
 2015-01-20 11:57:50 -08:00
Stanislav Malyshev
04dcc705de update NEWS 2015-01-20 11:57:39 -08:00
Stanislav Malyshev
b3b155ffe2 format 2015-01-20 11:57:17 -08:00