1
0
mirror of https://github.com/php/php-src.git synced 2026-04-23 07:58:20 +02:00
Commit Graph

90 Commits

Author SHA1 Message Date
Johannes Schlüter d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski 2ace2d1b8a reduce struct size by 8 byte on 64 bit 2014-09-17 09:16:00 +02:00
Anatol Belski af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski 63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Anatol Belski 41115d3d9d regenerated parser files 2014-08-17 21:05:20 +02:00
Dmitry Stogov b108267f2c Merge branch 'master' into phpng
* master: (41 commits)
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  NEWS
  Fix Request #67453 Allow to unserialize empty data.
  Update copyright year to 2014
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
  Fix patch for bug #67436
  fix failed test
  Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.
  Added tests for bug 67436
  Fixed wrong XFAIL test - already fixed
  Fix typo in Bug #67406 NEWS entry
  Fix typo in Bug #67406 NEWS entry
  ...

Conflicts:
	Zend/zend_compile.c
	ext/session/session.c
	ext/standard/array.c
	ext/standard/http_fopen_wrapper.c
	tests/classes/bug63462.phpt
2014-06-18 17:50:27 +04:00
Xinchen Hui 204e580fcd Fixed Hash API usage 2014-05-18 20:25:07 +08:00
Xinchen Hui af3829608d Fixed Hash API usage 2014-05-18 20:23:26 +08:00
Xinchen Hui be79628b87 Fixed REFERENCE handling 2014-05-08 16:11:50 +08:00
Xinchen Hui 5f46c8fa31 Fixed bugs in pdo_mysql 2014-05-08 15:19:43 +08:00
Dmitry Stogov 17d027ed47 Split IS_BOOL into IS_FALSE and IS_TRUE 2014-04-30 18:32:42 +04:00
Xinchen Hui bdfef93b42 Refactor PDO (only compilable now) 2014-04-22 18:23:03 +08:00
Xinchen Hui c081ce628f Bump year 2014-01-03 11:08:10 +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
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
Stanislav Malyshev 84e35fb2e0 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
2013-06-10 13:36:41 -07:00
Veres Lajos ed2e84e239 typo fixes (accommodate, parameter) 2013-06-10 13:36:03 -07:00
Xinchen Hui a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui 0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Sebastian Bergmann eab14993fe Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files. 2012-12-06 09:28:35 +01:00
Johannes Schlüter c06ec6bde4 Commit generated file 2012-04-19 12:47:09 +02:00
Johannes Schlüter e946eaca0b Update generated file. 2012-04-18 22:49:03 +02:00
Felipe Pena e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena 087a134b50 - Fixed bug #54929 (Parse error with single quote in sql comment) 2011-06-04 22:54:40 +00:00
Felipe Pena 927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Sebastian Bergmann 9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Sebastian Bergmann 08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Felipe Pena c29ebd8a23 - MFH: Better fix 2008-11-13 18:14:50 +00:00
Felipe Pena 494dbdb1c1 - MFH: Fixed invalid reads 2008-11-13 13:08:12 +00:00
Felipe Pena 981a23fff3 - MFH: Fixed bug #43925 (Incorrect argument counter in prepared statements with pgsql) 2008-10-23 18:53:05 +00:00
Felipe Pena 1f54af9245 MFH:
- Fixed bug #44251 (Question mark and an escaped singel quote lead to an exception)
- Fixed bug #41125 (PDO mysql + quote() + prepare() can result in seg fault)
  Patch by: tsteiner at nerdclub dot net
2008-10-10 12:10:41 +00:00
Sebastian Bergmann d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Ilia Alshanetsky 0c0456d275 Revert addition of - char support for bound param names 2007-11-26 21:09:50 +00:00
Ilia Alshanetsky c27a8a41c2 Fixed bug #43130 (Bound parameters cannot have - in their name) 2007-10-29 22:36:26 +00:00
Ilia Alshanetsky c084d1c829 Fixed bug #41596 (Fixed a crash inside pdo_pgsql on some non-well-formed
SQL queries).
2007-06-05 22:55:27 +00:00
Ilia Alshanetsky ff3e825083 Fixed bug #40417 (Allow multiple instances of the same named PDO token in
prepared statement emulation code).
2007-03-06 00:52:55 +00:00
Ilia Alshanetsky a8c006235c Better generated parser 2007-02-02 00:03:33 +00:00
Ilia Alshanetsky c219c6f4a8 Fixed bug #40285 (The PDO prepare parser goes into an infinite loop in
some instances).
2007-02-01 00:12:39 +00:00
Nuno Lopes b6dff166bf MFH: fix infinite cycle
#this was the infinite cycle that was bugging me in the gcov machine...
2007-01-03 22:05:24 +00:00
Sebastian Bergmann 4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Ilia Alshanetsky e5ad7bf299 Fixed bug #36798 (Error parsing named parameters with queries containing
high-ascii chars).
2006-12-05 18:04:59 +00:00
Ilia Alshanetsky 4356aad0ae Fixed bug #39483 (Problem with handling of \ char in prepared statements). 2006-12-04 00:38:46 +00:00
Ilia Alshanetsky 44baca5aed Added missing check for mismatching number of tokens & bound params in
prepared statement emulation.
2006-12-03 23:27:44 +00:00
Ilia Alshanetsky af16066603 Fixed a possible crash 2006-11-23 14:41:35 +00:00
Ilia Alshanetsky 6e9c7c4aa9 Fixed generated file 2006-11-12 17:55:44 +00:00
Ilia Alshanetsky c32ed59e4e Fixed a memory leak when named & positional params are being used in the
same query.
2006-11-12 17:49:19 +00:00
Ilia Alshanetsky 8fde2249c3 Properly rewrite queries where a bound parameter appears more then once. 2006-01-25 16:35:23 +00:00