clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,998 Commits 491 Branches 1,363 Tags 846 MiB
928d2cb3a4
Commit Graph

4567 Commits

Author SHA1 Message Date
Julien Pauli
928d2cb3a4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Happy new year (Update copyright to 2016)
 2016-01-04 18:14:08 +01:00
Julien Pauli
736b91c650 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)

Conflicts:
	ext/json/php_json_encoder.h
	sapi/continuity/capi.c
 2016-01-04 18:13:38 +01:00
Lior Kaplan
53fb2f1e5c Happy new year (Update copyright to 2016) 2016-01-03 01:44:37 +02:00
Lior Kaplan
3d5438bf7b Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update header to PHP Version 7
  Happy new year (Update copyright to 2016)
  Happy new year (Update copyright to 2016)
 2016-01-01 20:04:31 +02:00
Lior Kaplan
2eb1f38d24 Happy new year (Update copyright to 2016) 2016-01-01 20:03:16 +02:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Xinchen Hui
65cabad20d Merge branch 'PHP-7.0' 2015-12-30 05:10:21 -08:00
Xinchen Hui
da028e0757 This should be better 2015-12-30 05:10:05 -08:00
Julien Pauli
8520bab128 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Updated NEWS
  Added support for HTTP 451
 2015-12-23 11:38:16 +01:00
Julien Pauli
b2ecac9250 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Added support for HTTP 451

Conflicts:
	sapi/cgi/cgi_main.c
	sapi/cli/php_cli_server.c
	sapi/fpm/fpm/fpm_main.c
 2015-12-23 11:36:36 +01:00
Anatol Belski
84530360a0 7.0.3 next 2015-12-22 10:48:32 +01:00
Xinchen Hui
d8fc37693a Merge branch 'PHP-7.0' 2015-12-17 14:32:17 +08:00
Xinchen Hui
9374977d21 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/opcache/Optimizer/pass1_5.c
 2015-12-17 14:30:00 +08:00
Lior Kaplan
ef9ddd0d82 Remove sqlite extension leftover references (was removed in PHP 5.4) 2015-12-16 09:40:02 +02:00
Xinchen Hui
18b97c94b2 Merge branch 'PHP-7.0' 2015-12-11 17:26:48 +08:00
Xinchen Hui
b5adfee320 Fixed bug memleak in header_register_callback 2015-12-11 17:26:31 +08:00
Ferenc Kovacs
7d5dbaed76 5.6.18 will be next 2015-12-10 01:30:27 +01:00
Anatol Belski
e26b605c21 prepare 7.0.1RC1 2015-12-08 15:54:44 +01:00
Jakub Zelenka
4dc7354c28 Merge branch 'PHP-7.0' 2015-11-29 19:31:04 +00:00
Jakub Zelenka
e6e77d9e27 Fix typo in php_stream_from_res_no_verify 
This macro is not used but it's wrong as zend_fetch_resource
accepts only 3 args and just one res index. So obviously
we need to use zend_fetch_resource2 here.
 2015-11-29 19:28:25 +00:00
Xinchen Hui
dcfc623079 Merge branch 'PHP-7.0' 2015-11-25 08:00:50 -08:00
Xinchen Hui
4a7e83f54a Fixed bug #70970 (Segfault when combining error handler with output buffering) 
of course we can try to refactor the current flow to make this error can
be catched safly.

but as 7.0.0 is releasing,  I don't think a refactor is safe now. and
actually I don't see any gain to make this catchable.

so let's keep this be consistent with 5.6 and safe for now
 2015-11-25 08:00:20 -08:00
Ferenc Kovacs
b22636c838 propare for 5.6.16RC1 2015-11-11 09:20:16 +01:00
Elan Ruusamäe
694570ab54 Update php_ini.c 
trivial typo fix
 2015-11-11 00:06:06 +02:00
Caleb Champlin
6ff014b31c Make sure context is set to null to prevent use after free 2015-11-09 11:58:34 +08:00
Xinchen Hui
f31e6bc96a Merge branch '70842-streams-segfault' of https://github.com/cchamplin/php-src 2015-11-09 11:57:32 +08:00
Anatol Belski
655e266440 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  fix decrement_function regarding bug #70863
  Fixed bug #70863 Incorect logic to increment_function for proxy objects
  no more dev ZEND_VERSION
  Add support for IPV6_V6ONLY on sockets

Conflicts:
	Zend/zend.h
 2015-11-06 23:10:40 +01:00
Bob Weinand
855bb36fd0 Add support for IPV6_V6ONLY on sockets 2015-11-06 21:45:31 +01:00
Caleb Champlin
f2ad7e73bd Make sure context is set to null to prevent use after free 2015-11-02 21:58:04 +00:00
Dmitry Stogov
cb85f570c8 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed memory leak in php_stream_context_set_option()
 2015-10-29 20:07:37 +03:00
Dmitry Stogov
c67fc6bb09 Fixed memory leak in php_stream_context_set_option() 2015-10-29 20:06:55 +03:00
Anatol Belski
ac4601eadd 7.0.1 is next 2015-10-27 20:08:54 +01:00
Kalle Sommer Nielsen
b6cbc06d19 Fix php_stream_get_from_zval(), so that it works under PHP7 
# We don't use zval** anymore, nor do any extension in PECL or core
# currently use this macro, but third party could. See PR#1562 on Github
 2015-10-19 16:55:37 +02:00
Ferenc Kovacs
22cbf68344 prepare for 5.6.15RC1 2015-10-15 00:22:12 +02:00
Anatol Belski
655e16ee95 Merge branch 'PHP-7.0' 
* PHP-7.0:
  increase API versions
 2015-10-12 20:26:34 +02:00
Anatol Belski
dcbbf7c38d increase API versions 2015-10-12 20:17:22 +02:00
Richard Quadling
64990642cf Spelling 
bugger => buffer
 2015-09-30 12:59:16 +08:00
Xinchen Hui
1518a722d2 Merge branch 'patch-1' of https://github.com/rquadling/php-src 2015-09-30 12:57:31 +08:00
Dmitry Stogov
1958e49c62 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Removed or simplified incorrect SEPARATE_*() macros usage.
 2015-09-29 11:18:30 +03:00
Dmitry Stogov
560e4fa393 Removed or simplified incorrect SEPARATE_*() macros usage. 2015-09-29 11:17:43 +03:00
Andrey Hristov
01ecfe4195 Merge branch 'PHP-7.0' 2015-09-28 12:28:20 +02:00
Andrey Hristov
be6546fac9 Add support for parameters to tick functions, on C level. This is only 
for extensions that want to use register tick functions. Userland tick
functions are unaffected.
 2015-09-28 11:21:17 +02:00
Richard Quadling
f4f4c79cf9 Spelling 
bugger => buffer
 2015-09-25 12:16:53 +01:00
Ferenc Kovacs
11cddaf6f4 prepare for PHP-5.6.14RC1 2015-09-17 01:48:02 +02:00
Anatol Belski
360f96e216 bump versions in master 2015-09-14 23:46:10 +02:00
Xinchen Hui
a8368ddc38 Fixed bug #70431 (Memory leak in php_ini.c) 2015-09-10 19:56:13 +08:00
Anatol Belski
9d82a7dc98 add overflow check 2015-09-02 17:05:45 +02:00
Anatol Belski
95ac779956 remove unnecessary macros 2015-09-02 17:05:43 +02:00
Dmitry Stogov
8da0aeaa13 Removed signal protection (set to NULL before free() to avoid dangling pointers) 2015-08-28 15:32:50 +03:00