Xinchen Hui
7299d43536
Fixed bug #69038 (switch(SOMECONSTANT) misbehaves) for master
2015-02-17 22:05:57 +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
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
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
Felipe Pena
85aab94d81
- Fix merge
2015-02-17 01:11: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
a80ad10d9b
- Fix merge
2015-02-16 12:21:20 -02:00
Felipe Pena
02de601ff8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
BFN
Update NEWS
2015-02-16 12:08:39 -02:00
Felipe Pena
76a505f09b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
Update NEWS
2015-02-16 12:08:26 -02:00
Felipe Pena
40c60b8212
- Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
2015-02-16 12:08:07 -02:00
Xinchen Hui
9973df7b4f
Merge branch 'master' of https://git.php.net/repository/php-src
2015-02-16 14:22:56 +08:00
Xinchen Hui
10fe317300
Merge branch 'PHP-5.6'
...
Conflicts:
ext/openssl/openssl.c
2015-02-16 14:18:08 +08:00
Xinchen Hui
8309988111
Fixed bug #68912 (Segmentation fault at openssl_spki_new)
2015-02-16 14:16:52 +08:00
Jakub Zelenka
5f82c9256d
Update JSON Readme
2015-02-15 20:04:16 +00:00
Jakub Zelenka
549c6fa465
Remove unused destructor in json parser
2015-02-15 19:46:41 +00:00
Jakub Zelenka
911f7b10b1
Add bison 3.0.4 genereted files for json parser
...
The definitions file (json_parser.tab.h) contains file
system dependent name for C preprocessor guard:
YY_PHP_JSON_YY_HOME_JAKUB_PROG_PHP_MASTER_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED
This is because the srcdir is used for default definitions name.
It's a correct default (--definition=$(srcdir)/json_parser.tab.h)
because the build would fail otherwise. Unfortunately Bison does not have
a special option for defining cpp guard name. The only way would be
using skeleton file but that's not possible with the current
configuration as it requires using a specific bison version
(disallowing range of supported versions).
2015-02-15 19:28:37 +00:00
Jakub Zelenka
09d27da1ba
Regenerate json scanner with re2c 0.13.7.5
2015-02-15 18:08:58 +00:00
Xinchen Hui
fc087ed1ee
Merge branch 'PHP-5.6'
...
Conflicts:
ext/readline/readline.c
2015-02-15 22:56:56 +08:00
Xinchen Hui
edd16831b1
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-15 22:55:42 +08:00
Xinchen Hui
a620b79040
Fixed bug #69054 (Null dereference in readline_(read|write)_history() without parameters)
2015-02-15 22:54:05 +08:00
Michael Wallner
4137956d0e
fix detection of mbstate_t with clang
...
AC_TRY_COMPILE expexts a function body
2015-02-15 09:25:03 +01:00
Xinchen Hui
e017f35b7f
Merge branch 'PHP-5.6'
...
Conflicts:
ext/pgsql/pgsql.c
2015-02-14 22:20:33 +08:00
Xinchen Hui
1db720cd6d
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/pgsql/pgsql.c
2015-02-14 22:18:13 +08:00
Xinchen Hui
7667f8efc6
Fixed bug #68638 (pg_update() fails to store infinite values)
2015-02-14 22:17:01 +08:00
Xinchen Hui
40a94597ae
Merge branch 'PHP-5.4' of https://github.com/wfelipew/php-src into PHP-5.5
2015-02-14 22:03:53 +08:00
Xinchen Hui
b73fa1fa8f
Fixed build on windows
2015-02-14 12:57:53 +08:00
Yasuo Ohgaki
7d0e3c01e6
Added NULL byte protection to exec, system and passthru.
2015-02-14 05:37:56 +09:00
Yasuo Ohgaki
096fb06dab
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Add NULL byte protection to exec, system and passthru
2015-02-14 05:28:32 +09:00
Yasuo Ohgaki
a54300b3f6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add NULL byte protection to exec, system and passthru
2015-02-14 05:27:44 +09:00
Yasuo Ohgaki
3ea76a768c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add NULL byte protection to exec, system and passthru
2015-02-14 05:26:54 +09:00
Yasuo Ohgaki
a8722f5330
Add NULL byte protection to exec, system and passthru
2015-02-14 05:25:04 +09:00
Dmitry Stogov
e10e151e9b
Merged zend_array and HashTable into the single data structure.
...
Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write
zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.
2015-02-13 22:20:39 +03:00
Dmitry Stogov
bc630ad6da
Get rid of old HashTable iteration API (it doesn't work with constant arrays)
2015-02-13 20:18:29 +03:00
Popa Adrian Marius
8f968c5416
Apply PHP7 firebird fixes after API Cleanup from 8c920a22ac
2015-02-13 17:55:17 +02:00
Anatol Belski
c17e007a29
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix condition
2015-02-13 13:40:37 +01:00
Anatol Belski
b3d28d14d6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix condition
2015-02-13 13:40:10 +01:00