Commit5ceec6d

authored

optimize config.m4 and remove dead code (swoole#5611)

1 parent67ad28a commit5ceec6dCopy full SHA for 5ceec6d

File tree

-7

lines changed

-7

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ PHP_ARG_ENABLE([cares],`
`54`	`54`	`PHP_ARG_ENABLE([iouring],`
`55`	`55`	`[enable io-uring support],`
`56`	`56`	`[AS_HELP_STRING([--enable-iouring],`
`57`		`-[Enable io-uring (Experimental)])],[no],[no])`
	`57`	`+[Enable io-uring])],[no],[no])`
`58`	`58`
`59`	`59`	`PHP_ARG_WITH([openssl_dir],`
`60`	`60`	`[dir of openssl],`
`@@ -994,10 +994,14 @@ EOF`
`994`	`994`	`if test "$SW_OS" = "LINUX"; then`
`995`	`995`	`GLIBC_VERSION=$(getconf GNU_LIBC_VERSION \| awk '{print $2}')`
`996`	`996`	`AC_MSG_NOTICE([glibc version: $GLIBC_VERSION])`
`997`		`- if[[ $(echo "$GLIBC_VERSION < 2.17" \| bc -l) -eq 1]]; then`
	`997`	`+`
	`998`	`+ GLIBC_MAJOR_VERSION=$(getconf GNU_LIBC_VERSION \| awk '{print $2}' \| cut -d '.' -f 1)`
	`999`	`+ GLIBC_MINOR_VERSION=$(getconf GNU_LIBC_VERSION \| awk '{print $2}' \| cut -d '.' -f 2)`
	`1000`	`+`
	`1001`	`+ if test $GLIBC_MAJOR_VERSION -lt 2 \|\| (test $GLIBC_MAJOR_VERSION -eq 2 && test $GLIBC_MINOR_VERSION -lt 17); then`
`998`	`1002`	`OS_SHOULD_HAVE_LIBRT=1`
`999`	`1003`	`else`
`1000`		`-AC_MSG_NOTICE([link with -lrt (only for glibcversions before 2.17)])`
	`1004`	`+AC_MSG_NOTICE([link with -lrt (only for glibcversion before 2.17)])`
`1001`	`1005`	`OS_SHOULD_HAVE_LIBRT=0`
`1002`	`1006`	`fi`
`1003`	`1007`	`elif test "$SW_OS" = "MAC"; then`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -857,10 +857,6 @@ const char *HttpContext::get_content_encoding() {`
`857`	`857`	`}`
`858`	`858`	`#endif`
`859`	`859`
`860`		`-staticvoidswoole_request_read_fd_property(zend_object object, HttpContext ctx) {`
`861`		`-zend_update_property_long(swoole_http_request_ce, object,ZEND_STRL("fd"), ctx->fd);`
`862`		`-}`
`863`		`-`
`864`	`860`	`staticPHP_METHOD(swoole_http_request, getContent) {`
`865`	`861`	`HttpContext *ctx =php_swoole_http_request_get_and_check_context(ZEND_THIS);`
`866`	`862`	`if (UNEXPECTED(!ctx)) {`

Comments

(0)