mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 20:34:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
89,956 Commits 500 Branches 1,381 Tags 814 MiB
33097bcff6
Commit Graph

38654 Commits

Author SHA1 Message Date
Dmitry Stogov
3037665f04 Fixed use after free 2015-04-14 16:42:02 +03:00
Anatol Belski
63c92a6e96 fix test 2015-04-14 15:24:46 +02:00
Anatol Belski
bc63491da8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2015-04-14 15:21:47 +02:00
Anatol Belski
3803bbde24 fix test 2015-04-14 15:20:44 +02:00
Dmitry Stogov
6762fcfa90 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed recently introduced memory leak
 2015-04-14 15:49:44 +03:00
Dmitry Stogov
e1821090ef Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed recently introduced memory leak
 2015-04-14 15:48:20 +03:00
Dmitry Stogov
dfffa0ba5b Fixed recently introduced memory leak 2015-04-14 15:47:26 +03:00
Dmitry Stogov
753fa0c593 Partial revert of 1a7798c786 that introduced wrong memory access 2015-04-14 15:35:33 +03:00
Masaki Kagaya
8d219f5307 apply a patch 2015-04-14 21:17:08 +09:00
Xinchen Hui
5db1a56705 Merge branch 'master' of https://git.php.net/repository/php-src 2015-04-14 19:50:03 +08:00
Xinchen Hui
a4d5a78f89 Fixed test in PHP7 2015-04-14 19:49:00 +08:00
Dmitry Stogov
28011fd14f Fixed recently introduced memory leak 2015-04-14 14:46:26 +03:00
Derick Rethans
66bd59225b - Updated to version 2015.3 (2015c) 2015-04-14 10:51:15 +01:00
Derick Rethans
d887ef5a04 - Updated to version 2015.3 (2015c) 2015-04-14 10:51:12 +01:00
Derick Rethans
043f8ac51e - Updated to version 2015.3 (2015c) 2015-04-14 10:51:10 +01:00
Stanislav Malyshev
a6f5fb0120 Merge remote-tracking branch 'origin/master' 
* origin/master:
  What should we version the bundled opcache?
 2015-04-14 01:30:59 -07:00
Stanislav Malyshev
b3709bfc52 Merge branch 'PHP-5.6' 
* PHP-5.6: (27 commits)
  fix non-standard C
  update NEWS
  5.4.41 next
  fix CVE num
  update NEWS
  Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
  fix test
  fix type in fix for #69085
  fix memory leak & add test
  Fix tests
  fix CVE num
  Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
  Fix test
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  ...

Conflicts:
	Zend/zend_exceptions.c
	ext/curl/interface.c
	ext/dom/document.c
	ext/fileinfo/libmagic/softmagic.c
	ext/gd/gd.c
	ext/hash/hash.c
	ext/pgsql/pgsql.c
	ext/phar/phar.c
	ext/phar/phar_internal.h
	ext/standard/http_fopen_wrapper.c
	ext/standard/link.c
	ext/standard/streamsfuncs.c
	ext/xmlwriter/php_xmlwriter.c
	ext/zlib/zlib.c
 2015-04-14 01:28:06 -07:00
Xinchen Hui
5255ea42b5 What should we version the bundled opcache? 2015-04-14 16:20:01 +08:00
Stanislav Malyshev
5776fceb16 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5: (27 commits)
  fix non-standard C
  update NEWS
  5.4.41 next
  fix CVE num
  update NEWS
  Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
  fix test
  fix type in fix for #69085
  fix memory leak & add test
  Fix tests
  fix CVE num
  Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
  Fix test
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  ...

Conflicts:
	ext/standard/http_fopen_wrapper.c
 2015-04-14 01:05:01 -07:00
Stanislav Malyshev
4782ceea80 Merge branch 'PHp-5.4' into PHP-5.5 
* PHp-5.4:
  fix non-standard C
 2015-04-14 00:49:23 -07:00
Stanislav Malyshev
9af582bbe0 fix non-standard C 2015-04-14 00:46:47 -07:00
Stanislav Malyshev
e21f87e957 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.41 next
  fix CVE num
  update NEWS
  Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
  fix type in fix for #69085
  fix CVE num

Conflicts:
	configure.in
	main/php_version.h
 2015-04-14 00:34:02 -07:00
Stanislav Malyshev
100614da27 Merge branch 'PHP-5.5.24' into PHP-5.5 
* PHP-5.5.24:
  fix test
  fix memory leak & add test
  Fix tests
  Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
  Fix test
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  Fixed bug #68901 (use after free)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  Updated NEWS
  Fixed bug #69336 (Issues with "last day of <monthname>").
  5.5.24RC1
 2015-04-14 00:33:04 -07:00
Stanislav Malyshev
d3aeb8a204 Merge branch 'PHP-5.4.40' into PHP-5.4 
* PHP-5.4.40:
  update NEWS
  Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
  fix memory leak & add test
  Fix tests
  fix CVE num
  Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
  Fix test
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
 2015-04-14 00:26:53 -07:00
Stanislav Malyshev
f59b67ae50 Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode) 2015-04-14 00:03:50 -07:00
Stanislav Malyshev
be34c82bfd fix test 2015-04-13 16:10:05 -07:00
Dmitry Stogov
cddb5eb3e9 Fixed memory leak 2015-04-14 00:57:45 +03:00
Remi Collet
ff70b40dc9 fix type in fix for #69085 2015-04-13 14:41:39 +02:00
Remi Collet
dc0f2a5bad Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix type in fix for #69085
 2015-04-13 14:40:43 +02:00
Remi Collet
c61ceef779 fix type in fix for #69085 
(cherry picked from commit 085e9ddc26f37ce556b8fd787044746e726264b2)
 2015-04-13 14:40:05 +02:00
