Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.0]update nghttp2 #5668

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[6.0]update nghttp2 #5668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ext-src/php_swoole.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ END_EXTERN_C()
#include <net/if.h>
#include <ifaddrs.h>
#include <sys/ioctl.h>
#include <nghttp2/nghttp2ver.h>

#if defined(__MACH__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
#include <net/if_dl.h>
Expand Down Expand Up @@ -940,7 +941,7 @@ PHP_MINFO_FUNCTION(swoole) {
php_info_print_table_row(2, "dtls", "enabled");
#endif
#endif
php_info_print_table_row(2, "http2", "enabled");
php_info_print_table_row(2, "http2/nghttp2", "enabled/" NGHTTP2_VERSION);
php_info_print_table_row(2, "json", "enabled");
#ifdef SW_USE_CURL
php_info_print_table_row(2, "curl-native", "enabled");
Expand Down
24 changes: 1 addition & 23 deletions thirdparty/nghttp2/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1 @@
The MIT License

Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
See COPYING
Loading
Loading