clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
99,793 Commits 491 Branches 1,363 Tags 836 MiB
bbdd6a65e2
Commit Graph

842 Commits

Author SHA1 Message Date
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
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
Xinchen Hui
3c0341e6f9 Fixed bug #72195 (pg_pconnect/pg_connect cause use-after-free) 2016-05-12 13:15:33 +08:00
Anatol Belski
148fa6bb44 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Revert "Fixed bug #71820 pg_fetch_object bind parameters before call constructor"
  Revert "Backport patch for bug #71820"
 2016-05-09 17:29:56 +02:00
Anatol Belski
fc2a45b70a Revert "Fixed bug #71820 pg_fetch_object bind parameters before call constructor" 
This reverts commit b4eedd128b.

This fixed bug #72151, and reverts the fix for bug #71820.
See also bug #50636 and #49521 for the history.
 2016-05-09 17:25:53 +02:00
Anatol Belski
1cc536af5a Revert "Backport patch for bug #71820" 
This reverts commit 1b632cfe83.

This fixed bug #72151, and reverts the fix for bug #71820.
See also bug #50636 and #49521 for the history.
 2016-05-09 17:15:40 +02:00
Dmitry Stogov
6499162ff0 - get rid of EG(scope). zend_get_executed_scope() should be used instead. 
- ichanged zval_update_constant_ex(). Use IS_TYPE_IMMUTABLE flag on shared constants and AST, instead of "inline_change" parameter.
 2016-04-28 04:13:34 +03:00
Dmitry Stogov
f0a2e8eb13 Removed "zend_fcall_info.function_table". It was assigned in many places, but is never used. 2016-04-27 13:46:38 +03:00
Nikita Popov
3dc8f80b61 Merge branch 'PHP-7.0' 2016-04-21 23:42:20 +02:00
Nikita Popov
988bdd0908 Fix escape sequences in pgsql.c 2016-04-21 23:41:59 +02:00
Anatol Belski
e015faaf8f Merge branch 'PHP-7.0' 
* PHP-7.0:
  Adds new curl option CURLOPT_SSL_VERIFYSTATUS to enable OCSP verification
  Add test for bug #72028
 2016-04-16 19:25:13 +02:00
Anatol Belski
fd6f7b8341 Add test for bug #72028 2016-04-16 16:11:22 +02:00
Xinchen Hui
513f2e775b Merge branch 'PHP-7.0' 2016-04-15 21:30:24 -07:00
Xinchen Hui
7e01c518b6 Fixed bug #72028 (pg_query_params(): NULL converts to empty string) 
I don't have a pgsql server by hand, so no test script, but the fix must
be right.
 2016-04-15 21:29:27 -07:00
Anatol Belski
fd2cd35429 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  Fixed #71062 pg_convert() doesn't accept ISO 8601 for datatype timestamp
 2016-04-15 13:42:04 +02:00
Anatol Belski
d263616525 Fixed #71062 pg_convert() doesn't accept ISO 8601 for datatype timestamp 2016-04-15 13:38:49 +02:00
Anatol Belski
672d0eeecf Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71998 Function pg_insert does not insert when column type = inet
 2016-04-10 18:49:38 +02:00
Anatol Belski
b4ab0effc7 Fixed bug #71998 Function pg_insert does not insert when column type = inet 2016-04-10 18:48:35 +02:00
Anatol Belski
1b632cfe83 Backport patch for bug #71820 
Rev b4eedd128b
 2016-03-17 14:28:58 +01:00
Anatol Belski
ad7e1768aa Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71820 pg_fetch_object bind parameters before call constructor
 2016-03-17 12:49:34 +01:00
Anatol Belski
b4eedd128b Fixed bug #71820 pg_fetch_object bind parameters before call constructor 
If we want to fetch into an object of a custom class that implemens
__set handler, the corstructor has to be called first. The data
passed to the constructor can be possibly required in __set handler.
 2016-03-17 12:41:55 +01:00
Nikita Popov
f57c0b3249 Merge branch 'PHP-7.0' 2016-03-03 16:50:47 +01:00
Nikita Popov
1ac152938c Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE 
Also re bug #71575.
 2016-03-03 16:50:01 +01:00
Anatol Belski
de3e033010 Merge branch 'PHP-7.0' 
* PHP-7.0:
  show correct MINFO with libpq >= 9.5.x
 2016-03-02 17:06:03 +01:00
Anatol Belski
4f0042bead Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  show correct MINFO with libpq >= 9.5.x
 2016-03-02 17:05:05 +01:00
Anatol Belski
2399c64eaf show correct MINFO with libpq >= 9.5.x 2016-03-02 17:03:20 +01:00
Dmitry Stogov
c67c166f93 Removed zend_fcall_info.symbol_table 2016-03-02 17:50:55 +03:00
Dmitry Stogov
052651b06a Merge branch 'PHP-7.0' 
* PHP-7.0:
  Added missing semicolon
 2016-02-15 16:37:48 +03:00