diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2009-12-06 19:34:12 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2009-12-06 19:34:12 +0000 |
| commit | bf550fe8da6d9c302b64bdb1ff308ee989bd4fd3 (patch) | |
| tree | c85a49aaf26f6d547fb675ec16970f6eb9f293c5 | |
| parent | 30188d3c58ed0221e812dfc92d9edd89d3705738 (diff) | |
| download | php-git-bf550fe8da6d9c302b64bdb1ff308ee989bd4fd3.tar.gz | |
Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN).
| -rw-r--r-- | NEWS | 1 | ||||
| -rwxr-xr-x | ext/pdo/pdo.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -33,6 +33,7 @@ PHP NEWS - Fixed bug #50345 (nanosleep not detected properly on some solaris versions). (Jani) - Fixed bug #50340 (php.ini parser does not allow spaces in ini keys). (Jani) +- Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN). (Ilia) - Fixed bug #50285 (xmlrpc does not preserve keys in encoded indexed arrays). (Felipe) - Fixed bug #50282 (xmlrpc_encode_request() changes object into array in diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index 3ecc46e14a..e986aaa225 100755 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -245,7 +245,7 @@ PDO_API int php_pdo_parse_data_source(const char *data_source, semi = i++; break; } - if (data_source[i] == ';') { + if (data_source[i] == ';' && ((i + 1 >= data_source_len) || data_source[i+1] != ';')) { semi = i++; break; } |