clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,802 Commits 491 Branches 1,363 Tags 837 MiB
a57a08e791
Commit Graph

818 Commits

Author SHA1 Message Date
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
Xinchen Hui
ef1bd8f0e6 Fixed bug #70389 (PDO constructor changes unrelated variables) 2015-08-30 05:02:38 -07:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Julien Pauli
4bf299a250 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
 2014-11-29 11:39:37 +01:00
Julien Pauli
1813fe9f38 Merge branch 'pull-request/656' into PHP-5.5 
* pull-request/656:
  PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
 2014-11-29 11:38:57 +01:00
Popa Marius Adrian
cf2cd8fb20 PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1 
cleanup and PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
 2014-11-29 11:38:36 +01: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
Lior Kaplan
11b18347d8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
 2014-06-16 23:32:10 +03:00
Lior Kaplan
c38b73a701 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
 2014-06-16 23:30:44 +03:00
Lior Kaplan
e667d23178 Update copyright year for re2c files as well 2014-06-16 23:26:50 +03:00
Matteo Beccati
7fd9898a2d Fixed bug #66604 'pdo/php_pdo_error.h' not copied to the include dir 2014-04-13 08:53:21 +02:00
Nikita Popov
eaf44ec397 Remove some usages of hashtable internals 2014-04-09 12:31:21 +02:00
Andrey Hristov
c1141d43e9 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-28 15:38:14 +02:00
Bob Weinand
e8bf18bd9f Merge branch 'PHP-5.4' into PHP-5.5 2014-01-28 13:33:44 +01:00
Bob Weinand
e9b4bca5a0 Fixed arginfo of PDO::__construct() to match the docs and zend_parse_parameters definition. 2014-01-28 13:31:52 +01:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Rasmus Lerdorf
6713f9c4b2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix broken test
 2013-11-09 09:46:55 -08:00
Rasmus Lerdorf
df7321359e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix broken test
 2013-11-09 09:46:43 -08:00
Rasmus Lerdorf
064ba179b1 Fix broken test 2013-11-09 09:45:52 -08:00
Rasmus Lerdorf
756dc19e59 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
 2013-11-07 18:09:53 -08:00
Rasmus Lerdorf
b3d522d215 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings

Conflicts:
	ext/pdo/pdo_sql_parser.c
 2013-11-07 18:09:15 -08:00
Rasmus Lerdorf
890ea8411f Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings 2013-11-07 18:05:08 -08:00
Xinchen Hui
2a94494b7e Merge branch 'PHP-5.5' 2013-11-05 11:09:08 +08:00
Xinchen Hui
d4f5ca467f Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	configure.in
	ext/mysqlnd/mysqlnd.c
	main/php_version.h
 2013-11-05 11:08:09 +08:00
Xinchen Hui
e3d9e18e7b Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception) 
I know zend_call_function will initilize retval_ptr_ptr, but still set
it to NULL explict is more readable
 2013-11-05 11:04:55 +08:00
Nikita Popov
0d7a638866 Implement variadic function syntax 
As per RFC: https://wiki.php.net/rfc/variadics
 2013-09-26 18:39:17 +02:00
Matteo Beccati
80917e5ca2 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed other compiler warnings
 2013-08-22 15:34:22 +02:00
Matteo Beccati
908da14bd1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed other compiler warnings
 2013-08-22 15:34:11 +02:00
Matteo Beccati
d5987478a8 Fixed other compiler warnings 2013-08-22 15:33:54 +02:00
Matteo Beccati
3ec28b1d1f Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed compiler warnings in ext/pgsql
  Fixed other compiler warnings in PDO_PGSQL
  Fixed compiler warning
  Update NEWS

Conflicts:
	ext/pdo_pgsql/pgsql_driver.c
 2013-08-21 11:26:41 +02:00
Matteo Beccati
4283f75c34 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed compiler warnings in ext/pgsql
  Fixed other compiler warnings in PDO_PGSQL
  Fixed compiler warning
 2013-08-21 11:24:27 +02:00
Matteo Beccati
5c06e5c2e0 Fixed compiler warning 
I moved the constant to the enum in order to avoid this:
ext/pgsql/pgsql.c:3491: warning: comparison is always false due to limited range of data type

Works in gcc 4.6, but I'm not sure about other compilers.
 2013-08-21 11:22:32 +02:00
Christopher Jones
89c4abab2b Merge branch 'PHP-5.5' 
* PHP-5.5:
  Quash compile warning "warning: 'flags' may be used uninitialized in this function"
 2013-08-20 13:37:22 -07:00
Christopher Jones
268c2884fa Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Quash compile warning "warning: 'flags' may be used uninitialized in this function"
 2013-08-20 13:37:02 -07:00
Christopher Jones
e9b12bedc3 Quash compile warning "warning: 'flags' may be used uninitialized in this function" 2013-08-20 13:36:18 -07:00
Michael Wallner
90218e8e7a Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix bug #64953 (Postgres prepared statement positional parameter casting)
 2013-08-20 19:22:31 +02:00
Michael Wallner
7f3e7eb958 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #64953 (Postgres prepared statement positional parameter casting)

Conflicts:
	ext/pdo/pdo_sql_parser.c
 2013-08-20 19:21:53 +02:00
Michael Wallner
27c803aaed Fix bug #64953 (Postgres prepared statement positional parameter casting) 2013-08-20 19:19:02 +02:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
1b06e0be96 typo fixes 2013-07-15 00:19:49 -07:00
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Anatol Belski
eb190bb571 Fixed symbol export 
That's needed for baabd11929 to link
properly.
 2013-06-27 14:00:56 +02:00
Xinchen Hui
0842d5c06e Merge branch 'PHP-5.5' 2013-06-16 22:57:01 +08:00
Xinchen Hui
6cd6349ff8 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-16 22:56:22 +08:00
Xinchen Hui
49e57a3165 Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to the same db server) 2013-06-16 22:55:59 +08:00
Stanislav Malyshev
8ac131503d Merge branch 'PHP-5.5' 
* PHP-5.5:
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'
 2013-06-10 14:31:57 -07:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00