You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@qpid.apache.org by GitBox <gi...@apache.org> on 2021/02/03 21:41:34 UTC

[GitHub] [qpid-dispatch] ganeshmurthy opened a new pull request #1017: DISPATCH-1950: Knock down the version of libnghttp2 to 1.33.0. Also a…

ganeshmurthy opened a new pull request #1017:
URL: https://github.com/apache/qpid-dispatch/pull/1017


   …dded code to Findlibnghttp2.cmake to extract the version of the library from nghttp2ver.h


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org

[GitHub] [qpid-dispatch] kgiusti commented on a change in pull request #1017: DISPATCH-1950: Knock down the version of libnghttp2 to 1.33.0. Also a…

Posted by GitBox <gi...@apache.org>.
kgiusti commented on a change in pull request #1017:
URL: https://github.com/apache/qpid-dispatch/pull/1017#discussion_r570471612



##########
File path: cmake/Findlibnghttp2.cmake
##########
@@ -17,16 +17,31 @@
 # under the License.
 #
 
+# Sets LIBNGHTTP2_VERSION_STRING from nghttp2ver.h
+
 find_library(NGHTTP2_LIBRARIES
   NAMES libnghttp2 nghttp2
 )
 
 find_path(NGHTTP2_INCLUDE_DIRS
-  NAMES "nghttp2/nghttp2.h"
+  NAMES "nghttp2/nghttp2.h" "nghttp2/nghttp2ver.h"
   HINTS "${CMAKE_INSTALL_PREFIX}/include"
   PATHS "/usr/include"
 )
 
-include(FindPackageHandleStandardArgs)
+if(NGHTTP2_INCLUDE_DIRS AND EXISTS "${NGHTTP2_INCLUDE_DIRS}/nghttp2/nghttp2ver.h")
+  # Extract the version info from nghttp2ver.h and set it in LIBNGHTTP2_VERSION_STRING
+  file(STRINGS "${NGHTTP2_INCLUDE_DIRS}/nghttp2/nghttp2ver.h" libnghttp2_version_str
+    REGEX "^#define[ \t]+NGHTTP2_VERSION[ \t]+\"[^\"]+\"")
+  string(REGEX REPLACE "^#define[ \t]+NGHTTP2_VERSION[ \t]+\"([^\"]+)\".*" "\\1"
+    LIBNGHTTP2_VERSION_STRING "${libnghttp2_version_str}")
+  unset(libnghttp2_version_str)
+endif()
+
+if (LIBNGHTTP2_VERSION_STRING AND libnghttp2_FIND_VERSION AND (LIBNGHTTP2_VERSION_STRING VERSION_LESS libnghttp2_FIND_VERSION))
+  message(STATUS "Found libnghttp2 version ${LIBNGHTTP2_VERSION_STRING} but at least ${libnghttp2_FIND_VERSION} is required. http2 support is disabled")

