php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 09:12:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
104,526 Commits 547 Branches 1,481 Tags
020fdfd55dc534eecab12a53bb3ef50d7a71e5cb
Commit Graph

868 Commits

Author SHA1 Message Date
Anatol Belski
f936a17c12 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix test compat for PostgreSQL 10
 2017-10-27 15:04:54 +02:00
Anatol Belski
36b27f2ba5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix test compat for PostgreSQL 10
 2017-10-27 15:04:29 +02:00
Anatol Belski
24b1bb0abd Fix test compat for PostgreSQL 10 2017-10-27 14:58:43 +02:00
Sara Golemon
d0d7db8b3f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Decref default_link when clearing
 2017-10-24 11:38:24 -04:00
Sara Golemon
53fe84bfcc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Decref default_link when clearing
 2017-10-24 11:38:17 -04:00
Sara Golemon
68e27b0763 Decref default_link when clearing 2017-10-24 11:37:59 -04:00
Sara Golemon
ece23ea20f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Bugfix#75419 Fix clearing of default link during pg_close()
 2017-10-23 14:44:40 -04:00
Sara Golemon
781521e112 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Bugfix#75419 Fix clearing of default link during pg_close()
 2017-10-23 14:44:28 -04:00
Sara Golemon
a645af4456 Bugfix#75419 Fix clearing of default link during pg_close() 2017-10-23 14:44:00 -04:00
Joe Watkins
68801c9a30 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix 00version.phpt when commit message has multiple lines.
 2017-01-26 11:36:50 +00:00
Joe Watkins
bf914ff75a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix 00version.phpt when commit message has multiple lines.
 2017-01-26 11:36:36 +00:00
Mitch Hagstrand
a3d3f76827 Fix 00version.phpt when commit message has multiple lines. 
The environment variable "TRAVIS_COMMIT_MESSAGE" can contain multiple lines.

An example can be seen here https://travis-ci.org/php/php-src/jobs/195465293
 2017-01-26 11:36:24 +00:00
Sammy Kaye Powers
dac6c639bb Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9 Update copyright headers to 2017 2017-01-04 11:14:55 -06:00
Sammy Kaye Powers
9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06:00
Anatol Belski
b869f22c4b Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix dir separator
  Update NEWS for the build
 2016-12-01 01:37:24 +01:00
Anatol Belski
60c875b072 fix dir separator 2016-12-01 01:36:29 +01:00
Anatol Belski
b204b3abd1 further normalizations, uint vs uint32_t 
fix merge mistake

yet one more replacement run
 2016-11-26 17:29:01 +01:00
Anatol Belski
6bf85617c5 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #73498
  Add a test for bug 73498
 2016-11-22 00:47:30 +01:00
Anatol Belski
fc7d6e3ba5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73498
  Add a test for bug 73498
 2016-11-22 00:46:54 +01:00
Anatol Belski
58aa1a70a0 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #73498
  Add a test for bug 73498
 2016-11-22 00:46:03 +01:00
Craig Duncan
644e290fcd Fix bug #73498 
Postgres uses the DELIMITER keyword since 7.3
And WITH is no longer required/used
 2016-11-22 00:42:45 +01:00
Craig Duncan
d36d4c70d3 Add a test for bug 73498 2016-11-22 00:42:45 +01:00
Nikita Popov
45f7b2bcc8 Fix CRLF line-endings in tests 
Also fix a single instance of CRLF in ibase_query.c.
 2016-11-20 22:31:24 +01:00
Stanislav Malyshev
3b78cabc88 More int->size_t and string overflow fixes 2016-11-05 14:00:47 -07:00
Stanislav Malyshev
bbdd6a65e2 Merge branch 'PHP-7.1' 
* PHP-7.1:
  More int->size_t and string overflow fixes
 2016-11-05 13:59:56 -07:00
Stanislav Malyshev
f7f8aae33c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  More int->size_t and string overflow fixes
 2016-11-05 13:59:35 -07:00
Stanislav Malyshev
669763d88a More int->size_t and string overflow fixes 2016-11-05 13:22:17 -07:00
Stanislav Malyshev
19866fb76c Fix various int size overflows. 
Add function for detection of string zvals with length that does not fit
INT_MAX.
 2016-09-12 21:04:23 -07:00
Nikita Popov
e0e5063173 Drop some pieces of commented-out code 2016-09-04 12:56:06 +02:00
Anatol Belski
1b2a06fe64 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix leak and error check order
 2016-09-03 17:04:43 +02:00
Anatol Belski
c9040d43a8 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix leak and error check order
 2016-09-03 17:03:55 +02:00
Anatol Belski
9513187dee fix leak and error check order 2016-09-03 16:59:17 +02:00
Xinchen Hui
9254f5d5d3 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72629 (Caught exception assignment to variables ignores references).

Conflicts:
	main/php_version.h
 2016-07-20 17:00:09 +08:00
Xinchen Hui
97c0b133c5 Fixed bug #72629 (Caught exception assignment to variables ignores references). 2016-07-20 16:59:14 +08:00
Dmitry Stogov
adc95c5114 Fixed compilation warnings 2016-06-23 12:47:06 +03:00
Dmitry Stogov
323b2733f6 Fixed compilation warnings 2016-06-22 00:40:50 +03:00
Dmitry Stogov
1616038698 Added ZEND_ATTRIBUTE_FORMAT to some middind functions. 
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
 2016-06-21 16:00:37 +03:00
Anatol Belski
4a142af316 fix test portability 2016-06-17 17:09:42 +02:00
Xinchen Hui
3b0a6dfeb2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  No sure why this is failed in travis
 2016-05-31 17:23:03 +08:00
Xinchen Hui
953ee61a49 No sure why this is failed in travis 2016-05-31 17:22:47 +08:00
Xinchen Hui
9bf3b03e73 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Attempt to fix tests fails
 2016-05-31 16:48:33 +08:00
Xinchen Hui
072bc589fc Attempt to fix tests fails 2016-05-31 16:48:19 +08:00
Anatol Belski
ed2ec7be80 Merge branch 'PHP-7.0' 
* PHP-7.0:
  workaround the extra new line in the test out on another env
 2016-05-12 12:49:31 +02:00
Anatol Belski
9f50bb5bfa workaround the extra new line in the test out on another env 2016-05-12 12:45:04 +02:00
Anatol Belski
00390449c6 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72197 pg_lo_create arbitrary read
 2016-05-12 11:41:18 +02:00
Anatol Belski
7f6e285430 Fixed bug #72197 pg_lo_create arbitrary read 2016-05-12 11:40:28 +02:00
Xinchen Hui
28f35c1799 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Committed by accident
 2016-05-12 13:40:32 +08:00
Xinchen Hui
92828ae204 Committed by accident 2016-05-12 13:40:22 +08:00
Xinchen Hui
8fd92e0518 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72195 (pg_pconnect/pg_connect cause use-after-free)
 2016-05-12 13:15:57 +08:00