clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
88,441 Commits 494 Branches 1,367 Tags 807 MiB
d8b2012ab0
Commit Graph

88441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Harvey
d8b2012ab0 Explicitly depend opcache on pcre. 2015-03-05 00:27:36 +00:00
Adam Harvey
cdb82d879c Update UPGRADING. 2015-03-05 00:27:21 +00:00
Adam Harvey
fea9a6fc77 Merge remote-tracking branch 'datibbaw/kill-ereg' 
Conflicts:
	ext/ereg/config.w32
	ext/ereg/config0.m4
	ext/ereg/ereg.c
	ext/ereg/php_ereg.h
	ext/ereg/php_regex.h
	ext/ereg/regex/engine.c
	ext/ereg/regex/main.c
	ext/ereg/regex/regcomp.c
	ext/ereg/regex/regerror.c
	ext/ereg/tests/split_error_002.phpt
	ext/ereg/tests/split_variation_003.phpt
	ext/ereg/tests/spliti_error_002.phpt
	ext/ereg/tests/spliti_variation_003.phpt
	ext/pgsql/pgsql.c
	sapi/apache/php_apache_http.h
	sapi/apache_hooks/php_apache_http.h
 2015-03-05 00:21:38 +00:00
Adam Harvey
fd1578c196 Remove the deprecated MySQL extension. 
Relevant RFC: https://wiki.php.net/rfc/remove_deprecated_functionality_in_php7
 2015-03-05 00:18:40 +00:00
Dmitry Stogov
c9bd24de7a Improved ineritance code 2015-03-04 23:06:07 +03:00
Daniel Lowrey
5de64a29e6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68920 (use strict peer_fingerprint input checks)

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-04 12:50:35 -07:00
Daniel Lowrey
241f3c34b8 Fixed bug #68920 (use strict peer_fingerprint input checks) 2015-03-04 12:47:46 -07:00
Anatol Belski
01ccfb7cc9 fix ini registry handling 2015-03-04 19:27:45 +01:00
Dmitry Stogov
ff039c3c6d Merge commit 'refs/pull/1066/head' of git://github.com/php/php-src 
* git://github.com/php/php-src:
  Add zend assert deleted by accident
  Let's keep it simple
  Improve internal function return types checking for parent
 2015-03-04 18:17:06 +03:00
Dmitry Stogov
13eed2676d Merge commit 'refs/pull/1137/head' of git://github.com/php/php-src 
* git://github.com/php/php-src:
  Optimize class constant declare compilation
 2015-03-04 18:07:07 +03:00
Dmitry Stogov
68d4575132 Merge branch 'pull-request/1128' 
* pull-request/1128:
  Fixed memleak in alloc_globals_ctor
 2015-03-04 17:55:02 +03:00
Dmitry Stogov
8ec8648c91 Improved code for class property inheritance 2015-03-04 17:41:01 +03:00
Xinchen Hui
fefbddf22b Merge branch 'master' of https://git.php.net/repository/php-src 2015-03-04 18:27:18 +08:00
Xinchen Hui
6b8d5b01bc Add test for previously fixed segfault 2015-03-04 18:26:58 +08:00
Anatol Belski
fc5d9175b6 ensure the mail() socket is not leaked after request 2015-03-04 10:24:44 +01:00
Xinchen Hui
c16dcd3a8e Fixed segfault 2015-03-04 17:17:48 +08:00
Xinchen Hui
ec00a4de4e Merge branch 'PHP-5.6' 2015-03-04 14:49:03 +08:00
Xinchen Hui
a29b64fc10 Fixed bug #69159 (Opcache causes problem when passing a variable variable to a function) 2015-03-04 14:48:41 +08:00
Xinchen Hui
fffd173b7a indent 2015-03-04 12:10:23 +08:00
Xinchen Hui
a6ba7966de Fixed memleak 2015-03-04 12:08:54 +08:00
Xinchen Hui
4ebfc02274 Merge branch 'master' of https://git.php.net/repository/php-src 2015-03-04 11:43:04 +08:00
Xinchen Hui
abfdf3bf52 Merge branch 'fix-compile-error' of https://github.com/zxcvdavid/php-src 2015-03-04 11:39:53 +08:00
Reeze Xia
2dac92b244 Silence a empty while loop warning 2015-03-04 11:34:53 +08:00
Xinchen Hui
2fa4d1d88b Fixed wrong type used 2015-03-04 10:55:14 +08:00
Xinchen Hui
c7b7cc4c16 Fixed build 2015-03-04 10:49:55 +08:00
zxcvdavid
a4a85887e0 Fix compile error 2015-03-04 09:56:50 +08:00
zxcvdavid
f1de275e74 Remove the unused vars 2015-03-04 09:52:09 +08:00
Dmitry Stogov
2fa8d67a5c Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse. 2015-03-04 02:05:28 +03:00
Anatol Belski
2841aa95db fix thread safety for win32/sendmail 2015-03-03 20:42:28 +01:00
Anatol Belski
82fd62df19 avoid this pointers play 2015-03-03 19:30:15 +01:00
Anatol Belski
2f79fd8d43 use correct free api 2015-03-03 18:09:28 +01:00
Anatol Belski
cddde315c7 Fixed bug #69154 Access violation in php7.dll!_emalloc 
one more invalid free
 2015-03-03 17:19:17 +01:00