Lauri Kenttä
533c4be0d5 Fix compile error when oniguruma is not available 2015-04-13 10:11:38 +02:00
Stanislav Malyshev
ba15e8dfd0 Merge branch 'PHP-5.4.40' into PHP-5.5.24 
* PHP-5.4.40:
  fix memory leak & add test
  Fix tests
 2015-04-12 23:49:16 -07:00
Stanislav Malyshev
45facd15fb fix memory leak & add test 2015-04-12 22:38:34 -07:00
Stanislav Malyshev
a643ccfb90 Fix tests 2015-04-12 20:55:35 -07:00
Stanislav Malyshev
ed7d4977bb Merge branch 'PHP-5.4.40' into PHP-5.5.24 
* PHP-5.4.40:
  Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
  Fix test
 2015-04-12 20:13:00 -07:00
Stanislav Malyshev
9bbd995679 Merge branch 'PHP-5.5-security' into PHP-5.5.24 
* PHP-5.5-security: (22 commits)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  updated NEWS
  added test for bug #69354
  revert skipif, this should run everywhere
  further ODBC 3.0 compliance
  more compliance with the ODBC 3.0
  test fixes
  Prevent GC from changing zval or object 'color' before they are actually inserted into possible roots buffer.
  sigh, can't even copypaste without screwing up
  oop, put both the error number and message for both db object to the error message
  test fixes
  Fixed bug #69281 (opcache_is_script_cached no longer works)
  Fix typo: unitialized -> uninitialized
  Fix typo: unitialized -> uninitialized
  Fixed bug #68739 (Missing break / control flow). Fixed bug #68740 (NULL Pointer Dereference). Fixed bug #68677 (Use After Free).
  Fixed bug #68739 (Missing break / control flow in curl)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fixed bug #68677 (Use After Free in OPcache)
  ...

Conflicts:
	configure.in
	ext/curl/tests/bug69316.phpt
	main/php_version.h
 2015-04-12 20:12:38 -07:00
王星星
73a0c96ac3 modify skeleton confirm_extname_compiled 2015-04-12 20:59:11 +08:00
王星星
22bef96315 modify skeleton.c function 2015-04-12 20:35:48 +08:00
Stanislav Malyshev
d82d68742c Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability) 2015-04-12 01:30:33 -07:00
Stanislav Malyshev
1defbb25ed Fix test 2015-04-12 00:56:02 -07:00
Xinchen Hui
0981345734 Merge branch 'PHP-5.6' 2015-04-12 12:12:38 +08:00
Xinchen Hui
dd50ec1538 Remove failing test 
<nikic> [19:57:28] debian has a libmcrypt patch that makes it work
<nikic> [19:57:43] but not all other distros have it
 2015-04-12 12:12:16 +08:00
Stanislav Malyshev
0cb9d75cb6 Merge branch 'PHP-5.4.40' into PHP-5.5.24 
* PHP-5.4.40:
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  Fixed bug #68901 (use after free)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fix bug #66550 (SQLite prepared statement use-after-free)
  Better fix for #68601 for perf 81e9a993f2
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
 2015-04-11 16:56:12 -07:00
Stanislav Malyshev
12d3bdee3d Additional fix for bug #69324 
Not so happy about duplication but needed due to bug #69429
 2015-04-11 16:53:22 -07:00
Stanislav Malyshev
a894a8155f More fixes for bug #69152 2015-04-11 16:53:22 -07:00
Stanislav Malyshev
4435b9142f Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) 2015-04-11 16:53:22 -07:00
Stanislav Malyshev
9faaee66fa Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) 2015-04-11 16:53:21 -07:00
Stanislav Malyshev
0ea75af9be Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) 2015-04-11 16:53:21 -07:00
Stanislav Malyshev
f938112c49 Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) 2015-04-11 16:53:21 -07:00
Xinchen Hui
920a0afbf8 Fixed bug #68901 (use after free) 2015-04-11 16:28:07 -07:00
Dmitry Stogov
5e8133f453 Squashed commit of the following: 
commit 2399fc84c5
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Apr 10 12:38:08 2015 +0300

    Removed useless assignment

commit 796b633817
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Apr 10 12:35:31 2015 +0300

    Fixed execution with overriden zend_execute_ex()

commit 4a9fb125aa
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Apr 10 02:02:58 2015 +0300

    Fixed executor without global registers

commit d456c30e00
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Apr 10 01:30:35 2015 +0300

    Restored original behavior for tests/classes/__call_004.phpt

commit 479646d37f
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Apr 10 00:32:17 2015 +0300

    Fixed test. We don't keep stack frame for fake function anymore.

commit 9ae61e33e2
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Apr 10 00:30:09 2015 +0300

    Use ZEND_ACC_CALL_VIA_TRAMPOLINE instead of ZEND_ACC_CALL_VIA_HANDLER. Keep ZEND_ACC_CALL_VIA_HANDLER for compatibility.

commit 0a8403a2a0
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Apr 10 00:05:43 2015 +0300

    Rename PROXY_CALL into CALL_TRAMPLINE.
    Generalize API to allow reuse EG(trampline) for other purposes.

commit 4ea0525c10
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Apr 9 23:22:25 2015 +0300

    Reuse EG(proxy_call_op) for all proxy. Move proxy related functions from zend_objects_API to zend_object_handlers.

commit 529bf737ca
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Apr 9 21:42:23 2015 +0300

    Accurate use of proxy_call

commit 5d62837d5b
Merge: 83e749f 690843f
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Apr 9 19:40:00 2015 +0300

    Merge branch 'master' into opcodefy-call

    * master:
      Fixed GOTO executor
      Fixed typo
      Changed ArrayIterator implementation using zend_hash_iterator_... API. Allowed modification of itterated ArrayObject using the same behavior as proposed in `Fix "foreach" behavior`. Removed "Array was modified outside object and internal position is no longer valid" hack.

