Skip to content

Remove zend_config.h #4371

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

Remove zend_config.h #4371

wants to merge 1 commit into from

Conversation

petk
Copy link
Member

@petk petk commented Jul 7, 2019

  • zend_config.h file is in current code used only on two places and is a simple wrapper for including the main php_config.h instead.
  • The APACHE symbol is part of the PHP 3 functionality and is not used anymore.

@nikic
Copy link
Member

nikic commented Jul 7, 2019

Where is php_config.h being included in Zend now?

@petk
Copy link
Member Author

petk commented Jul 7, 2019

In Zend/zend_portability.h notice the unconditional TSRM.h include
and in ext/opcache/ZendAccelerator.h using include from php main directly is probably a bit simpler

@petk petk mentioned this pull request Jul 7, 2019
Closed
2 tasks
@nikic
Copy link
Member

nikic commented Jul 8, 2019

Can you please commit the APACHE removal separately? As for zend_config.h, I think for this to make sense some more changes are necessary. In particular zend_config.w32.h should probably also be merged into the main config.w32.h file.

@petk
Remove zend_config.h and APACHE symbol
c20ee63 
- zend_config.h file is in current code used only on two places and is
  a simple wrapper for including php_config.h instead.
- The APACHE symbol is part of the PHP 3 functionality and is not used
  anymore.
- Some leftovers of the removed apache SAPI removed.
@petk petk force-pushed the patch-zend-config-h branch from df43af7 to c20ee63 Compare July 9, 2019 21:47
@petk petk changed the title Remove zend_config.h and APACHE symbol Remove zend_config.h Jul 9, 2019
@petk petk mentioned this pull request Jul 10, 2019
Closed
@petk petk changed the base branch from PHP-7.4 to master September 8, 2019 20:39
@petk petk closed this Sep 8, 2019
@petk petk deleted the patch-zend-config-h branch September 8, 2019 20:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Category: Build System Waiting on Author
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@petk @nikic