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.

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

[fix] fix a bug which will cause compiling error and json parse error when ifdef NGX_RTMP_POOL_DEBUG. #92

Merged
merged 3 commits into from
Mar 3, 2019

Conversation

plainheart
Copy link
Contributor

I've not been paying attention to the case when NGX_RTMP_POOL_DEBUG is defined for a long time. Until now, I have realized it will cause some serious compiling and parsing problem and fixed them.
After this fix, the JSON struct performed some little changes.

  • http-flv.servers -> http-flv.server
  • http-flv.server ->
{
    pool: {}, // ifdef NGX_RTMP_POOL_DEBUG 
    applications: []
}
  • http-flv.server.applications[i].live.streams[i].clients[i] added a new key-value named pool (ifdef NGX_RTMP_POOL_DEBUG)

image

Copy link
Owner

@winshining winshining left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@plainheart Almost done!

ngx_rtmp_stat_module.c Outdated Show resolved Hide resolved
Copy link
Owner

@winshining winshining left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@plainheart Excellent, thank you!

@winshining winshining merged commit f5d524b into winshining:master Mar 3, 2019
@winshining
Copy link
Owner

@HeyJupiter THX!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants