php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-03 14:12:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
95,394 Commits 547 Branches 1,481 Tags
fdff901cadef612fe64f0e0cc2eae38ce06008e7
Commit Graph

95394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kalle Sommer Nielsen
fdff901cad Fix the build 2016-04-06 22:25:05 +02:00
Anatol Belski
31abb8ab50 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix merge mistake
 2016-04-06 18:06:40 +02:00
Anatol Belski
6489edb958 fix merge mistake 2016-04-06 18:05:39 +02:00
Anatol Belski
fc90ddf1f3 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix tests
  PostgreSQL's PDOStatement::getColumnMeta() fills in table's name.
  fix indent
 2016-04-06 17:45:31 +02:00
Anatol Belski
26f9aa7211 fix tests 2016-04-06 17:43:49 +02:00
Petr Sýkora
aeb9c81c09 PostgreSQL's PDOStatement::getColumnMeta() fills in table's name. 2016-04-06 17:43:49 +02:00
Anatol Belski
052c1d337c fix indent 2016-04-06 17:43:49 +02:00
Dmitry Stogov
936f161402 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71978 (Existence of return type hint affects other compatibility rules)
 2016-04-06 17:20:43 +03:00
Dmitry Stogov
e9d65160e8 Fixed bug #71978 (Existence of return type hint affects other compatibility rules) 2016-04-06 17:17:10 +03:00
Anatol Belski
6170b2fbae Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix test
  fix bug #71667 (emulate how mssql extension names "computed" columns)
 2016-04-06 14:45:35 +02:00
Anatol Belski
ea64d290fe fix test 2016-04-06 14:44:23 +02:00
Adam Baratz
ed3edc2f05 fix bug #71667 (emulate how mssql extension names "computed" columns) 2016-04-06 14:41:55 +02:00
Anatol Belski
289de331d6 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
 2016-04-06 14:14:30 +02:00
Anatol Belski
c256a8c25e update NEWS 2016-04-06 14:13:43 +02:00
Anatol Belski
9056a36c9b Merge branch 'PHP-7.0' 
* PHP-7.0:
  add 32-bit specific variont for #62498
  skip test on 32-bit
 2016-04-06 14:07:03 +02:00
Anatol Belski
4f7d89a335 add 32-bit specific variont for #62498 2016-04-06 14:05:25 +02:00
Anatol Belski
02fc9cb31f skip test on 32-bit 
The Postgres INT8 datatype is handled as string on 32-bit
 2016-04-06 13:55:32 +02:00
Anatol Belski
2ead9be91b Merge branch 'PHP-7.0' 
* PHP-7.0:
  make opcache lockfile path configurable
 2016-04-06 13:50:24 +02:00
Fatih ACAR
d54eafb349 make opcache lockfile path configurable 
Signed-off-by: William Dauchy <william@gandi.net>
Signed-off-by: Baptiste Daroussin <baptiste.daroussin@gandi.net>
Signed-off-by: Fatih Acar <fatih.acar@gandi.net>
 2016-04-06 13:29:52 +02:00
Anatol Belski
2267812cd2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  return zvals instead of strings, cast or not based on stringify attribute
 2016-04-06 12:23:14 +02:00
Adam Baratz
1e1500a2bc return zvals instead of strings, cast or not based on stringify attribute 2016-04-06 12:18:53 +02:00
Anatol Belski
fe757f09a4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix test
  add skip slow test
 2016-04-06 08:24:09 +02:00
Anatol Belski
354a682c38 fix test 2016-04-06 08:21:10 +02:00
Anatol Belski
fd9137c00c add skip slow test 2016-04-06 08:18:32 +02:00
Xinchen Hui
306a842ef1 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed order
  Fixed bug #71969 (str_replace returns an incorrect resulting array after a foreach by reference)
  update NEWS
  Add driver-specific attributes for controlling calls to dbsetlogintime() and dbsettime()
 2016-04-06 10:21:21 +08:00