commit 83e749ff3b
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Apr 9 19:39:10 2015 +0300

    Improved ZEND_PROXY_CALL

commit 0c829afc53
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Apr 9 15:14:49 2015 +0300

    Reverted white-space changes

commit df65144488
Merge: 5fd2f97 97756d9
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Apr 9 14:37:07 2015 +0300

    Merge branch 'opcodefy-call' of github.com:laruence/php-src into opcodefy-call

    * 'opcodefy-call' of github.com:laruence/php-src:
      Ready for PR
      Fixed static call
      Improve performance by using prealloated op_arrray
      Respect called_scope
      Support internal magical __call/__callStatic
      opcode-fy magical __callStatic
      Opcode-fy magical __call

commit 97756d9190
Author: Xinchen Hui <laruence@gmail.com>
Date:   Thu Apr 9 19:07:59 2015 +0800

    Ready for PR

commit 74f9930846
Author: Xinchen Hui <laruence@gmail.com>
Date:   Thu Apr 9 19:03:00 2015 +0800

    Fixed static call

commit ec1d9eb592
Author: Xinchen Hui <laruence@gmail.com>
Date:   Thu Apr 9 18:23:17 2015 +0800

    Improve performance by using prealloated op_arrray

commit df7fbbf949
Author: Xinchen Hui <laruence@gmail.com>
Date:   Thu Apr 9 15:10:02 2015 +0800

    Respect called_scope

commit 769d1d59fb
Author: Xinchen Hui <laruence@gmail.com>
Date:   Thu Apr 9 12:19:23 2015 +0800

    Support internal magical __call/__callStatic

commit a980fedd5b
Author: Xinchen Hui <laruence@gmail.com>
Date:   Wed Apr 8 18:35:41 2015 +0800

    opcode-fy magical __callStatic

commit 73855f7d53
Author: Xinchen Hui <laruence@gmail.com>
Date:   Wed Apr 8 14:21:55 2015 +0800

    Opcode-fy magical __call
 2015-04-10 23:01:00 +03:00
Nikita Popov
94bea670de Fix bug #69413 2015-04-10 09:49:07 +02:00
Anthony Ferrara
94e222c14d Deprecate password_hash salt option 2015-04-09 15:51:04 -04:00
Kalle Sommer Nielsen
156ac232cb Fix test for systems where openssl's time_t have an offset set 2015-04-09 19:57:44 +02:00
Dmitry Stogov
2b6a568df1 Changed ArrayIterator implementation using zend_hash_iterator_... API. Allowed modification of itterated ArrayObject using the same behavior as proposed in Fix "foreach" behavior. Removed "Array was modified outside object and internal position is no longer valid" hack. 2015-04-09 15:40:17 +03:00
Kalle Sommer Nielsen
8d3c4e5988 Fix test on systems where EOL isn't "\n", like Windows 2015-04-08 23:56:29 +02:00
Dmitry Stogov
5ba72e5f80 Fixed resource leak 2015-04-08 23:37:05 +03:00
Rasmus Lerdorf
32484e3f5f Remove SSLv3 test dependencies 
SSLv3 is going away. Debian8 already ships with an openssl
with no SSLv3 support which was causing these tests to fail.
 2015-04-08 09:55:55 -07:00
Dmitry Stogov
151b4ea3cd Fixed unsigned underflow 2015-04-08 17:06:03 +03:00
Dmitry Stogov
b71fbade32 Fixed test 2015-04-08 16:29:29 +03:00
Dmitry Stogov
7649a35d52 Fixed access to uninitialized value (in case of exception) 2015-04-08 16:01:22 +03:00
Dmitry Stogov
bf7d3e0c23 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed typo
 2015-04-08 15:54:47 +03:00
Dmitry Stogov
ec0b888a82 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed typo
 2015-04-08 15:54:10 +03:00
Dmitry Stogov
1955403ed5 Fixed typo 2015-04-08 15:53:28 +03:00
Dmitry Stogov
fa348dcdfa Fixed reference counting 2015-04-08 15:47:31 +03:00
Dmitry Stogov
4d9a1883aa Fixed bug #68887 (resources are not freed correctly) 2015-04-08 13:29:42 +03:00
Xinchen Hui
fa795b0553 Fixed bug #69325 (php_copy_file_ex does not pass the argument) 2015-04-08 14:33:01 +08:00
Xinchen Hui
f23f7dfed0 Use new macros 2015-04-08 14:30:47 +08:00
Andrey Hristov
871ff65fd1 Rename prefixed mysqlnd functions - prefixed with undescore, which were 
accessible through a macro. Also removing the access macros.
These prefixed functions were used, similarly to many functions in Zend2,
because of TSRMLS - the macro was adding the the tsrm pointer to the call.
However, as in Zend3 no TSRM pointers are passed down the stack, because of
the usage of cached TSRM pointer in a real thread local variable, these
macros and prefixed naming have lost their purpose.
 2015-04-07 21:48:08 +02:00
Andrey Hristov
ed0f134a64 Split mysqlnd_stmt::execute in 2 logical parts : 
- mysqlnd_stmt::send_execute() which just creates the wire message by using
  an aux function and sends it to the server
- mysqlnd_stmt::parse_execute_respose() which is responsible for handling
  the bytes sent from the server in response to COM_EXECUTE.
This makes it possible to implement finer method overwriting in mysqlnd
plugins.
 2015-04-07 21:39:29 +02:00
Andrey Hristov
a970ae76e2 Add more info to the calls: 
- let the callee knows whether it was called directly or indirectly
- two NULL zval * parameters for future extension in a pecl plugin
 2015-04-07 20:45:17 +02:00
