mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-19 06:50:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
87,748 Commits 503 Branches 1,387 Tags 836 MiB
c9e44dc2df
Commit Graph

87748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
fa729f89e5 Empty merge 2015-02-01 18:31:22 +00:00
Derick Rethans
263fb375bd - Updated to version 2015.1 (2015a) 2015-02-01 18:31:21 +00:00
Derick Rethans
440cefd5a9 Empty merge 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
c752e1b786 Merge branch 'pull-request/1032' 
* pull-request/1032:
  do_fstat changes
 2015-02-01 00:56:27 -08:00
Stanislav Malyshev
b3efc0fb6a Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #66479: Wrong response to FCGI_GET_VALUES

Conflicts:
	sapi/cgi/fastcgi.c
 2015-02-01 00:37:14 -08:00
Stanislav Malyshev
c440043de5 Merge branch 'pull-request/884' 
* pull-request/884:
  Fix #66479: Wrong response to FCGI_GET_VALUES
 2015-02-01 00:36:53 -08:00
Stanislav Malyshev
ac3a4e4200 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #66479: Wrong response to FCGI_GET_VALUES
 2015-02-01 00:36:21 -08:00
Frank Stolle
6a905a9a3c Fix #66479: Wrong response to FCGI_GET_VALUES 
Requesting Get-Values via FCGI caused an "endless" loop over the last requested parameter and ended with an invalid response. this patch solves this loop bug.

Conflicts:
	sapi/cgi/fastcgi.c
 2015-02-01 00:35:23 -08:00
Stanislav Malyshev
62d6f91b3e Merge branch 'pull-request/1011' 
* pull-request/1011:
  Fix for a previous commit. i read it as size_t, notssize_t.
  Remove useless tests
 2015-02-01 00:21:47 -08:00
Stanislav Malyshev
c0237617e1 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #64938: libxml_disable_entity_loader setting is shared between threads

Conflicts:
	ext/libxml/libxml.c
 2015-02-01 00:09:44 -08: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
Joshua Rogers
d492bc8b6b Fix for a previous commit. i read it as size_t, notssize_t. 2015-02-01 19:02:25 +11:00
Stanislav Malyshev
0be7d000b4 Merge branch 'pull-request/935' 
* pull-request/935:
  Update config.guess and config.sub
 2015-01-31 23:59:53 -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
50703c900f Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix group name handling

Conflicts:
	main/streams/plain_wrapper.c
 2015-01-31 23:48:08 -08:00
Stanislav Malyshev
c5526291ce Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix group name handling
 2015-01-31 23:47:25 -08:00
Joshua Rogers
f8bf646fc4 do_fstat changes 
Check return values of 'do_fstat' function in all places.
 2015-02-01 18:47:09 +11:00
Stanislav Malyshev
e5e251b023 fix group name handling 2015-01-31 23:47:03 -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
b68e7bd7ba Merge branch 'pull-request/1040' 
* pull-request/1040:
  Added two missing opcache ini directives (restrict_api and mmap_base)
 2015-01-31 23:24:30 -08:00
Stanislav Malyshev
6c06982d2d Merge branch 'pull-request/1035' 
* pull-request/1035:
  fix the day of the week
 2015-01-31 23:23:51 -08:00
Stanislav Malyshev
058fa42320 Merge branch 'pull-request/1030' 
* pull-request/1030:
  Remove duplicated line
 2015-01-31 23:23:23 -08:00
Stanislav Malyshev
eb9aa5c011 Merge branch 'pull-request/1025' 
* pull-request/1025:
  Use svg instead of png to get better image quality
 2015-01-31 23:22:57 -08:00
Stanislav Malyshev
48459273ae Merge branch 'PHP-5.6' 
* PHP-5.6:
  add NEWS
 2015-01-31 23:20:25 -08:00
Stanislav Malyshev
2560a21d41 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  add NEWS
 2015-01-31 23:20:14 -08:00
Stanislav Malyshev
380741daa4 add NEWS 2015-01-31 23:19:23 -08:00
Stanislav Malyshev
3b8c39f1b1 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added test and possible fix for https://bugs.php.net/bug.php?id=67068
 2015-01-31 23:17:33 -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