Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Stick with zend_long for ABI compatibility
This commit is contained in:
Christoph M. Becker 2019-09-15 15:13:13 +02:00
commit da8aa4a798

View File

@ -115,7 +115,7 @@ php_meta_tags_token php_next_meta_token(php_meta_tags_data *);
typedef struct {
int pclose_ret;
size_t def_chunk_size;
zend_bool auto_detect_line_endings;
zend_long auto_detect_line_endings;
zend_long default_socket_timeout;
char *user_agent; /* for the http wrapper */
char *from_address; /* for the ftp and http wrappers */