Reeze Xia
624552c3d7 Fixed implicit declaration of function warning 2015-04-07 22:22:42 +08:00
Dmitry Stogov
b8ba3203e5 Cleanup 2015-04-07 14:19:12 +03:00
Dmitry Stogov
5bd71e9713 Avoid reallocation 2015-04-07 02:35:21 +03:00
Dmitry Stogov
1cfc9db0d6 Fixed test 2015-04-06 22:07:18 +03:00
Dmitry Stogov
cae0147ed3 Fixed weird operators behavior. Division by zero now emits warning and returns +/-INF, modulo by zero and intdid() throws an exception, shifts by negative offset throw exceptions. Compile-time evaluation of division by zero is disabled. 2015-04-06 14:30:05 +03:00
Nikita Popov
caf9219dea Fix EH_THROW replacement in PDO constructor 
Needs to happen for the "goto options" case as well, otherwise
will try to restore error handling that was never replaced.
 2015-04-06 12:15:04 +02:00
Nikita Popov
122d759618 Always throw TypeException on throwing zpp failures 
Introduces a ZEND_PARSE_PARAMS_THROW flag for zpp, which forces to
report FAILURE errors using a TypeException instead of a Warning,
like it would happen in strict mode.

Adds a zend_parse_parameters_throw() convenience function, which
invokes zpp with this flag.

Converts all cases I could identify, where we currently have
throwing zpp usage in constructors and replaces them with this API.
Error handling is still replaced to EH_THROW in some cases to handle
other, domain-specific errors in constructors.
 2015-04-06 11:27:34 +02:00
Xinchen Hui
9a404df382 Fixed bug #68740 (NULL Pointer Dereference) 
(cherry picked from commit 124fb22a13)
 2015-04-05 22:48:10 -07:00
Stanislav Malyshev
ff740f16f9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #66550 (SQLite prepared statement use-after-free)

Conflicts:
	ext/sqlite3/sqlite3.c
 2015-04-05 22:45:16 -07:00
Stanislav Malyshev
2a81733c87 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #66550 (SQLite prepared statement use-after-free)
 2015-04-05 22:38:20 -07:00
Stanislav Malyshev
66b853d426 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #66550 (SQLite prepared statement use-after-free)
 2015-04-05 22:37:51 -07:00
Stanislav Malyshev
5ae20c6247 Fix bug #66550 (SQLite prepared statement use-after-free) 2015-04-05 22:36:26 -07:00
Remi Collet
bd31cb7563 Better fix for #68601 for perf 
81e9a993f2
 2015-04-05 17:36:47 -07:00
Remi Collet
afbf725e73 Fix bug #68601 buffer read overflow in gd_gif_in.c 2015-04-05 17:33:52 -07:00
Xinchen Hui
b6aeab1b91 Fixed bug #69371 (Hash table collision leads to inaccessible array keys) 2015-04-05 18:45:14 +08:00
Stanislav Malyshev
d19842f613 Merge branch 'PHP-5.4.40' into PHP-5.5-security 
* PHP-5.4.40:
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
 2015-04-05 00:45:58 -07:00
Stanislav Malyshev
cb0d325066 Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) 2015-04-05 00:32:13 -07:00
Stanislav Malyshev
80e2632776 Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) 2015-04-04 15:01:37 -07:00
Anatol Belski
b1997278fd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  added test for bug #69354
  revert skipif, this should run everywhere
  further ODBC 3.0 compliance
  more compliance with the ODBC 3.0
  test fixes
 2015-04-04 21:50:18 +02:00
Anatol Belski
7eda18514d added test for bug #69354 2015-04-04 21:42:51 +02:00
Anatol Belski
0ae0d0bc53 revert skipif, this should run everywhere 2015-04-04 21:42:43 +02:00
Anatol Belski
d27d9158c9 further ODBC 3.0 compliance 2015-04-04 21:42:33 +02:00
Anatol Belski
5c2aa71e0c more compliance with the ODBC 3.0 2015-04-04 21:42:17 +02:00
Anatol Belski
a5bb37117c test fixes 2015-04-04 21:42:08 +02:00
Nikita Popov
30d59aed1c Try fixing PDO MySQL pconnect test 
Use less aggressive conversion to exceptions, in particular
do not convert warnings that happen during check_liveness. If the
server has gone away this will just reconnect and we still end up
with a valid connection, so it shouldn't throw.

Also drop some unnecessary checks for malloc returning NULL.
 2015-04-04 16:00:17 +02:00
Nikita Popov
f3e3d85bb2 Drop now unnecessary start parameter 2015-04-04 13:10:29 +02:00
Nikita Popov
9a4b7ad9bb Fix parameter parsing for mysqli_stmt_bind_result() 
Also drops one unnecessary arg allocation
 2015-04-04 13:05:05 +02:00
Nikita Popov
fa15ac4c37 Fix separation in array_multisort 
This manifested in Zend/tests/bug52939.phpt when running without
opcache (no immutablization).
 2015-04-04 10:52:43 +02:00
Dmitry Stogov
dcaa79546b Don't relay on reference-counter when parameter expected to be a reference, but value given. 2015-04-03 16:35:06 +03:00
Dmitry Stogov
52eac6bf11 Improved "fust shutdown". 2015-04-03 10:48:55 +03:00
Anatol Belski
f26592846f added test for bug #69354 2015-04-02 20:19:51 +02:00
Anatol Belski
b244fdfb2f revert skipif, this should run everywhere 2015-04-02 20:19:42 +02:00
Anatol Belski
899362db6e further ODBC 3.0 compliance 2015-04-02 20:19:23 +02:00
Anatol Belski
b3a027d610 more compliance with the ODBC 3.x 2015-04-02 20:18:11 +02:00
Anatol Belski
48447da836 test fixes 2015-04-02 20:16:01 +02:00
Nikita Popov
a8bf1c5d8f Throw ParseException from lexer 
Primarily to avoid getting fatal errors from token_get_all().

