[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/pdo_sqlite/sqlite_driver.c ext/sqlite3/sqlite3.c

[Johannes Schlüter]

Commit:    af516750ff32f69c1df10155fa8ec0c9cc5b70ff
Author:    Johannes Schlüter <johan...@php.net>         Fri, 22 Jun 2012 
12:50:30 +0200
Parents:   041dd77135c89af821b483a3c1f485bfaf6cfb50 
055ecbc62878e86287d742c7246c21606cee8183
Branches:  PHP-5.4 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=af516750ff32f69c1df10155fa8ec0c9cc5b70ff

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Improve check for :memory: pseudo-filename in SQlite

Conflicts:
        ext/sqlite3/sqlite3.c

Changed paths:
  MM  ext/pdo_sqlite/sqlite_driver.c
  MM  ext/sqlite3/sqlite3.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php