mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 11:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
88,192 Commits 500 Branches 1,381 Tags 811 MiB
84fad268d0
Commit Graph

88192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wallner
84fad268d0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix test
 2015-02-18 14:05:10 +01:00
Michael Wallner
23e4af185a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2015-02-18 14:05:02 +01:00
Michael Wallner
8b6919c77c fix test 2015-02-18 14:04:53 +01:00
Michael Wallner
b36581aa75 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)
 2015-02-18 14:04:19 +01:00
Michael Wallner
0d2a2b98c9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)
 2015-02-18 13:59:32 +01:00
Michael Wallner
225af964c0 Fixed bug #65593 (Segfault when calling ob_start from output buffering callback) 2015-02-18 13:58:31 +01:00
Julien Pauli
86ba107360 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS
 2015-02-18 12:42:02 +01:00
Julien Pauli
f977a9f2be Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
 2015-02-18 12:41:47 +01:00
Julien Pauli
73c2e9153a Updated NEWS 2015-02-18 12:40:38 +01:00
Stanislav Malyshev
3551083c2c Merge branch 'pull-request/1007' 
* pull-request/1007:
  Fix associativity to match Perl
  Blast off to space.
 2015-02-18 08:48:17 +01:00
Jakub Zelenka
3ddc246b5a Set PHP_JSON_VERSION to 1.4.0 2015-02-17 20:52:06 +00:00
Jakub Zelenka
0676f39ee4 Remove unnecessary resource checks in openssl ext 
The resource val is already checking Z_TYPE_P(val) == IS_RESOURCE.
There is no need to call extended resource fetch functions though.
 2015-02-17 20:46:36 +00:00
Jakub Zelenka
c3bd8cd8a9 JSON is now maintained 2015-02-17 20:44:40 +00:00
Anatol Belski
d428bf2d4e improve debugability in TS debug builds 
gdb seems to be not always able to fetch the correct context for
thread locals. Thus, the "if (TSRMLS_CACHE)" clause causes gdb to
show crashes which aren't recognized neither with helgrind nor
in release builds. This is reproducable by setting breakpoints on
the exact line where PHP has a tsrm_get_ls_cache() call.
 2015-02-17 19:15:22 +01:00
Nikita Popov
31287f0317 More UPGRADING, in particular on foreach 
Only doing a shallow description of foreach changes, describing
them completely is too complicated.
 2015-02-17 16:02:33 +01:00
Xinchen Hui
7299d43536 Fixed bug #69038 (switch(SOMECONSTANT) misbehaves) for master 2015-02-17 22:05:57 +08:00
Xinchen Hui
034e753c01 Merge branch 'PHP-5.6' 2015-02-17 21:18:46 +08:00
Xinchen Hui
97f8c78b09 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 2015-02-17 21:17:06 +08:00
Xinchen Hui
ed1967c706 Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 2015-02-17 21:16:53 +08:00
Xinchen Hui
e22759b1e5 Replace var is introduced 2015-02-17 21:16:37 +08:00
Anatol Belski
8742276eb3 abstain from using xmlCleanupParser 
Depending on circumstances, usage of xmlCleanupParser can affect
the thread local storage, or even cause crashes in single threaded
programs. On shutdown the memory will be freed anyway, however
not using xmlCleanupParser helps to avoid possible shutdown
crashes.
 2015-02-17 10:37:52 +01:00
Stanislav Malyshev
4ff333f610 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix TS build

Conflicts:
	ext/date/php_date.c
 2015-02-17 07:47:57 +01: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
70e51db210 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update news
  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

Conflicts:
	ext/date/php_date.c
 2015-02-17 07:10:30 +01:00
Stanislav Malyshev
625ab10f99 Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 2015-02-17 07:02:20 +01:00
Stanislav Malyshev
c538a2eb12 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update news
 2015-02-17 06:58:24 +01:00
Stanislav Malyshev
2e8cd42974 update news 2015-02-17 06:58:14 +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
cf7d8eabcc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Port for for bug #68552
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  - BFN
 2015-02-17 06:53:48 +01:00
Stanislav Malyshev
29a4e710de Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 2015-02-17 06:53:27 +01:00
Stanislav Malyshev
bdfe457a2c Port for for bug #68552 2015-02-17 06:53:02 +01:00
Stanislav Malyshev
7b18981830 Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 
Conflicts:
	ext/date/php_date.c
 2015-02-17 06:43:51 +01:00
Xinchen Hui
dec83ea4ac Update NEWS 2015-02-17 11:36:44 +08:00
Xinchen Hui
1c0fa36c61 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-17 11:36:15 +08:00
Xinchen Hui
66d3095993 Fixed bug #69038 (switch(SOMECONSTANT) misbehaves) 2015-02-17 11:34:57 +08:00
Felipe Pena
82d347a477 - BFN 2015-02-17 01:14:05 -02:00
Felipe Pena
85aab94d81 - Fix merge 2015-02-17 01:11:48 -02:00
Felipe Pena
f6e9ed76ae Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
 2015-02-17 01:08:48 -02:00
Felipe Pena
94742054a8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  Update NEWS
 2015-02-17 01:08:07 -02:00
Rasmus Lerdorf
a96de76753 Don't read the local php.ini when Generating Phar 
When building phar shared, you can end up loading
a previous phar.so that isn't compatible with the
php cli being used to generate Phar here.
 2015-02-16 18:28:32 -08:00
Felipe Pena
0c01fca444 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  Update NEWS
 2015-02-17 00:28:28 -02:00
Felipe Pena
a331ae4630 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  Update NEWS
 2015-02-17 00:28:11 -02:00
Felipe Pena
8f9ab04d93 - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support) 2015-02-17 00:23:47 -02:00
Jakub Zelenka
011eab1047 Delete json outdated package.xml 
The package.xml has not been update for more then 8 years and
there is no reason to keep it. It would require quite
a bit of digging in git history to update it which is
not worth it.
 2015-02-16 20:07:01 +00:00
Anatol Belski
af3ca74501 made ZEND_TSRMLS_CACHE_* macros look like function calls 
which also comply with the current semantics for such macros
 2015-02-16 17:19:32 +01:00
Felipe Pena
abbc82f448 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fix merge
  BFN
 2015-02-16 13:09:52 -02:00
Felipe Pena
35a68c276d - Fix merge 2015-02-16 13:09:40 -02:00
Felipe Pena
e08bef442c - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de 2015-02-16 13:07:26 -02:00
Felipe Pena
812c0c0337 - Fix merge 2015-02-16 12:48:05 -02:00