Implemented using a magic E_ERROR token, which the lexer emits to
force a parser failure.
 2015-04-02 16:31:17 +02:00
Dmitry Stogov
83a15801cc Use PHP memory manager for mysqlnd memory pools. 2015-04-02 14:28:39 +03:00
Dmitry Stogov
ad863c1740 Convert fatal errors into EngineException 2015-04-02 14:19:52 +03:00
Anatol Belski
bdf315f5f3 fix tests 2015-04-02 11:37:02 +02:00
Xinchen Hui
97123042a2 Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 2015-04-02 09:06:46 +08:00
Xinchen Hui
3645a80b38 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 2015-04-02 09:06:38 +08:00
Xinchen Hui
f8461d4aa3 Merge branch 'master' of https://git.php.net/repository/php-src 2015-04-02 09:03:48 +08:00
Dmitry Stogov
ea09a9fa32 Convert fatal errors into EngineExceptions 
Make zval_update_constant_ex(), zval_update_constant(), zend_update_class_constants() and zend_ast_evaluate() return SUCCESS or FAILURE.
 2015-04-02 02:05:25 +03:00
Ferenc Kovacs
956fa034e3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  sigh, can't even copypaste without screwing up
 2015-04-02 00:07:20 +02:00
Ferenc Kovacs
9806a37a79 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  sigh, can't even copypaste without screwing up
 2015-04-02 00:07:13 +02:00
Ferenc Kovacs
9991b8ecee sigh, can't even copypaste without screwing up 2015-04-02 00:07:00 +02:00
Ferenc Kovacs
6923f081b7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  oop, put both the error number and message for both db object to the error message
 2015-04-01 23:06:32 +02:00
Ferenc Kovacs
e70e2d8310 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  oop, put both the error number and message for both db object to the error message
 2015-04-01 23:06:22 +02:00
Ferenc Kovacs
7c1a1189be oop, put both the error number and message for both db object to the error message 2015-04-01 23:06:04 +02:00
Ferenc Kovacs
0328a60eec Merge branch 'PHP-5.6' 
* PHP-5.6:
  test fixes
 2015-04-01 22:08:29 +02:00
Ferenc Kovacs
faab430141 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  test fixes
 2015-04-01 22:08:11 +02:00
Ferenc Kovacs
0a41af216e test fixes 2015-04-01 22:07:52 +02:00
Stanislav Malyshev
4975019dd7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Revert "Merge branch 'PHP-5.5' into PHP-5.6"

Conflicts:
	ext/date/php_date.c
	ext/date/tests/DateTime_verify.phpt
 2015-04-01 12:50:40 -07: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
Xinchen Hui
ed43b7a548 Merge branch 'PHP-5.6' 
Conflicts:
	ext/opcache/zend_accelerator_module.c
 2015-04-02 00:04:30 +08:00
Xinchen Hui
2533fde199 Merge branch 'PHP-5.5' into PHP-5.6 2015-04-01 23:59:45 +08:00
Danack
86f983bd3e Fixed bug #69281 (opcache_is_script_cached no longer works) 2015-04-01 23:58:22 +08:00
Lior Kaplan
3b8b1435ad Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix typo: unitialized -> uninitialized
  Fix typo: unitialized -> uninitialized

Conflicts:
	ext/xmlwriter/php_xmlwriter.c
 2015-04-01 18:30:55 +03:00
Lior Kaplan
2fd74c7f03 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix typo: unitialized -> uninitialized
 2015-04-01 18:20:26 +03:00
Lior Kaplan
59c2a55ec7 Fix typo: unitialized -> uninitialized 2015-04-01 18:17:53 +03:00
Anatol Belski
a0eaa37afe missing includes 2015-04-01 13:39:25 +02:00
Anatol Belski
e271ace5f8 fix extern "C" 
now, it shouldn't matter where intl_common.h is included,
not need for extra putting it into extern C
 2015-04-01 13:18:52 +02:00
Anatol Belski
ca1ef2749d C89 compat 2015-04-01 13:18:51 +02:00
Nikita Popov
cf0ffa8e4c Remove datefmt_set_timezone_id and OO variant 2015-04-01 12:34:28 +02:00
Nikita Popov
8d00385871 Reclassify E_STRICT notices 
Per RFC https://wiki.php.net/rfc/reclassify_e_strict

While reviewing this, found that there are still three E_STRICTs
left in libraries - need to discuss those.
 2015-04-01 11:17:55 +02:00
Dmitry Stogov
4796e0242b Merge branch 'InternalClassClean' 
* InternalClassClean:
  Fixed test
  Patch improvement:
  Fixed indentation. Fixed comment style. Fixed commented out code.
  Reverted change to function name and added note of why it is different from the class it is actually changing.
  Made UConverter throw an exception if the constructor fails.
  Fixed PDO constructor to not return null.
  Fixed fileinfo behaviour.
  Made Phar throw exception on bad constructor.
  Converted intl extension to use IntlException in constructors.
  Fixed SplFixedArray and tests.
  Fixed ReflectionExtension and ReflectionProperty.
  Fixed ReflectionFunction, ReflectionMethod and ReflectionParameter.
  Fixed PDORow behaviour and message.
 2015-04-01 12:11:13 +03:00
Nikita Popov
52fcc74875 Fix 32bit test failures due to ctor deprecation 2015-04-01 09:36:43 +02:00
Xinchen Hui
fd0baec2e9 Merge branch 'master' of https://git.php.net/repository/php-src 2015-04-01 13:06:38 +08:00
Xinchen Hui
af812eac4c Micro opt 2015-04-01 12:05:19 +08:00
Lior Kaplan
c22543b3f3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68739 (Missing break / control flow in curl)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fixed bug #68677 (Use After Free in OPcache)
 2015-04-01 01:54:53 +03:00