Anatol Belski
3483cc2cf6 ensure there is no connection 2015-03-03 17:19:16 +01:00
Anatol Belski
74813e6f04 fix socket leaking and better connection err check 2015-03-03 17:19:15 +01:00
Anatol Belski
dcb944b352 avoid skipif as this indeed should be tested 
plus do expect regex .*
 2015-03-03 17:19:14 +01:00
Xinchen Hui
4ccbb1ed33 Merge branch 'PHP-5.6' 2015-03-03 23:17:49 +08:00
Xinchen Hui
6183408031 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-03 23:17:37 +08:00
nathan r. hruby
837eeefee9 Make killing a locker an ERROR event 
At least in apache, killing a locker with SIGKILL from inside opcache prevents
the child process from emitting a corresponding log event to the access or
error logs, therefore requests are termed with no record.  This makes is
incredibly difficult to debug problems espically on systems with high counts
of cache restarts.  Since INFO level is far too noisy for production use,
switch the killing to a higher level so we can see it easier.
 2015-03-03 23:16:45 +08:00
Reeze Xia
31d5b65c74 Fix test 2015-03-03 22:56:23 +08:00
Dmitry Stogov
b4e9da22d7 Microoptimization (avoid reloading from memory) 2015-03-03 16:51:27 +03:00
Dmitry Stogov
6b9c40280a Removed deprecated paths. Changed "switch" into series of "if". 2015-03-03 16:49:45 +03:00
Reeze Xia
badc19d884 Optimize class constant declare compilation 2015-03-03 21:28:09 +08:00
Reeze Xia
bc28ed6788 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Remove wrong commit committed by accident
  Fixed bug #69167 (call_user_func does not support references anymore)
  Fixed #69166 (Assigning array_values() to array does not reset key counter)
 2015-03-03 18:38:28 +08:00
Reeze Xia
f97251adec Add missing zend_parse_parameters_none() for flush() 2015-03-03 18:37:47 +08:00
Xinchen Hui
aa63449b6e Remove wrong commit committed by accident 2015-03-03 18:29:26 +08:00
Xinchen Hui
2702739ceb Merge branch 'master' of https://git.php.net/repository/php-src 2015-03-03 18:16:46 +08:00
Xinchen Hui
7ad6711a4d Fixed bug #69167 (call_user_func does not support references anymore) 2015-03-03 18:11:56 +08:00
Xinchen Hui
70bd500645 Fixed #69166 (Assigning array_values() to array does not reset key counter) 2015-03-03 17:31:20 +08:00
Reeze Xia
bb2e62ecda Merge branch 'PHP-5.6' 
* PHP-5.6:
  Improve fix for bug 67741

Conflicts:
	main/main.c
 2015-03-03 16:29:41 +08:00
Reeze Xia
808e562f23 Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6 
* 'PHP-5.6' of git.php.net:/php-src:
 2015-03-03 16:28:01 +08:00