9134f9e98f
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/mysql/php_mysql.c
2015-11-16 17:59:46 +08:00
be6fd4ba89
Fixed bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction)
...
Actually, this only be fixed if php uses mysqlnd
2015-11-16 16:59:55 +08:00
01c844a01d
use Z* macro name
2015-11-05 22:39:10 +01:00
1406f80135
fix leak
2015-11-05 21:49:21 +01:00
7b32b8f4e1
fix pdo_mysql crash with empty bound stream param
...
rel #70862
2015-11-05 21:32:31 +01:00
73384728ca
Fix bug #64172
...
Check if the SQLSTATE error code is equal to PDO_ERR_NONE before we ask the driver.
And if no error is reported skip the extra call to the driver.
2015-10-18 17:06:54 -07:00
307c1f6bf0
Fix bug #64172
...
Check if the SQLSTATE error code is equal to PDO_ERR_NONE before we ask the driver.
And if no error is reported skip the extra call to the driver.
2015-10-18 17:03:39 -07:00
ccb677ece8
Fixed test running on MarinaDB.
2015-10-07 12:21:43 +03:00
014abbc840
Merge branch 'PHP-5.6'
...
Conflicts:
ext/pdo/pdo_dbh.c
ext/pdo/php_pdo_driver.h
2015-08-30 05:32:37 -07:00
ef1bd8f0e6
Fixed bug #70389 (PDO constructor changes unrelated variables)
2015-08-30 05:02:38 -07:00
4ad0714d76
fork test
2015-08-20 13:32:29 +02:00
dca6d1027a
Fixed bug #70272 (Segfault in pdo_mysql)
2015-08-18 18:33:07 +08:00
4e66cce87c
switch to the unified globals accessor where appropriate
2015-07-29 13:26:35 +02:00
5c95226d50
Various warning fixes
2015-07-17 20:18:25 +02:00
e97d5fab35
Update exception names in tests after formatting changes.
2015-05-17 17:31:43 -05:00
fb7206e452
Merge branch 'master' into throwable-interface
2015-05-17 16:15:35 -05:00
3ae995f03c
Tweak uncaught exception message display
...
This implements a reduced variant of #1226 with just the following
change:
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d
+Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d
The '' wrapper around messages is very weird if the exception
message itself contains ''. Futhermore having the message wrapped
in '' doesn't work for the "and defined" suffix of
TypeExceptions.
2015-05-17 18:47:06 +02:00
64b167d201
Updated tests to reflect exception class changes.
2015-05-16 16:49:14 -05:00
c9f27ee422
Display EngineExceptions like ordinary exceptions
...
TypeException stays as-is for now because it uses messages that are
incompatible with the way exception messages are displayed.
closure_038.phpt and a few others now show that we're generating
too many exceptions for compound operations on undefined properties
-- this needs to be fixed in a followup.
2015-05-15 23:40:32 +02:00
70c86732cb
Use zend_string to represent pdo_column_data.name and avoid duplication.
2015-05-05 16:19:51 +03:00
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
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
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
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
9991b8ecee
sigh, can't even copypaste without screwing up
2015-04-02 00:07:00 +02:00
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
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
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
0328a60eec
Merge branch 'PHP-5.6'
...
* PHP-5.6:
test fixes
2015-04-01 22:08:29 +02:00
faab430141
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
test fixes
2015-04-01 22:08:11 +02:00
0a41af216e
test fixes
2015-04-01 22:07:52 +02:00
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
19360f386e
cleanup mod version macros, round 3
2015-03-23 20:54:55 +01:00
a30d328671
Errors converted to exceptions are not "recoverable" anymore.
2015-03-10 10:31:55 +03:00
7fa1009560
Like Shady, --with-mysql-sock is back.
...
As Matteo pointed out, MySQLi and PDO_MySQL both rely on this.
2015-03-05 19:00:02 +00:00
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
f384971552
Look for PDO include files in the right folder
...
Configure scripts for extensions look for PDO include files in
$prefix/include/php. This change makes them look into $phpincludedir
instead, which may be different from $prefix/include/php.
2015-02-06 12:06:29 +01:00
dfe6aea9ca
size_t cleanup for PDO
2015-01-26 16:16:02 -08:00
29688512b4
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
updated NEWS
PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
Conflicts:
ext/pdo_mysql/mysql_driver.c
2015-01-15 17:51:43 +01:00
3d6a83a7d0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
2015-01-15 17:48:11 +01:00
7c9633412e
PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
...
Unix uses "127.0.0.1" as default host for named pipes,
while when using Windows a "." is required as host by mysqlnd.
(This can be seen at mysqlnd.c (line 945 or searching #ifndef PHP_WIN32)
2015-01-15 16:42:51 +01:00
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
a51de2168d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Update test after fixing bug #68371
2015-01-05 12:12:02 +01:00
38f1b569c2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update test after fixing bug #68371
2015-01-05 12:11:46 +01:00
ea1c0c5627
Update test after fixing bug #68371
2015-01-05 12:11:16 +01:00
7d0887a229
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2015-01-05 10:48:40 +01:00
488d3dac2e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2015-01-05 10:48:18 +01:00
Xinchen Hui