Xinchen Hui
1add8401a3 Fixed bug #68739 (Missing break / control flow in curl) 
(cherry picked from commit 124fb22a13)
 2015-04-01 01:24:26 +03:00
Xinchen Hui
059e774db0 Fixed bug #68740 (NULL Pointer Dereference) 
(cherry picked from commit 124fb22a13)
 2015-04-01 01:24:26 +03:00
Xinchen Hui
0a8f28b432 Fixed bug #68677 (Use After Free in OPcache) 
(cherry picked from commit 777c39f404)
 2015-04-01 01:24:16 +03:00
Nikita Popov
6ef9216269 Finish PHP 4 constructor deprecation 2015-03-31 17:55:27 +02:00
Andrea Faulds
db76b708cf Deprecate PHP 4 constructors 2015-03-31 17:55:27 +02:00
Derick Rethans
30123005ff Fixed bug #69336 (Issues with "last day of <monthname>"). 2015-03-31 17:44:08 +02:00
Derick Rethans
d252c9f832 Merge branch 'PHP-5.6' 
Conflicts:
	ext/date/lib/parse_date.c
	ext/date/php_date.c
 2015-03-31 16:36:51 +01: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
Dmitry Stogov
463ca30c8c Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  force ext/odbc to be shared in snapshot build
 2015-03-31 16:36:26 +03:00
Dmitry Stogov
685ab95add Convert fatal errors on improper access to static properties into EngineExceptions 2015-03-31 16:35:27 +03:00
Anatol Belski
b13df7327f force ext/odbc to be shared in snapshot build 2015-03-31 12:54:10 +02:00
Derick Rethans
f9d1a47f24 Merge branch 'PHP-5.6' 2015-03-31 11:09:31 +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
Xinchen Hui
b72fd9c258 Merge branch 'master' of https://git.php.net/repository/php-src 2015-03-31 11:54:08 +08:00
Xinchen Hui
fd1a7c5f2d Add XFAIL test 2015-03-31 11:53:52 +08:00
Dmitry Stogov
2afca9f179 Fixed test 2015-03-30 21:48:54 +03:00
Dmitry Stogov
1018f462d8 Patch improvement: 
Removed the corresponding core code.
Fixed ext/com_dotnet and ext/date.
Refactored ext/intl changes.
Improved ext/fileinfo and ext/pdo changes.
Fixed tests.
 2015-03-30 18:53:38 +03:00
Michael Wallner
3ec9d9f3b6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  BFN
  Fixed bug #64931
 2015-03-30 16:29:18 +02:00
Michael Wallner
a4490bb0a2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #64931
 2015-03-30 16:25:47 +02:00
Michael Wallner
6480725007 Fixed bug #64931 
phar_add_file is too restrive on filename

Check for any of '/', '\\', '\0' after ".phar".
 2015-03-30 16:24:19 +02:00
Michael Wallner
8994a5eb1d Merge branch 'PHP-5.6' 
* PHP-5.6:
  BFN
  Fixed Bug #65467
 2015-03-30 15:41:53 +02:00
Michael Wallner
3c22449649 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #65467
 2015-03-30 15:41:03 +02:00
Michael Wallner
6de25c155e Fixed Bug #65467 
Call to undefined method cli_arg_typ_string

Use cli_arg_typ_filecontent instead.
 2015-03-30 15:39:30 +02:00
Michael Wallner
e148fff61d Merge branch 'PHP-5.6' 
* PHP-5.6:
  BFN
  fix bug #67761
 2015-03-30 14:45:38 +02:00
Michael Wallner
90a8b59e9c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix bug #67761
 2015-03-30 14:42:37 +02:00
Michael Wallner
8f7e378b9f fix bug #67761 
Phar::mapPhar fails for Phars inside a path containing ".tar".

Strengthen the silly .tar file extension check.
 2015-03-30 14:41:30 +02:00
Xinchen Hui
74090539c1 It's lowercase now 2015-03-30 20:32:02 +08:00
Xinchen Hui
ab4f120c6a Merge branch 'PHP-5.6' 
Conflicts:
	NEWS
	ext/opcache/Optimizer/pass1_5.c
 2015-03-30 20:20:55 +08:00
Michael Wallner
ef52e44053 Fixed bug 64343 
PharData::extractTo fails for tarball created by BSD tar

Phar did not know about PAX style global/file headers.
Skip them, to be able to read the contents of those archives.
 2015-03-30 13:20:09 +02:00
Michael Wallner
f4264ebc64 Fixed bug 64343 
PharData::extractTo fails for tarball created by BSD tar

Phar did not know about PAX style global/file headers.
Skip them, to be able to read the contents of those archives.
 2015-03-30 13:11:06 +02:00
Dmitry Stogov
9155a267ad Merge branch 'InternalClassClean' of github.com:Danack/php-src into InternalClassClean 
* 'InternalClassClean' of github.com:Danack/php-src:
  Fixed indentation. Fixed comment style. Fixed commented out code.
  Reverted change to function name and added note of why it is different from the class it is actually changing.
  Made UConverter throw an exception if the constructor fails.
  Fixed PDO constructor to not return null.
  Fixed fileinfo behaviour.
  Made Phar throw exception on bad constructor.
  Converted intl extension to use IntlException in constructors.
  Fixed SplFixedArray and tests.
  Fixed ReflectionExtension and ReflectionProperty.
  Fixed ReflectionFunction, ReflectionMethod and ReflectionParameter.
  Fixed PDORow behaviour and message.
 2015-03-30 12:14:43 +03:00
