clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
87,753 Commits 491 Branches 1,363 Tags 837 MiB
e98caf27ea
Commit Graph

37528 Commits

Author SHA1 Message Date
Xinchen Hui
e98caf27ea found type is unnecessary 2015-02-02 14:45:19 +08:00
Xinchen Hui
50ae5b31b4 Ported imap 2015-02-02 14:35:50 +08:00
Xinchen Hui
7ec8eb380d Use resource directly 2015-02-02 13:56:20 +08:00
Xinchen Hui
38efb690c0 Ported ftp 2015-02-02 13:53:03 +08:00
Xinchen Hui
942809909e Cleanup resource handling APIs 2015-02-02 13:23:16 +08:00
Xinchen Hui
c9e44dc2df Revert "Revert "Fixed warning "(null)(): supplied resource is not a valid cURL handle resource in Unknown on line 0""" 
This reverts commit e78dd7ade2.
 2015-02-02 10:32:26 +08:00
Stanislav Malyshev
bf55a4e223 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix sizeof size
 2015-02-01 12:42:00 -08:00
Stanislav Malyshev
969e389121 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix sizeof size
 2015-02-01 12:41:33 -08:00
Stanislav Malyshev
0bfcc2829c Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  - Updated to version 2015.1 (2015a)
 2015-02-01 12:41:10 -08:00
Stanislav Malyshev
f66f5b2ffa Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix sizeof size
 2015-02-01 12:41:00 -08:00
Stanislav Malyshev
7efbd70b03 fix sizeof size 2015-02-01 12:40:38 -08:00
Derick Rethans
437719f7cc - Updated to version 2015.1 (2015a) 2015-02-01 18:31:23 +00:00
Derick Rethans
263fb375bd - Updated to version 2015.1 (2015a) 2015-02-01 18:31:21 +00:00
Derick Rethans
4d28d12f86 - Updated to version 2015.1 (2015a) 2015-02-01 18:31:19 +00:00
Stanislav Malyshev
463611714c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #64938: libxml_disable_entity_loader setting is shared between threads
 2015-02-01 00:09:04 -08:00
Martin Jansen
de31324c22 Fix bug #64938: libxml_disable_entity_loader setting is shared between threads 
The availability of entity loading is stored in a module global which
previously was only initialized in the GINIT constructor. This had the
effect that disabling the entity loader in one request caused
subsequent requests hitting the same Apache child process to  also have
the loader disabled.

With this change the loader is explicitely enabled in the request init
phase.
 2015-02-01 00:08:35 -08:00
Stanislav Malyshev
d893814b58 Merge branch 'pull-request/1019' 
* pull-request/1019:
  Fix typos
  Fix bug #64938: libxml_disable_entity_loader setting is shared between threads
 2015-02-01 00:03:26 -08:00
Stanislav Malyshev
911f0ea417 Merge branch 'pull-request/1012' 
* pull-request/1012:
  Fix uninitalized variables reads. See CWE-457 for more info.
 2015-01-31 23:52:10 -08:00
Stanislav Malyshev
87d8e9208c Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix TSRM

Conflicts:
	ext/standard/dns.c
 2015-01-31 23:35:11 -08:00
Stanislav Malyshev
55d5811f85 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix TSRM
 2015-01-31 23:34:44 -08:00
Stanislav Malyshev
d82424b46f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix TSRM
 2015-01-31 23:34:27 -08:00
Stanislav Malyshev
94d6cb4a78 fix TSRM 2015-01-31 23:34:14 -08:00
Stanislav Malyshev
b64cafdb9e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added test and possible fix for https://bugs.php.net/bug.php?id=67068
 2015-01-31 23:17:24 -08:00
Danack
dbc0a80b23 Added test and possible fix for https://bugs.php.net/bug.php?id=67068 2015-01-31 23:13:55 -08:00
Stanislav Malyshev
e8e0481755 Merge branch 'pull-request/994' 
* pull-request/994:
  Added test and possible fix for https://bugs.php.net/bug.php?id=67068
 2015-01-31 23:12:00 -08:00
Stanislav Malyshev
d6b1865007 Merge branch 'pull-request/988' 
* pull-request/988:
  remove PHP4 extension structure compat
 2015-01-31 23:11:18 -08:00
Stanislav Malyshev
dd15207dc5 Merge branch 'pull-request/945' 
* pull-request/945:
  Update zend_accelerator_hash.c
  hashmap sizes
  Wasted Shared Memory aboce 2Gb fix
 2015-01-31 23:10:37 -08:00
Stanislav Malyshev
c408c80886 Merge branch 'pull-request/989' 
* pull-request/989:
  Fix a few tests and remove error/warning for *0
  Fix spaces -> tabs
  Add deprecated notice to invalid DES salts.
 2015-01-31 22:04:39 -08:00
Stanislav Malyshev
141b14454c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset

Conflicts:
	ext/sockets/sockaddr_conv.c
	ext/standard/dns.c
 2015-01-31 21:50:08 -08:00
Stanislav Malyshev
6a960b6d1b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset
 2015-01-31 21:48:40 -08:00
Stanislav Malyshev
af1f867308 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset
 2015-01-31 21:48:14 -08:00
Stanislav Malyshev
b30a6d6018 Use better constant since MAXHOSTNAMELEN may mean shorter name 2015-01-31 21:46:56 -08:00
Stanislav Malyshev
41bdd6e7cc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add mitigation for CVE-2015-0235 (bug #68925)
  Add mitigation for CVE-2015-0235 (bug #68925)
 2015-01-31 19:12:20 -08:00
Stanislav Malyshev
882a375dba Add mitigation for CVE-2015-0235 (bug #68925) 2015-01-31 19:10:52 -08:00
Stanislav Malyshev
237128603f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add mitigation for CVE-2015-0235 (bug #68925)
 2015-01-31 19:08:37 -08:00
Stanislav Malyshev
0f9c708229 Add mitigation for CVE-2015-0235 (bug #68925) 2015-01-31 19:08:13 -08:00
Stanislav Malyshev
457367e0b6 Add mitigation for CVE-2015-0235 (bug #68925) 2015-01-31 19:04:55 -08:00
Yasuo Ohgaki
d8803d8147 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed typo in comment
 2015-02-01 05:15:27 +09:00
Yasuo Ohgaki
d9a9afa499 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed typo in comment
 2015-02-01 05:14:56 +09:00
Yasuo Ohgaki
c8a12508c7 Fixed typo in comment 2015-02-01 05:14:27 +09:00
Michael Wallner
0d267bdecc Merge branch 'close_cor' of github.com:MegaManSec/php-src 
* 'close_cor' of github.com:MegaManSec/php-src:
  Fix interbase va_start
 2015-01-30 23:05:10 +01:00
Michael Wallner
3c4540dec9 fix warnings 2015-01-30 22:49:44 +01:00
Michael Wallner
7a94243402 fix warnings 2015-01-30 22:19:23 +01:00
Michael Wallner
960d103d63 fix warnings 2015-01-30 21:36:23 +01:00
Michael Wallner
330d158e93 fix warning 2015-01-30 20:11:25 +01:00
Michael Wallner
bd06f8bb5f fix warnings 2015-01-30 20:08:17 +01:00
Michael Wallner
b72b4084a5 fix warnings 2015-01-30 20:04:04 +01:00
Michael Wallner
f6508f9fa2 fix warnings 2015-01-30 19:54:46 +01:00
Michael Wallner
97b5dabeb1 fix warnings 2015-01-30 19:03:59 +01:00
Xinchen Hui
35c5855201 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-30 22:11:50 +08:00