Xinchen Hui
4e1d435bd1 Fixed order 2016-04-06 10:21:05 +08:00
Xinchen Hui
e95782ed5e Fixed bug #71969 (str_replace returns an incorrect resulting array after a foreach by reference) 2016-04-06 10:19:24 +08:00
Dmitry Stogov
a186ac0e47 IS_CONST operands don't have to be separated. Use reference-counting instead of duplication. 
- with opcache all IS_CONST operands are not refcounted (scalars, interned strings or immutable arrays)
- without opcache IS_CONST operands are not shared between processes or threads and may use common reference counters
 2016-04-05 20:09:14 +03:00
Adam Baratz
a5e21665ee Add driver-specific attributes for controlling calls to dbsetlogintime() and dbsettime() 2016-04-05 18:24:15 +02:00
Anatol Belski
6ae3915eee update NEWS 2016-04-05 18:21:25 +02:00
Adam Baratz
8a92fed532 Add driver-specific attributes for controlling calls to dbsetlogintime() and dbsettime() 2016-04-05 18:18:37 +02:00
Dmitry Stogov
32d6ac4ddf RETURN micro optimization 2016-04-05 16:45:15 +03:00
Anatol Belski
ea4d27f47c Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  fix and extend test
  Don't roundtrip to the database to get the column type if you already know it
 2016-04-05 15:13:17 +02:00
Anatol Belski
df8f927446 update NEWS 2016-04-05 15:12:12 +02:00
Anatol Belski
c2cb4664bc fix and extend test 2016-04-05 15:06:17 +02:00
Joe Bylund
e10257ba80 Don't roundtrip to the database to get the column type if you already know it 
add_assoc_string now takes just three args

nikic's fix to move pqclear outside the if, would be a possible memory leak inside the if

(joe) check behavior of getColumnMeta
 2016-04-05 15:03:04 +02:00
Anatol Belski
b132aa49d1 Merge branch 'PHP-7.0' 
* PHP-7.0:
  remove description for apache 1.3
 2016-04-05 12:16:02 +02:00
DQNEO
ea0598962f remove description for apache 1.3 2016-04-05 12:13:38 +02:00
Anatol Belski
a1c4b6841a Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  update NEWS
 2016-04-05 11:56:20 +02:00
Anatol Belski
dedc9a4200 update NEWS 2016-04-05 11:55:36 +02:00
Anatol Belski
bbaa868c29 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update NEWS
 2016-04-05 11:55:03 +02:00
Anatol Belski
5ed05bc686 update NEWS 2016-04-05 11:52:53 +02:00
Anatol Belski
9f5970e60a Merge branch 'PHP-7.0' 
* PHP-7.0:
  Use STR_EMPTY_ALLOC macro instead
  Fix DateInterval::format segfault
 2016-04-05 11:24:45 +02:00
Anatol Belski
d10a8e4804 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Use STR_EMPTY_ALLOC macro instead
  Fix DateInterval::format segfault
 2016-04-05 11:24:23 +02:00
Thomas Punt
1aea777349 Use STR_EMPTY_ALLOC macro instead 2016-04-05 11:18:14 +02:00
Thomas Punt
40f14bad33 Fix DateInterval::format segfault 2016-04-05 11:18:14 +02:00
Matteo Beccati
b68e89ee7e Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71447 (Quotes inside comments not properly handled)
  Fixed a few PDO tests to conform to PDO Common standards
  news entry #69537
  Fix #69537: __debugInfo with empty string for key gives error
 2016-04-05 00:07:28 +02:00
Matteo Beccati
4090e709aa Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #71447 (Quotes inside comments not properly handled)
  Fixed a few PDO tests to conform to PDO Common standards
  news entry #69537
  Fix #69537: __debugInfo with empty string for key gives error

Conflicts:
	Zend/zend_compile.c
 2016-04-05 00:07:02 +02:00
Matteo Beccati
30925cd498 Fixed bug #71447 (Quotes inside comments not properly handled) 2016-04-04 23:50:28 +02:00
Matteo Beccati
9a87108eca Fixed a few PDO tests to conform to PDO Common standards 2016-04-04 23:43:17 +02:00