Xinchen Hui
3ad9ff197d Fixed typos 2015-03-30 16:56:12 +08:00
Xinchen Hui
97956a5d08 Fixed tests 2015-03-30 16:25:41 +08:00
Xinchen Hui
c71c97e101 Fixed test 2015-03-30 14:18:23 +08:00
Eric F
321bafccde Update openssl.c 
Adding additional checks for sslv3.
 2015-03-30 01:30:09 +02:00
Kalle Sommer Nielsen
6a8ab3d7c6 Fix additional NULL byte added to string keys in get_header(), spotted by Ferenc 2015-03-30 00:52:28 +02:00
Anatol Belski
a7e6687df6 updated libmagic.patch 2015-03-29 18:22:42 +02:00
Anatol Belski
5b6427c40f further sync with libmagic.orig 2015-03-29 18:17:02 +02:00
Anatol Belski
f51d78a35d catch up with libmagic.orig 
that'll simplify future merges
 2015-03-29 18:11:11 +02:00
Anatol Belski
662c439087 fix typo 2015-03-29 17:59:28 +02:00
Anatol Belski
5e773b4ce5 catch up with libmagic.orig 2015-03-29 17:57:22 +02:00
Anatol Belski
a935c02210 added test for bug #69320 2015-03-29 17:52:38 +02:00
Anatol Belski
aeabea4aa9 Fixed bug #69320 libmagic crash when running laravel tests 
Basically reverted the part of the new patch to what we have in 5.6
as the current change seems to have bad side effects. Hovere the
in buffer used for PCRE is still doubled (1 << 14), this might or
might not be optimal, so lets observe.
 2015-03-29 17:42:59 +02:00
