clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
85,927 Commits 491 Branches 1,363 Tags 841 MiB
f5130c3058
Commit Graph

323 Commits

Author SHA1 Message Date
Matteo Beccati
f5130c3058 Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving) 2014-11-06 16:35:49 +01:00
Matteo Beccati
f9a77b71e2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66584 Segmentation fault on statement deallocation
 2014-11-01 19:21:38 +01:00
Matteo Beccati
e12d69df0c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66584 Segmentation fault on statement deallocation
 2014-11-01 19:20:43 +01:00
Matteo Beccati
69f6aee35c Fixed bug #66584 Segmentation fault on statement deallocation 2014-11-01 19:19:56 +01:00
Anatol Belski
e2305ac27e Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix ZTS build
 2014-10-31 19:53:59 +01:00
Anatol Belski
1b1f7c627a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix ZTS build
 2014-10-31 19:53:39 +01:00
Anatol Belski
1fc80d0ca7 fix ZTS build 2014-10-31 19:53:16 +01:00
Matteo Beccati
ddcd221e5e Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
  Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
 2014-10-31 18:58:59 +01:00
Matteo Beccati
e797db8909 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
  Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
 2014-10-31 18:57:59 +01:00
Matteo Beccati
9580fcfedd Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction 2014-10-31 18:11:32 +01:00
Dmitry Stogov
fb85d0322d Fixed compilation 2014-10-17 19:25:43 +04:00
Matteo Beccati
9935bf7df7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
  News entry for new curl constants
 2014-10-17 16:48:58 +02:00
Matteo Beccati
8c5e2e66bc Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads) 2014-10-17 16:22:52 +02:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski
4db2181d4e make this test a bit more tolerant when checking sleep time 2014-09-12 14:39:19 +02:00
Anatol Belski
257ed4061a 's' works with size_t round 2 2014-08-27 20:49:33 +02:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski
b9514bb8fd master renames phase 6 2014-08-25 21:26:42 +02:00
Anatol Belski
4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
70de6180d5 fixes to %pd format usage 2014-08-24 02:35:34 +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
Dmitry Stogov
9dd66e4d53 Merge branch 'master' into phpng 
* master:
  Fixed issue #183 (TMP_VAR is not only used once)
  Fix broken Junit output with --disable-cgi
  Added folder mark
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
  Added tests for ZipArchive::addGlob() and ZipArchive::addPattern()
  Fix run-tests.php with Valgrind >= 3.10.0.
  Add microseconds to the serialised form of DateTime objects.
  Improved test for bug #62479
  fix typo in ODBC code
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  5.5.14 now
  Fix bug #67060: use default mode of 660

Conflicts:
	ext/date/php_date.c
 2014-05-26 10:52:43 +04:00
Matteo Beccati
b41ad9bfcb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Improved test for bug #62479
 2014-05-21 18:59:14 +02:00
Matteo Beccati
69d4a0b8d5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Improved test for bug #62479
 2014-05-21 18:59:02 +02:00
Matteo Beccati
00a22d4d06 Improved test for bug #62479 2014-05-21 18:58:14 +02:00
Xinchen Hui
f2028491aa Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng 
Conflicts:
	ext/pdo_pgsql/tests/common.phpt
 2014-05-20 15:50:41 +08:00
Xinchen Hui
4d299b5092 Revert changes to configs by accident 2014-05-20 11:31:39 +08:00
Xinchen Hui
9c98c1f888 Refactored ext/ldap 2014-05-20 11:29:37 +08:00
Xinchen Hui
e1317ed517 Refactored ext/ldap 2014-05-20 11:26:26 +08:00
Xinchen Hui
4aaab964d7 Fixed uninitialized value used 2014-05-16 14:59:16 +08:00
Xinchen Hui
e8c2b54b9e Finish ext/pdo_pgsql (3 tests fail, 1 due to knew issue, 2 also fails in trunk) 2014-05-16 14:38:24 +08:00
Xinchen Hui
34bb45e92d Fixed several test failed 2014-05-16 14:18:11 +08:00
Pierre Joye
19f6476d19 fix void* ptr arithmetic 2014-05-15 18:09:50 +02:00
Xinchen Hui
49df66be01 Made a little clean up 2014-05-15 22:33:13 +08:00
nikita2206
b7f6bc5103 add support for pdo-pgsql in phpng refactoring 2014-05-15 16:18:50 +04:00
Dmitry Stogov
f9927a6c97 Merge mainstream 'master' branch into refactoring 
During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c
 2014-04-26 00:32:51 +04:00
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Matteo Beccati
e378348a31 Added new PDO::PGSQL_ATTR_DISABLE_PREPARES that uses PQexecParams 
Faster than prepared statements when queries are run once. Slightly
slower than PDO::ATTR_EMULATE_PREPARES but without the potential
security implications of embedding parameters in the query itself.
 2014-03-11 23:10:48 +01:00
Matteo Beccati
d72621ab9e Deprecated PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT 2014-03-11 23:10:48 +01:00
Matteo Beccati
b1ffea3ccc Drop PDO support for extremely old libpq versions 
configure will now fail if any of the following function is missing:
* PQprepare
* PQexecParams
* PQescapeStringConn
* PQescapeByteaConn
 2014-03-11 23:10:47 +01:00
Stanislav Malyshev
6d6850b3b8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test bug62479.phpt
 2014-01-25 23:27:21 -08:00
Stanislav Malyshev
ce1e1bb5d8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test bug62479.phpt
 2014-01-25 23:26:29 -08:00
Stanislav Malyshev
4e308abf28 fix test bug62479.phpt 2014-01-25 23:25:39 -08:00
Will Fitch
fb2091b1d4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #62479: Some chars not parsed in passwords
 2014-01-18 19:41:45 -05:00
Will Fitch
98907a96f9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #62479: Some chars not parsed in passwords
 2014-01-18 19:40:54 -05:00
Will Fitch
da83b513b2 Fix #62479: Some chars not parsed in passwords 
This fixes an issue where backslashes and spaces aren't
correctly parsed for passwords.
 2014-01-18 19:27:40 -05:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00