mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-14 12:26:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
89,431 Commits 503 Branches 1,384 Tags 813 MiB
91e84bb168
Commit Graph

89431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
91e84bb168 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)

Conflicts:
	NEWS
	Zend/zend_execute_API.c
 2015-04-08 21:26:45 +03:00
Dmitry Stogov
1f5f78d4aa Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)
  Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)
 2015-04-08 21:24:24 +03:00
Dmitry Stogov
741c5e4c0c Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer) 2015-04-08 21:22:25 +03:00
Dmitry Stogov
174b9ee634 Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer) 2015-04-08 21:20:35 +03:00
Ferenc Kovacs
efa6a2657b Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix irc notification for build failure/recover
 2015-04-08 19:00:35 +02:00
Ferenc Kovacs
f5c8a79fa5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix irc notification for build failure/recover
 2015-04-08 19:00:21 +02:00
Ferenc Kovacs
923102230b fix irc notification for build failure/recover 2015-04-08 19:00:03 +02: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
Xinchen Hui
54e8c91614 Merge branch 'master' of https://github.com/bixuehujin/php-src 2015-04-08 14:26:57 +08:00
matason
52145ef8c6 Fix zend_hash_find documentation. 2015-04-07 22:26:16 +01: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
Jin Hu
1f28da0225 Added RETURN_ARR and RETVAL_ARR macros 2015-04-08 00:33:11 +08: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
55cdde3dd6 Fixed bug #69376 (Wrong ref counting). 2015-04-07 02:35:52 +03:00
Dmitry Stogov
5bd71e9713 Avoid reallocation 2015-04-07 02:35:21 +03:00
Nikita Popov
f53e20e595 Merge branch 'PHP-5.6' 
Conflicts:
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_language_parser.y
 2015-04-06 22:09:22 +02:00
Nikita Popov
7e9a1c1e3f Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	Zend/zend_compile.c
	Zend/zend_compile.h
 2015-04-06 22:06:48 +02:00
Nikita Popov
cc70a46525 Fix bug #60022 2015-04-06 22:03:04 +02:00
Nikita Popov
23c7f19e41 Undef results for new arithmetic exceptions 
For the compound assing case (e.g. $a <<= $b) the result is going
to be dtored, so we have to set *some* value.
 2015-04-06 21:52:20 +02:00
Nikita Popov
78e1885b7d Merge branch 'PHP-5.6' 2015-04-06 21:45:42 +02:00
Nikita Popov
d819b45597 Merge branch 'PHP-5.5' into PHP-5.6 2015-04-06 21:44:52 +02:00
Nikita Popov
160dbe91a9 Fix static member destruction 2015-04-06 21:37:19 +02:00
Dmitry Stogov
1cfc9db0d6 Fixed test 2015-04-06 22:07:18 +03:00
Dmitry Stogov
5820be029a 0.0 / 0.0 = NaN 2015-04-06 22:03:44 +03:00
Dmitry Stogov
9a57379024 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68652 (segmentation fault in destructor)

Conflicts:
	NEWS
 2015-04-06 18:19:07 +03:00
Dmitry Stogov
812106d0c6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68652 (segmentation fault in destructor)

Conflicts:
	NEWS
 2015-04-06 18:16:08 +03:00
Dmitry Stogov
21bb33cc72 Fixed bug #68652 (segmentation fault in destructor) 2015-04-06 18:11:41 +03:00
Dmitry Stogov
a62896783f Removed wrong error messages 2015-04-06 18:10:45 +03:00
Dmitry Stogov
d77950902e Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  catch up with INF handling under VS
 2015-04-06 18:10:34 +03:00
Anatol Belski
d3f1abc27d catch up with INF handling under VS 2015-04-06 17:01:19 +02:00
Dmitry Stogov
9e2c14c121 Fixed error messages 2015-04-06 17:24:32 +03:00
Anatol Belski
f0c533f421 fix build 2015-04-06 13:56:47 +02: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
Stanislav Malyshev
884b0365db Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68740 (NULL Pointer Dereference)
 2015-04-05 22:49:06 -07:00
Stanislav Malyshev
6a7a03644a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68740 (NULL Pointer Dereference)
 2015-04-05 22:48:37 -07:00