php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-19 05:51:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
81,666 Commits 547 Branches 1,483 Tags
c985ec737d8340e941feda05de647cce10b744ea
Commit Graph

81666 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Lowrey
c985ec737d Fix ZTS 2015-03-05 12:19:15 -07:00
Daniel Lowrey
010f17534f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix ZTS build
 2015-03-05 12:13:33 -07:00
Daniel Lowrey
e892f5382f Fix ZTS build 2015-03-05 12:12:55 -07:00
Ferenc Kovacs
d4d05c8919 5.6.8 up next 2015-03-05 19:07:23 +01:00
Daniel Lowrey
5939de35a8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67403 (Add signatureType to openssl_x509_parse)
  5.5.24 now

Conflicts:
	configure.in
	main/php_version.h
 2015-03-05 10:21:32 -07:00
Daniel Lowrey
94140afa69 Fix bug #67403 (Add signatureType to openssl_x509_parse) 2015-03-05 10:09:06 -07:00
Julien Pauli
0f334a1265 5.5.24 now 2015-03-05 14:13:39 +01:00
Xinchen Hui
e8e5913e5e Merge branch 'PHP-5.5' into PHP-5.6 2015-03-05 21:06:07 +08:00
Xinchen Hui
869f8bd24b Error also maybe happened here 2015-03-05 21:05:26 +08:00
Xinchen Hui
7bcdbcf98e Revert commit to zend signal by mistake 2015-03-05 19:04:43 +08:00
Xinchen Hui
56f9dc2d59 Update NEWs 2015-03-05 18:40:25 +08:00
Xinchen Hui
168be6f250 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-05 18:40:06 +08:00
Xinchen Hui
f039225597 Fixed bug #69174 (leaks when unused inner class use traits precedence) 2015-03-05 18:39:50 +08:00
Rasmus Lerdorf
eaa1b3e614 This test fails with multibyte on because it spews 
a conversion error on the bogus file
 2015-03-05 00:45:42 -08:00
Daniel Lowrey
65a9a5ca12 Fixed bug #68265 (SAN match fails with trailing DNS dot) 2015-03-04 23:55:42 -07:00
Daniel Lowrey
1de1ff75f5 Merge branch 'PHP-5.6' of https://github.com/bjori/php-src into PHP-5.6 
* 'PHP-5.6' of https://github.com/bjori/php-src:
  hexadecimal is case*in*sensitive
 2015-03-04 22:55:22 -07:00
Daniel Lowrey
5dcace058a Fixed bug #68879 (IP Address fields in subjectAltNames not used) 2015-03-04 22:39:25 -07:00
Daniel Lowrey
ca766e0787 Fix broken test 2015-03-04 22:37:07 -07:00
Hannes Magnusson
3c2c029bfd hexadecimal is case*in*sensitive 2015-03-04 16:03:45 -08:00
Daniel Lowrey
241f3c34b8 Fixed bug #68920 (use strict peer_fingerprint input checks) 2015-03-04 12:47:46 -07: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
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
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
Reeze Xia
6cb3b941df Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Improve fix for bug 67741
  Added type checks
  Added type checks
 2015-03-03 16:27:35 +08:00
Reeze Xia
304fb7a3d6 Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:/php-src:
  Added type checks
  Added type checks
 2015-03-03 16:27:04 +08:00
Reeze Xia
860fc3947f Improve fix for bug 67741 
Thanks to laruence.
 2015-03-03 16:25:43 +08:00
Dmitry Stogov
c433f19a6b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added type checks
 2015-03-03 10:46:55 +03:00
Dmitry Stogov
b3ac352253 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Added type checks
 2015-03-03 10:45:07 +03:00
Dmitry Stogov
c8eaca013a Added type checks 2015-03-03 10:43:48 +03:00
Dmitry Stogov
5c03e05692 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  Update NEWS
 2015-03-03 10:20:21 +03:00
Dmitry Stogov
66c883c0fd Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 
* 'PHP-5.6' of git.php.net:php-src:
  Update NEWS
 2015-03-03 10:19:54 +03:00
Dmitry Stogov
26827a0111 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added type checks
  Fixed bug #67741 (auto_prepend_file messes up __LINE__)
  Check variable type before its usage as IS_ARRAY.
  Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
 2015-03-03 09:59:32 +03:00
Dmitry Stogov
035d80523f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Added type checks

Conflicts:
	ext/soap/soap.c
 2015-03-03 09:52:21 +03:00
Dmitry Stogov
0c136a2abd Added type checks 2015-03-03 09:44:46 +03:00
Reeze Xia
f353162ca2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS
  Fixed bug #67741 (auto_prepend_file messes up __LINE__)
  Check variable type before its usage as IS_ARRAY.
  Fixed a bug that header value is not terminated by '\0' when accessed through getenv().

Conflicts:
	NEWS
 2015-03-03 14:37:06 +08:00
Reeze Xia
bb466d57ae Update NEWS 2015-03-03 14:22:03 +08:00
Reeze Xia
4e2c87edb3 Fixed bug #67741 (auto_prepend_file messes up __LINE__) 
This also fixes bug #54081
 2015-03-03 11:43:23 +08:00
Reeze Xia
34f09b6240 Fixed bug #67741 (auto_prepend_file messes up __LINE__) 
This also fixes bug #54081
 2015-03-03 11:25:30 +08:00
Dmitry Stogov
fc1f24b7a6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Check variable type before its usage as IS_ARRAY.
  Fixed a bug that header value is not terminated by '\0' when accessed through getenv().
 2015-03-02 12:30:38 +03:00
Dmitry Stogov
d5248f67b5 Check variable type before its usage as IS_ARRAY. 2015-03-02 12:27:36 +03:00
Xinchen Hui
169ac35c66 Update NEWS 2015-03-01 23:17:57 +08:00
Xinchen Hui
672a396d4a Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/standard/var_unserializer.c
 2015-03-01 23:17:41 +08:00
Xinchen Hui
caebb76131 Fixed bug #69139 (Crash in gc_zval_possible_root on unserialize) 2015-03-01 23:16:15 +08:00
Lior Kaplan
aaaa905912 Align entries format for 5.6.7 2015-03-01 11:36:01 +02:00
Lior Kaplan
041b472d6f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Align entries format for 5.5.23
 2015-03-01 11:34:11 +02:00
Lior Kaplan
55f7747bff Align entries format for 5.5.23 2015-03-01 11:32:09 +02:00
Reeze Xia
214350f4f4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bump header year
 2015-03-01 15:08:20 +08:00
Reeze Xia
c98eb695b5 Bump header year 2015-03-01 15:03:21 +08:00
Reeze Xia
6ef477f947 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS
 2015-02-28 16:45:44 +08:00