Review comment:
       probably should be message(WARNING.. not STATUS

##########
File path: cmake/Findlibnghttp2.cmake
##########
@@ -17,16 +17,31 @@
 # under the License.
 #
 
+# Sets LIBNGHTTP2_VERSION_STRING from nghttp2ver.h
+
 find_library(NGHTTP2_LIBRARIES
   NAMES libnghttp2 nghttp2
 )
 
 find_path(NGHTTP2_INCLUDE_DIRS
-  NAMES "nghttp2/nghttp2.h"
+  NAMES "nghttp2/nghttp2.h" "nghttp2/nghttp2ver.h"
   HINTS "${CMAKE_INSTALL_PREFIX}/include"
   PATHS "/usr/include"
 )
 
-include(FindPackageHandleStandardArgs)
+if(NGHTTP2_INCLUDE_DIRS AND EXISTS "${NGHTTP2_INCLUDE_DIRS}/nghttp2/nghttp2ver.h")
+  # Extract the version info from nghttp2ver.h and set it in LIBNGHTTP2_VERSION_STRING
+  file(STRINGS "${NGHTTP2_INCLUDE_DIRS}/nghttp2/nghttp2ver.h" libnghttp2_version_str
+    REGEX "^#define[ \t]+NGHTTP2_VERSION[ \t]+\"[^\"]+\"")
+  string(REGEX REPLACE "^#define[ \t]+NGHTTP2_VERSION[ \t]+\"([^\"]+)\".*" "\\1"
+    LIBNGHTTP2_VERSION_STRING "${libnghttp2_version_str}")
+  unset(libnghttp2_version_str)
+endif()
+
+if (LIBNGHTTP2_VERSION_STRING AND libnghttp2_FIND_VERSION AND (LIBNGHTTP2_VERSION_STRING VERSION_LESS libnghttp2_FIND_VERSION))
+  message(STATUS "Found libnghttp2 version ${LIBNGHTTP2_VERSION_STRING} but at least ${libnghttp2_FIND_VERSION} is required. http2 support is disabled")

Review comment:
       nevermind - I see STATUS is used elsewhere...




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org

[GitHub] [qpid-dispatch] kgiusti commented on a change in pull request #1017: DISPATCH-1950: Knock down the version of libnghttp2 to 1.33.0. Also a…

Posted by GitBox <gi...@apache.org>.
kgiusti commented on a change in pull request #1017:
URL: https://github.com/apache/qpid-dispatch/pull/1017#discussion_r570471612



##########
File path: cmake/Findlibnghttp2.cmake
##########
@@ -17,16 +17,31 @@
 # under the License.
 #
 
+# Sets LIBNGHTTP2_VERSION_STRING from nghttp2ver.h
+
 find_library(NGHTTP2_LIBRARIES
   NAMES libnghttp2 nghttp2
 )
 
 find_path(NGHTTP2_INCLUDE_DIRS
-  NAMES "nghttp2/nghttp2.h"
+  NAMES "nghttp2/nghttp2.h" "nghttp2/nghttp2ver.h"
   HINTS "${CMAKE_INSTALL_PREFIX}/include"
   PATHS "/usr/include"
 )
 
-include(FindPackageHandleStandardArgs)
+if(NGHTTP2_INCLUDE_DIRS AND EXISTS "${NGHTTP2_INCLUDE_DIRS}/nghttp2/nghttp2ver.h")
+  # Extract the version info from nghttp2ver.h and set it in LIBNGHTTP2_VERSION_STRING
+  file(STRINGS "${NGHTTP2_INCLUDE_DIRS}/nghttp2/nghttp2ver.h" libnghttp2_version_str
+    REGEX "^#define[ \t]+NGHTTP2_VERSION[ \t]+\"[^\"]+\"")
+  string(REGEX REPLACE "^#define[ \t]+NGHTTP2_VERSION[ \t]+\"([^\"]+)\".*" "\\1"
+    LIBNGHTTP2_VERSION_STRING "${libnghttp2_version_str}")
+  unset(libnghttp2_version_str)
+endif()
+
+if (LIBNGHTTP2_VERSION_STRING AND libnghttp2_FIND_VERSION AND (LIBNGHTTP2_VERSION_STRING VERSION_LESS libnghttp2_FIND_VERSION))
+  message(STATUS "Found libnghttp2 version ${LIBNGHTTP2_VERSION_STRING} but at least ${libnghttp2_FIND_VERSION} is required. http2 support is disabled")

Review comment:
       probably should be message(WARNING.. not STATUS




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org

[GitHub] [qpid-dispatch] codecov-io commented on pull request #1017: DISPATCH-1950: Knock down the version of libnghttp2 to 1.33.0. Also a…

Posted by GitBox <gi...@apache.org>.
codecov-io commented on pull request #1017:
URL: https://github.com/apache/qpid-dispatch/pull/1017#issuecomment-773048611


   # [Codecov](https://codecov.io/gh/apache/qpid-dispatch/pull/1017?src=pr&el=h1) Report
   > Merging [#1017](https://codecov.io/gh/apache/qpid-dispatch/pull/1017?src=pr&el=desc) (880849f) into [master](https://codecov.io/gh/apache/qpid-dispatch/commit/096f99c7d46dd925f66815d78daac04c304fc781?el=desc) (096f99c) will **increase** coverage by `3.46%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree graph](https://codecov.io/gh/apache/qpid-dispatch/pull/1017/graphs/tree.svg?width=650&height=150&src=pr&token=rk2Cgd27pP)](https://codecov.io/gh/apache/qpid-dispatch/pull/1017?src=pr&el=tree)
   
   ```diff
   @@            Coverage Diff             @@
   ##           master    #1017      +/-   ##
   ==========================================
   + Coverage   78.94%   82.41%   +3.46%     
   ==========================================
     Files         112      111       -1     
     Lines       28558    27307    -1251     
   ==========================================
   - Hits        22545    22504      -41     
   + Misses       6013     4803    -1210     
   ```
   
   
   | [Impacted Files](https://codecov.io/gh/apache/qpid-dispatch/pull/1017?src=pr&el=tree) | Coverage Δ | |
   |---|---|---|
   | [src/router\_core/transfer.c](https://codecov.io/gh/apache/qpid-dispatch/pull/1017/diff?src=pr&el=tree#diff-c3JjL3JvdXRlcl9jb3JlL3RyYW5zZmVyLmM=) | `92.07% <0.00%> (-0.65%)` | :arrow_down: |
   | [src/router\_core/delivery.c](https://codecov.io/gh/apache/qpid-dispatch/pull/1017/diff?src=pr&el=tree#diff-c3JjL3JvdXRlcl9jb3JlL2RlbGl2ZXJ5LmM=) | `92.36% <0.00%> (-0.58%)` | :arrow_down: |
   | [src/message.c](https://codecov.io/gh/apache/qpid-dispatch/pull/1017/diff?src=pr&el=tree#diff-c3JjL21lc3NhZ2UuYw==) | `86.69% <0.00%> (-0.07%)` | :arrow_down: |
   | [src/adaptors/http2/http2\_adaptor.h](https://codecov.io/gh/apache/qpid-dispatch/pull/1017/diff?src=pr&el=tree#diff-c3JjL2FkYXB0b3JzL2h0dHAyL2h0dHAyX2FkYXB0b3IuaA==) | | |
   | [src/adaptors/http2/http2\_adaptor.c](https://codecov.io/gh/apache/qpid-dispatch/pull/1017/diff?src=pr&el=tree#diff-c3JjL2FkYXB0b3JzL2h0dHAyL2h0dHAyX2FkYXB0b3IuYw==) | | |
   | [src/adaptors/http2/http2\_adaptor\_none.c](https://codecov.io/gh/apache/qpid-dispatch/pull/1017/diff?src=pr&el=tree#diff-c3JjL2FkYXB0b3JzL2h0dHAyL2h0dHAyX2FkYXB0b3Jfbm9uZS5j) | `0.00% <0.00%> (ø)` | |
   | [src/router\_core/forwarder.c](https://codecov.io/gh/apache/qpid-dispatch/pull/1017/diff?src=pr&el=tree#diff-c3JjL3JvdXRlcl9jb3JlL2ZvcndhcmRlci5j) | `93.04% <0.00%> (+0.39%)` | :arrow_up: |
   
   ------
   
   [Continue to review full report at Codecov](https://codecov.io/gh/apache/qpid-dispatch/pull/1017?src=pr&el=continue).
   > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
   > `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
   > Powered by [Codecov](https://codecov.io/gh/apache/qpid-dispatch/pull/1017?src=pr&el=footer). Last update [096f99c...880849f](https://codecov.io/gh/apache/qpid-dispatch/pull/1017?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org

[GitHub] [qpid-dispatch] kgiusti commented on a change in pull request #1017: DISPATCH-1950: Knock down the version of libnghttp2 to 1.33.0. Also a…

Posted by GitBox <gi...@apache.org>.
kgiusti commented on a change in pull request #1017:
URL: https://github.com/apache/qpid-dispatch/pull/1017#discussion_r570473578



##########
File path: cmake/Findlibnghttp2.cmake
##########
@@ -17,16 +17,31 @@
 # under the License.
 #
 
+# Sets LIBNGHTTP2_VERSION_STRING from nghttp2ver.h
+
 find_library(NGHTTP2_LIBRARIES
   NAMES libnghttp2 nghttp2
 )
 
 find_path(NGHTTP2_INCLUDE_DIRS
-  NAMES "nghttp2/nghttp2.h"
+  NAMES "nghttp2/nghttp2.h" "nghttp2/nghttp2ver.h"
   HINTS "${CMAKE_INSTALL_PREFIX}/include"
   PATHS "/usr/include"
 )
 
-include(FindPackageHandleStandardArgs)
+if(NGHTTP2_INCLUDE_DIRS AND EXISTS "${NGHTTP2_INCLUDE_DIRS}/nghttp2/nghttp2ver.h")
+  # Extract the version info from nghttp2ver.h and set it in LIBNGHTTP2_VERSION_STRING
+  file(STRINGS "${NGHTTP2_INCLUDE_DIRS}/nghttp2/nghttp2ver.h" libnghttp2_version_str
+    REGEX "^#define[ \t]+NGHTTP2_VERSION[ \t]+\"[^\"]+\"")
+  string(REGEX REPLACE "^#define[ \t]+NGHTTP2_VERSION[ \t]+\"([^\"]+)\".*" "\\1"
+    LIBNGHTTP2_VERSION_STRING "${libnghttp2_version_str}")
+  unset(libnghttp2_version_str)
+endif()
+
+if (LIBNGHTTP2_VERSION_STRING AND libnghttp2_FIND_VERSION AND (LIBNGHTTP2_VERSION_STRING VERSION_LESS libnghttp2_FIND_VERSION))
+  message(STATUS "Found libnghttp2 version ${LIBNGHTTP2_VERSION_STRING} but at least ${libnghttp2_FIND_VERSION} is required. http2 support is disabled")

Review comment:
       nevermind - I see STATUS is used elsewhere...




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org

[GitHub] [qpid-dispatch] asfgit closed pull request #1017: DISPATCH-1950: Knock down the version of libnghttp2 to 1.33.0. Also a…

Posted by GitBox <gi...@apache.org>.
asfgit closed pull request #1017:
URL: https://github.com/apache/qpid-dispatch/pull/1017


   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org

[GitHub] [qpid-dispatch] asfgit closed pull request #1017: DISPATCH-1950: Knock down the version of libnghttp2 to 1.33.0. Also a…

Posted by GitBox <gi...@apache.org>.
asfgit closed pull request #1017:
URL: https://github.com/apache/qpid-dispatch/pull/1017


   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@qpid.apache.org
For additional commands, e-mail: dev-help@qpid.apache.org