Fixed res leak

Fixed res leak

Fixed warnings

Fixed recently introduced memory leak

Fix Bug #69402: Reading empty SSL stream hangs until timeout

Fixed bug #69419

Bug #63336 is not a bug

fix test

Fixed recently introduced memory leak

codes standard

- Updated to version 2015.3 (2015c)

Merge branch 'PHp-5.4' into PHP-5.5

* PHp-5.4:
fix non-standard C

fix non-standard C

update NEWS

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
5.4.41 next
fix CVE num
update NEWS
Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
5.4.41 next
fix CVE num
update NEWS
Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
fix type in fix for #69085
fix CVE num

Conflicts:
configure.in
main/php_version.h

show more ...

Merge branch 'PHP-5.5.24' into PHP-5.5

* PHP-5.5.24:
fix test
fix memory leak & add test
Fix tests
Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulner

Merge branch 'PHP-5.5.24' into PHP-5.5

* PHP-5.5.24:
fix test
fix memory leak & add test
Fix tests
Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
Fix test
Additional fix for bug #69324
More fixes for bug #69152
Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
Fixed bug #68901 (use after free)
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
Updated NEWS
Fixed bug #69336 (Issues with "last day of <monthname>").
5.5.24RC1

show more ...

5.4.41 next

Merge branch 'PHP-5.4.40' into PHP-5.4

* PHP-5.4.40:
update NEWS
Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
fix memory leak & add test

Merge branch 'PHP-5.4.40' into PHP-5.4

* PHP-5.4.40:
update NEWS
Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
fix memory leak & add test
Fix tests
fix CVE num
Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
Fix test
Additional fix for bug #69324
More fixes for bug #69152
Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)

show more ...

fix CVE num

update NEWS

Merge branch 'PHP-5.4' into PHP-5.4.40

* PHP-5.4:
fix CVE num

Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)

fix test

fix type in fix for #69085

fix type in fix for #69085

(cherry picked from commit 085e9ddc26f37ce556b8fd787044746e726264b2)