Xinchen Hui
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
Andrey Hristov
0a7e08d385
MNDR:
...
- cleanup in mysqlnd_result.c
- switch from zend_ulong to size_t for lengths. Accordingly change
mysqli and pdo_mysql for this.
2015-11-12 16:19:16 +01:00
Anatol Belski
01c844a01d
use Z* macro name
2015-11-05 22:39:10 +01:00
Anatol Belski
1406f80135
fix leak
2015-11-05 21:49:21 +01:00
Anatol Belski
7b32b8f4e1
fix pdo_mysql crash with empty bound stream param
...
rel #70862
2015-11-05 21:32:31 +01:00
Daniel Persson
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
Daniel Persson
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
Dmitry Stogov
ccb677ece8
Fixed test running on MarinaDB.
2015-10-07 12:21:43 +03:00
Xinchen Hui
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
Xinchen Hui
ef1bd8f0e6
Fixed bug #70389 (PDO constructor changes unrelated variables)
2015-08-30 05:02:38 -07:00
Anatol Belski
4ad0714d76
fork test
2015-08-20 13:32:29 +02:00
Xinchen Hui
dca6d1027a
Fixed bug #70272 (Segfault in pdo_mysql)
2015-08-18 18:33:07 +08:00
Anatol Belski
4e66cce87c
switch to the unified globals accessor where appropriate
2015-07-29 13:26:35 +02:00
Nikita Popov
5c95226d50
Various warning fixes
2015-07-17 20:18:25 +02:00
Aaron Piotrowski
e97d5fab35
Update exception names in tests after formatting changes.
2015-05-17 17:31:43 -05:00
Aaron Piotrowski
fb7206e452
Merge branch 'master' into throwable-interface
2015-05-17 16:15:35 -05:00
Nikita Popov
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
Aaron Piotrowski
64b167d201
Updated tests to reflect exception class changes.
2015-05-16 16:49:14 -05:00
Nikita Popov
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
Dmitry Stogov
70c86732cb
Use zend_string to represent pdo_column_data.name and avoid duplication.
2015-05-05 16:19:51 +03: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
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
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
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
Anatol Belski
19360f386e
cleanup mod version macros, round 3
2015-03-23 20:54:55 +01:00
Dmitry Stogov
a30d328671
Errors converted to exceptions are not "recoverable" anymore.
2015-03-10 10:31:55 +03:00
Adam Harvey
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
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
Maxime BESSON
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
Stanislav Malyshev
dfe6aea9ca
size_t cleanup for PDO
2015-01-26 16:16:02 -08:00
Anatol Belski
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
Anatol Belski
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
steffen
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
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Matteo Beccati
a51de2168d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Update test after fixing bug #68371
2015-01-05 12:12:02 +01:00
Matteo Beccati
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
Matteo Beccati
ea1c0c5627
Update test after fixing bug #68371
2015-01-05 12:11:16 +01:00
Matteo Beccati
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
Matteo Beccati
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
Matteo Beccati
7d2f8525d8
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2015-01-05 09:25:48 +01:00
Andrea Faulds
e5eb9530ab
Use "float" and "integer" in typehint and zpp errors
2014-12-21 13:23:02 +00:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Anatol Belski
ba35b22bc4
Merge remote-tracking branch 'origin/master' into native-tls
...
* origin/master: (35 commits)
Fixed bug #68398 msooxml matches too many archives
Fix zpp call in apache_getenv()
Drop unnecessary zval containers
fixed test
C89 compat
add include for missing localeconv_r proto
updated NEWS
Fixed bug #65230 setting locale randomly broken
Fix compilation error (ref #68424 )
Removed useless handlers
Move checks for references into slow paths of operator functions. Remove duplicate opcode handlers.
Revert unintentional docblock change
Restored zip/oci8 PHP 4 code, add PHP 7 checks
Note macro removal in UPGRADING.INTERNALS
Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!)
Zend Engine 3
Updated NEWS
Updated NEWS
Updated NEWS
Start adding new attribute to control multi statements
...
2014-12-06 21:37:15 +01:00
Anatol Belski
42d7cb4c2c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
C89 compat
add include for missing localeconv_r proto
2014-12-06 12:18:36 +01:00
Anatol Belski
08241ee3f3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
C89 compat
add include for missing localeconv_r proto
2014-12-06 12:18:05 +01:00
Anatol Belski
9016018ccc
C89 compat
2014-12-06 12:14:17 +01:00
Matteo Beccati
b120f9beb2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix compilation error (ref #68424 )
2014-12-06 10:24:27 +01:00
Matteo Beccati
625b929c6e
Fix compilation error (ref #68424 )
2014-12-06 10:23:56 +01:00
Julien Pauli
5a528076d2
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated NEWS
Updated NEWS
Start adding new attribute to control multi statements
2014-12-05 17:06:33 +01:00
Julien Pauli
5104c2bbc3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Start adding new attribute to control multi statements
2014-12-05 17:05:37 +01:00
pwolanin
4c0bd5e77a
Start adding new attribute to control multi statements
2014-12-05 17:03:31 +01:00
Anatol Belski
3ca0ca1548
Merge remote-tracking branch 'origin/master' into native-tls
...
* origin/master: (102 commits)
fix dir separator in test
fix TS build
fix TS build
Better fix for bug #68446
Revert "Merge remote-tracking branch 'origin/PHP-5.6'"
Revert NEWS and set test to XFAIL
Revert "Fix bug #68446 (bug with constant defaults and type hints)"
Improved zend_hash_clean() and added new optimized zend_symtable_clean()
Use inline version of zval_ptr_dtor()
Added new optimized zend_array_destroy() function
Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h
fix REGISTER_NS_*_CONSTANT macros
Removed useless assert. EG(uninitialized_zval) can't be refcounted.
Use specialized destructors when types of zvals are known.
move tests into proper place
Improved assignment to object property
Reuse zend_assign_to_variable() in zend_std_write_property()
cleanup comments from svn/cvs era
fix dir separator in test
fork test for windows
...
2014-11-26 08:17:35 +01:00
Veres Lajos
06fdf359e3
typo fixes - https://github.com/vlajos/misspell_fixer
2014-11-23 14:52:47 -08:00
Veres Lajos
4dc994571d
typo fixes - https://github.com/vlajos/misspell_fixer
...
Conflicts:
ext/ftp/ftp.h
ext/pcre/pcrelib/pcre_printint.c
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pgsql/pgsql.c
ext/phar/func_interceptors.c
ext/soap/soap.c
ext/standard/image.c
2014-11-23 14:33:43 -08:00
Matteo Beccati
3e4b91ec7f
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2014-11-10 08:16:35 +01:00
Anatol Belski
aac7b1db7c
converted ext/sqlite and ext/pdo_mysql to use static tsrmls cache
2014-10-16 18:50:19 +02:00
Timm Friebe
e83580c1f0
Merge branch 'master' into catchable-fatals/methods-on-non-objects
2014-09-25 19:45:05 +02:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Xinchen Hui
39c3207896
Revert previous commit by mistake
2014-09-04 11:59:58 +08:00
Xinchen Hui
e90ec235dc
Use PHP_GINIT to suppress incompatible pointer type
2014-09-04 11:56:13 +08:00
Anatol Belski
af59e92b24
master renames phase 7
2014-08-25 21:51:49 +02:00
Anatol Belski
28b7a03318
master renamings phase 5
2014-08-25 21:20:44 +02:00
Anatol Belski
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
Anatol Belski
eb1871b3fb
yet trivial fixes to mysql exts
2014-08-21 09:54:40 +02:00
Anatol Belski
4ed156d4df
ported from pdo - pgsql, odbc, mysql, firebirt, dblib
2014-08-19 19:02:07 +02:00
Anatol Belski
63d3f0b844
basic macro replacements, all at once
2014-08-19 08:07:31 +02:00
Timm Friebe
c3d214aa08
MFH
2014-08-16 17:38:20 +02:00
Xinchen Hui
da3aeeed39
clean up - avoid realloc
2014-08-13 15:51:43 +08:00
Timm Friebe
9b6062071e
Adjust expected fatal error message
...
Now also includes "on [TYPE]" after merge from master
2014-07-06 17:07:41 +02:00
Timm Friebe
a1554ca634
Merge in changes from master
...
Now also includes "on [TYPE]" in "Call to a member function" error
2014-07-06 17:07:01 +02:00
Xinchen Hui
8ce23d8f4f
Don't use zend_string for other fields (only name here is enough)
2014-06-25 00:42:20 +08:00
Xinchen Hui
92a7089893
Use zend_string in mysqlnd
2014-06-23 19:27:24 +08:00
Xinchen Hui
c135ca0a9d
Actually, I don't know how it works. (maybe I should re-start again :<)
2014-06-23 15:35:53 +08:00
Dmitry Stogov
629c9d3eda
Merge branch 'master' into phpng
...
* master:
Fixed MarinaDB support
2014-06-20 14:02:15 +04:00
Dmitry Stogov
f08a5bfadc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed MarinaDB support
2014-06-20 13:58:26 +04:00
Dmitry Stogov
f0639611cf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed MarinaDB support
2014-06-20 13:57:38 +04:00
Dmitry Stogov
680ddabac1
Fixed MarinaDB support
2014-06-20 13:56:32 +04:00
Xinchen Hui
d632870e4d
Fixed memory leak
2014-06-20 13:27:56 +08:00
Xinchen Hui
73630a1fdc
Fixed pdo_mysql build with mysqlnd
2014-06-19 23:00:45 +08:00
Dmitry Stogov
dd1c68e67f
Merge branch 'master' into phpng
...
* master: (77 commits)
NEWS entry for Fix potential segfault in dns_get_record()
NEWS entry for "Fix potential segfault in dns_get_record()"
NEWS entry for Fix potential segfault in dns_get_record(
Fix potential segfault in dns_get_record()
Revert "Add optional second arg to unserialize()"
5.5.15 now
update NEWS
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
Fix broken test.
Add a mime type map generation script and update the header.
Move the mime type map out of php_cli_server.c for easier generation.
Replace the CLI server's linear search for extensions with a hash table.
fix test
Remove unused included file
NEWS
NEWS
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
...
Conflicts:
Zend/zend_closures.c
Zend/zend_execute.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/spl/spl_array.c
ext/standard/basic_functions.c
ext/standard/dns.c
ext/standard/var.c
2014-06-12 05:07:33 +04:00
Boro Sitnikovski
cfccdc6362
Bug 64744
...
Show the type of the non-object for more descriptive errors
2014-06-08 19:14:58 -07:00
Xinchen Hui
3a1f79d51d
Fixed bug #47407
2014-05-27 11:48:25 +08:00
Dmitry Stogov
b38bb265d4
Fixed test. The warning actually indicate a problem in master that we didn't repeat in phpng.
2014-05-19 22:20:02 +04:00
Dmitry Stogov
4e521c92ec
Prevent crash in case of SQL error
2014-05-19 11:52:33 +04:00
Dmitry Stogov
c25f09e6ab
Reverted wrong commit
...
Xinchen, stop commit changed configs :)
You may use environment variables to ovverride default settings
2014-05-13 21:29:57 +04:00
Xinchen Hui
618de55485
restore unexpected commit
2014-05-13 12:25:03 +08:00
Xinchen Hui
7541f93f97
ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well while building with libmysql
2014-05-08 18:34:56 +08:00
Xinchen Hui
28e6a2b452
Revert "ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well while building with libmysql"
...
This reverts commit 29b3529292
.
2014-05-08 18:34:40 +08:00
Xinchen Hui
29b3529292
ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well while building with libmysql
2014-05-08 18:30:21 +08:00