Anatol Belski
2accf544cb ifdef win only api 2015-03-29 13:18:25 +02:00
Kalle Sommer Nielsen
19bc9a8dd8 Update credits 2015-03-29 10:15:43 +02:00
Kalle Sommer Nielsen
de2d244f8e We can re-use the already existing EG(windows_version_info) here and save a little bit of memory too! 2015-03-29 09:47:14 +02:00
Kalle Sommer Nielsen
a141ccb4ff Another minor cleanup, drop ENFORCE_SAFE_MODE (all except pdo_pgsql have #if's for checking already) 2015-03-29 09:34:05 +02:00
Kalle Sommer Nielsen
7845bcd827 Shameless self credit for the Windows support for contributions in the almost past decade (How time flies when you are having fun) 2015-03-29 08:11:08 +02:00
Kalle Sommer Nielsen
0ca8ffa2b8 Forgot this one in the last commit, removes old VC support from ext/fileinfo 2015-03-29 07:54:18 +02:00
Kalle Sommer Nielsen
88b9d485d6 Drop old VC support for ext/fileinfo. 
@Anatol, I generated the updated patch file against file 5.22, since you are the one that usually updates it, can you please confirm it works?
 2015-03-29 07:48:48 +02:00
Kalle Sommer Nielsen
75e86b44fc Drop this redundant check, since the minimum version of VC we support is VC11 (_MSC_VER == 1700) in ext/date 2015-03-29 07:14:54 +02:00
Kalle Sommer Nielsen
43457f960f Drop old VC support (VC <= 9), for dns.c, this means that DNS_TYPE_NAPTR always is available 2015-03-29 06:57:11 +02:00
Kalle Sommer Nielsen
3d4aad5e27 Remove this VC8 check as our minimum target version of VC is higher 2015-03-29 06:50:09 +02:00
Kalle Sommer Nielsen
169ed3257b Drop VC6 support in ext/calendar 2015-03-29 06:35:23 +02:00
Kalle Sommer Nielsen
f8590f7100 Drop this struct (it was only used for VC6 which we don't support anyway) 2015-03-29 06:20:30 +02:00
Xinchen Hui
1646e0e9d7 Fixed typo 2015-03-28 18:51:57 +08:00
Xinchen Hui
5c31c8c6e5 Fixed is_callable/function_exists with disable_functions 2015-03-28 17:07:11 +08:00
Xinchen Hui
193de2a679 Fixed memleak 
ext/standard/tests/serialize/bug69210.phpt
 2015-03-28 14:35:14 +08:00
Xinchen Hui
e60b380c55 Merge branch 'bug69315' of https://github.com/laruence/php-src 2015-03-28 14:10:41 +08:00
Kalle Sommer Nielsen
8153286efe Drop zend_indent() as it was never used, complete or working 2015-03-27 20:04:46 +01:00
Dmitry Stogov
75f40ae1f3 Fixed bug #69293 2015-03-27 18:40:58 +03:00
Kalle Sommer Nielsen
f678519a63 Merge branch 'master' of https://git.php.net/push/php-src 2015-03-27 15:21:52 +01:00
Kalle Sommer Nielsen
dd601e661c Remove these CFLAGS for ereg in opcache, we don't use them anymore (as opcache uses PCRE) together with ereg being gone 2015-03-27 15:01:31 +01:00
Leigh
456f4a78d2 Add RAND_egd check for compiling against LibreSSL 2015-03-27 13:33:22 +01:00
Leigh
a04ab4b54b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add RAND_egd check for compiling against LibreSSL
 2015-03-27 13:26:48 +01:00
Leigh
1b2d58a364 Add RAND_egd check for compiling against LibreSSL 2015-03-27 13:24:36 +01:00
Xinchen Hui
84d9426730 Fixed bug #69315 2015-03-27 17:50:36 +08:00
Kalle Sommer Nielsen
d9d74d37ac Fix test on Windows 2015-03-26 03:29:18 +01:00
Kalle Sommer Nielsen
9dfe033ae4 Fix test on Windows 2015-03-26 03:22:57 +01:00
Kalle Sommer Nielsen
71734d64c8 Fix tests on Windows 
CRLF takes +2 bytes when running the tests, making it yield 13 instead of 11
 2015-03-26 03:13:50 +01:00
Kalle Sommer Nielsen
67b907f059 Change the error message for colliding class/interface/trait names to be a little more clearer. 
C:\> php -r "interface stdClass { }"
  Error: Cannot declare interface stdClass, because the name is already in use in Command Line Code on line 1
 2015-03-26 01:44:23 +01:00
Anatol Belski
2cd07c377d remove recognition for no more supported OSes 2015-03-25 19:31:50 +01:00
Xinchen Hui
d55d10c7fd Fixed bug #69299 (Regression in array_filter's $flag argument in PHP 7) 2015-03-25 23:50:54 +08:00
Xinchen Hui
6aaee5fc14 Merge branch 'PHP-5.6' 
Conflicts:
	ext/opcache/Optimizer/pass1_5.c
 2015-03-25 23:35:56 +08:00
Xinchen Hui
d380d1cb1b Fixed Bug #69297 (function_exists strange behavior with OPCache on disabled function) 
is_callable returns true for disable_functions, but function_exists
return false for it.
 2015-03-25 23:34:02 +08:00
Xinchen Hui
e46e9a3d22 Fixed Bug #69297 (function_exists strange behavior with OPCache on disabled function) 
is_callable returns true for disable_functions, but function_exists
return false for it.
 2015-03-25 23:29:18 +08:00
Anatol Belski
1f84e29506 integrate static tsrm_ls cache for ext/odbc 2015-03-25 15:32:36 +01:00
Anatol Belski
774b113b32 fix datatype mismatches 2015-03-25 15:32:36 +01:00
Anatol Belski
fe36285de2 fix datatype mismatches 2015-03-25 15:32:35 +01:00
Anatol Belski
c87aee8a8a updated bundled libsqlite to 3.8.8.3 2015-03-25 13:16:56 +01:00
Anatol Belski
c9550e81da Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3
  fix dir separator in test
 2015-03-25 13:13:42 +01:00
Anatol Belski
1b41dcf9c5 Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3 2015-03-25 13:13:03 +01:00
Anatol Belski
8f9cb39cad fix dir separator in test 2015-03-25 13:11:27 +01:00
Remi Collet
23336d77a6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared
  Fixed typo
  Fixed typo
 2015-03-25 10:33:39 +01:00
Remi Collet
3924548bcb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared
 2015-03-25 10:33:31 +01:00
Remi Collet
1174b399ad revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared 2015-03-25 10:33:08 +01:00
Kalle Sommer Nielsen
927d53fda4 Change "Cannot redeclare class X" into "Cannot redeclare class/interface/trait X", meaning that the following: 
C:\> php -r "trait A { } trait A { }"

Will now properly print "Cannot redeclare trait A" instead of "Cannot redeclare class A" to make error messages a tiny bit clearer. Admittedly, a better solution can most likely be made by actually telling what the colliding object is a type of.

Internally this adds a new function:
 zend_get_object_type()
 2015-03-25 06:31:11 +01:00
Kalle Sommer Nielsen
a3d2f9b600 The error message is actually "Cannot", not "Can't" 2015-03-25 05:20:58 +01:00
Xinchen Hui
86bbacfd53 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-25 12:09:35 +08:00
Xinchen Hui
76c1ec5e96 Bug #69293 NEW segfault when using SoapClient::__setSoapHeader (bisected, regression) 
This was a typo introduced in c8eaca013a
 2015-03-25 12:07:25 +08:00
Anatol Belski
18e0393b71 robuster read/write for mod ps_files 2015-03-24 22:02:34 +01:00
Anatol Belski
512429ffc5 fix datatype mismatches 2015-03-24 22:02:33 +01:00
Anatol Belski
1a00554aaf fix datatype mismatches 2015-03-24 22:02:31 +01:00
Anatol Belski
3066851dab fix datatype mismatches 2015-03-24 22:02:29 +01:00
Anatol Belski
2192e96ef5 replace this version as it's unchanged since 5.4 at least 2015-03-24 22:02:25 +01:00
Dmitry Stogov
0ce7b4c8c6 Removed unused functions 2015-03-24 23:40:20 +03:00
Dmitry Stogov
e37e9d2986 Reverted part committed by mistake 2015-03-24 22:56:07 +03:00
Dmitry Stogov
23c33b1483 Optimized strings concatenation. 
ZEND_ADD_STRING/VAR/CHAR are replaced with ZEND_ROPE_INTI, ZEND_ROPE_ADD, ZEND_ROPE_END.
Instead of reallocation and copying string on each ZEND_ADD_STRING/VAR/CAHR, collect all the strings and then allocate and construct the resulting string once.
 2015-03-24 22:47:21 +03:00
Anatol Belski
663074b6b1 cleanup mod version macros and mod defs, round x 2015-03-23 21:30:22 +01:00
Anatol Belski
19360f386e cleanup mod version macros, round 3 2015-03-23 20:54:55 +01:00
Anatol Belski
2d78023244 cleanup the mod version macros, round 2 2015-03-23 20:33:54 +01:00
Anatol Belski
ec89c85054 cleaning up the version macros 2015-03-23 20:13:59 +01:00
Anatol Belski
88b2a2d405 export useful symbols from ext/simplexml 2015-03-23 18:33:37 +01:00
Anatol Belski
0313394fe4 revert yet unready stuff 2015-03-23 15:09:10 +01:00
Anatol Belski
567565b24f more fixes to the shared compilation 2015-03-23 15:09:09 +01:00
Anatol Belski
c0adad5557 fix exports and shared compilation 2015-03-23 15:09:07 +01:00
Anatol Belski
ffabfc703d fix exports 2015-03-23 15:09:06 +01:00