]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
9 years agoNormalize gmp_remroot() behavior to GMP 5.1
commit | commitdiff | tree
Nikita Popov [Thu, 16 Apr 2015 14:27:42 +0000 (16:27 +0200)]
Normalize gmp_remroot() behavior to GMP 5.1

9 years agoFix leak in gmp_pow()
commit | commitdiff | tree
Nikita Popov [Thu, 16 Apr 2015 14:00:31 +0000 (16:00 +0200)]
Fix leak in gmp_pow()

9 years agothis was reverted
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 18:04:03 +0000 (20:04 +0200)]
this was reverted

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 17:54:30 +0000 (19:54 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  66550 will be part of 5.5.24

9 years ago66550 will be part of 5.6.8
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 17:54:25 +0000 (19:54 +0200)]
66550 will be part of 5.6.8

9 years ago66550 will be part of 5.5.24
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 17:53:38 +0000 (19:53 +0200)]
66550 will be part of 5.5.24

9 years agoreorder entries, Core is always the first block
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 16:53:22 +0000 (18:53 +0200)]
reorder entries, Core is always the first block

9 years agoadd missing NEWS entry
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 16:39:16 +0000 (18:39 +0200)]
add missing NEWS entry

9 years agoadd missing space to the NEWS entries to align properly
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 16:38:48 +0000 (18:38 +0200)]
add missing space to the NEWS entries to align properly

9 years agoadd missing space to the NEWS entries to align properly
commit | commitdiff | tree
Ferenc Kovacs [Wed, 15 Apr 2015 16:36:52 +0000 (18:36 +0200)]
add missing space to the NEWS entries to align properly

9 years agobump zip release to match pecl version
commit | commitdiff | tree
Remi Collet [Wed, 15 Apr 2015 15:37:12 +0000 (17:37 +0200)]
bump zip release to match pecl version

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Julien Pauli [Wed, 15 Apr 2015 12:40:33 +0000 (14:40 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS

9 years agoUpdated NEWS
commit | commitdiff | tree
Julien Pauli [Wed, 15 Apr 2015 12:40:00 +0000 (14:40 +0200)]
Updated NEWS

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Wed, 15 Apr 2015 09:09:54 +0000 (11:09 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix dir separator in test

9 years agofix dir separator in test
commit | commitdiff | tree
Anatol Belski [Wed, 15 Apr 2015 09:07:13 +0000 (11:07 +0200)]
fix dir separator in test

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Xinchen Hui [Wed, 15 Apr 2015 02:39:17 +0000 (10:39 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

9 years agoFixed res leak
commit | commitdiff | tree
Xinchen Hui [Wed, 15 Apr 2015 02:38:55 +0000 (10:38 +0800)]
Fixed res leak

9 years agoFixed warnings
commit | commitdiff | tree
Xinchen Hui [Wed, 15 Apr 2015 02:37:35 +0000 (10:37 +0800)]
Fixed warnings

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 18:12:58 +0000 (11:12 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed recently introduced memory leak
  Fix Bug #69402: Reading empty SSL stream hangs until timeout

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 18:12:48 +0000 (11:12 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed recently introduced memory leak

9 years agoFixed recently introduced memory leak
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 12:47:26 +0000 (15:47 +0300)]
Fixed recently introduced memory leak

9 years agoUpdate NEWS
commit | commitdiff | tree
Daniel Lowrey [Tue, 14 Apr 2015 15:37:17 +0000 (09:37 -0600)]
Update NEWS

9 years agoFix Bug #69402: Reading empty SSL stream hangs until timeout
commit | commitdiff | tree
Daniel Lowrey [Tue, 14 Apr 2015 15:12:28 +0000 (09:12 -0600)]
Fix Bug #69402: Reading empty SSL stream hangs until timeout

9 years agoFix Bug #69402: Reading empty SSL stream hangs until timeout
commit | commitdiff | tree
Daniel Lowrey [Tue, 14 Apr 2015 15:12:28 +0000 (09:12 -0600)]
Fix Bug #69402: Reading empty SSL stream hangs until timeout

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Nikita Popov [Tue, 14 Apr 2015 14:36:09 +0000 (16:36 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

9 years agoFixed bug #69419
commit | commitdiff | tree
Nikita Popov [Tue, 14 Apr 2015 14:35:23 +0000 (16:35 +0200)]
Fixed bug #69419

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 14:16:57 +0000 (17:16 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bug #63336 is not a bug

9 years agoBug #63336 is not a bug
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 14:15:50 +0000 (17:15 +0300)]
Bug #63336 is not a bug

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Tue, 14 Apr 2015 13:21:47 +0000 (15:21 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test

9 years agofix test
commit | commitdiff | tree
Anatol Belski [Tue, 14 Apr 2015 13:20:44 +0000 (15:20 +0200)]
fix test

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 12:48:20 +0000 (15:48 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed recently introduced memory leak

9 years agoFixed recently introduced memory leak
commit | commitdiff | tree
Dmitry Stogov [Tue, 14 Apr 2015 12:47:26 +0000 (15:47 +0300)]
Fixed recently introduced memory leak

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Xinchen Hui [Tue, 14 Apr 2015 11:32:28 +0000 (19:32 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

9 years agocodes standard
commit | commitdiff | tree
Xinchen Hui [Tue, 14 Apr 2015 11:32:01 +0000 (19:32 +0800)]
codes standard

9 years ago- Updated to version 2015.3 (2015c)
commit | commitdiff | tree
Derick Rethans [Tue, 14 Apr 2015 09:51:12 +0000 (10:51 +0100)]
- Updated to version 2015.3 (2015c)

9 years agoEmpty merge
commit | commitdiff | tree
Derick Rethans [Tue, 14 Apr 2015 09:51:11 +0000 (10:51 +0100)]
Empty merge

9 years ago- Updated to version 2015.3 (2015c)
commit | commitdiff | tree
Derick Rethans [Tue, 14 Apr 2015 09:51:10 +0000 (10:51 +0100)]
- Updated to version 2015.3 (2015c)

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:51:14 +0000 (00:51 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: (27 commits)
  fix non-standard C
  update NEWS
  5.4.41 next
  fix CVE num
  update NEWS
  Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
  fix test
  fix type in fix for #69085
  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)
  ...

Conflicts:
ext/standard/http_fopen_wrapper.c

9 years agoMerge branch 'PHp-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:49:23 +0000 (00:49 -0700)]
Merge branch 'PHp-5.4' into PHP-5.5

* PHp-5.4:
  fix non-standard C

9 years agofix non-standard C
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:46:47 +0000 (00:46 -0700)]
fix non-standard C

9 years agoupdate NEWS
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:43:19 +0000 (00:43 -0700)]
update NEWS

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:34:02 +0000 (00:34 -0700)]
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

9 years agoMerge branch 'PHP-5.5.24' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:33:04 +0000 (00:33 -0700)]
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

9 years ago5.4.41 next
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:30:58 +0000 (00:30 -0700)]
5.4.41 next

9 years agoMerge branch 'PHP-5.4.40' into PHP-5.4
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:26:15 +0000 (00:26 -0700)]
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)

9 years agofix CVE num
commit | commitdiff | tree
Stanislav Malyshev [Mon, 13 Apr 2015 03:47:27 +0000 (20:47 -0700)]
fix CVE num

9 years agoupdate NEWS
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:22:09 +0000 (00:22 -0700)]
update NEWS

9 years agoMerge branch 'PHP-5.4' into PHP-5.4.40
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:08:57 +0000 (00:08 -0700)]
Merge branch 'PHP-5.4' into PHP-5.4.40

* PHP-5.4:
  fix CVE num

9 years agoFix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
commit | commitdiff | tree
Stanislav Malyshev [Tue, 14 Apr 2015 07:03:50 +0000 (00:03 -0700)]
Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)

9 years agofix test
commit | commitdiff | tree
Stanislav Malyshev [Mon, 13 Apr 2015 23:10:05 +0000 (16:10 -0700)]
fix test

9 years agofix type in fix for #69085
commit | commitdiff | tree
Remi Collet [Mon, 13 Apr 2015 12:39:11 +0000 (14:39 +0200)]
fix type in fix for #69085

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Remi Collet [Mon, 13 Apr 2015 12:40:43 +0000 (14:40 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix type in fix for #69085

9 years agofix type in fix for #69085
commit | commitdiff | tree
Remi Collet [Mon, 13 Apr 2015 12:39:11 +0000 (14:39 +0200)]
fix type in fix for #69085

(cherry picked from commit 085e9ddc26f37ce556b8fd787044746e726264b2)

9 years agoMerge branch 'PHP-5.4.40' into PHP-5.5.24
commit | commitdiff | tree
Stanislav Malyshev [Mon, 13 Apr 2015 06:49:16 +0000 (23:49 -0700)]
Merge branch 'PHP-5.4.40' into PHP-5.5.24

* PHP-5.4.40:
  fix memory leak & add test
  Fix tests

9 years agofix memory leak & add test
commit | commitdiff | tree
Stanislav Malyshev [Mon, 13 Apr 2015 05:00:18 +0000 (22:00 -0700)]
fix memory leak & add test

9 years agoFix tests
commit | commitdiff | tree
Stanislav Malyshev [Mon, 13 Apr 2015 03:53:09 +0000 (20:53 -0700)]
Fix tests

9 years agofix CVE num
commit | commitdiff | tree
Stanislav Malyshev [Mon, 13 Apr 2015 03:47:27 +0000 (20:47 -0700)]
fix CVE num

9 years agoMerge branch 'PHP-5.4.40' into PHP-5.5.24
commit | commitdiff | tree
Stanislav Malyshev [Mon, 13 Apr 2015 03:13:00 +0000 (20:13 -0700)]
Merge branch 'PHP-5.4.40' into PHP-5.5.24

* PHP-5.4.40:
  Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
  Fix test

9 years agoMerge branch 'PHP-5.5-security' into PHP-5.5.24
commit | commitdiff | tree
Stanislav Malyshev [Mon, 13 Apr 2015 03:12:38 +0000 (20:12 -0700)]
Merge branch 'PHP-5.5-security' into PHP-5.5.24

* PHP-5.5-security: (22 commits)
  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
  added test for bug #69354
  revert skipif, this should run everywhere
  further ODBC 3.0 compliance
  more compliance with the ODBC 3.0
  test fixes
  Prevent GC from changing zval or object 'color' before they are actually inserted into possible roots buffer.
  sigh, can't even copypaste without screwing up
  oop, put both the error number and message for both db object to the error message
  test fixes
  Fixed bug #69281 (opcache_is_script_cached no longer works)
  Fix typo: unitialized -> uninitialized
  Fix typo: unitialized -> uninitialized
  Fixed bug #68739 (Missing break / control flow). Fixed bug #68740 (NULL Pointer Dereference). Fixed bug #68677 (Use After Free).
  Fixed bug #68739 (Missing break / control flow in curl)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fixed bug #68677 (Use After Free in OPcache)
  ...

Conflicts:
configure.in
ext/curl/tests/bug69316.phpt
main/php_version.h

9 years agoFix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
commit | commitdiff | tree
Stanislav Malyshev [Sun, 12 Apr 2015 08:30:33 +0000 (01:30 -0700)]
Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)

9 years agoFix test
commit | commitdiff | tree
Stanislav Malyshev [Sun, 12 Apr 2015 07:56:02 +0000 (00:56 -0700)]
Fix test

9 years agoRemove failing test
commit | commitdiff | tree
Xinchen Hui [Sun, 12 Apr 2015 04:12:16 +0000 (12:12 +0800)]
Remove failing test

<nikic> [19:57:28] debian has a libmcrypt patch that makes it work
<nikic> [19:57:43] but not all other distros have it

9 years agoMerge branch 'PHP-5.4.40' into PHP-5.5.24
commit | commitdiff | tree
Stanislav Malyshev [Sat, 11 Apr 2015 23:56:12 +0000 (16:56 -0700)]
Merge branch 'PHP-5.4.40' into PHP-5.5.24

* PHP-5.4.40:
  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 #68740 (NULL Pointer Dereference)
  Fix bug #66550 (SQLite prepared statement use-after-free)
  Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.

9 years agoAdditional fix for bug #69324
commit | commitdiff | tree
Stanislav Malyshev [Sat, 11 Apr 2015 23:42:16 +0000 (16:42 -0700)]
Additional fix for bug #69324

Not so happy about duplication but needed due to bug #69429

9 years agoMore fixes for bug #69152
commit | commitdiff | tree
Stanislav Malyshev [Mon, 6 Apr 2015 00:30:59 +0000 (17:30 -0700)]
More fixes for bug #69152

9 years agoFixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
commit | commitdiff | tree
Stanislav Malyshev [Sun, 5 Apr 2015 23:01:24 +0000 (16:01 -0700)]
Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)

9 years agoFixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
commit | commitdiff | tree
Stanislav Malyshev [Sun, 5 Apr 2015 22:07:36 +0000 (15:07 -0700)]
Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)

9 years agoFixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHE...
commit | commitdiff | tree
Stanislav Malyshev [Sat, 4 Apr 2015 22:58:27 +0000 (15:58 -0700)]
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)

9 years agoFix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
commit | commitdiff | tree
Stanislav Malyshev [Sat, 4 Apr 2015 22:03:46 +0000 (15:03 -0700)]
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)

9 years agoFix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
commit | commitdiff | tree
Stanislav Malyshev [Sat, 4 Apr 2015 22:01:37 +0000 (15:01 -0700)]
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)

9 years agoFixed bug #68901 (use after free)
commit | commitdiff | tree
Xinchen Hui [Wed, 28 Jan 2015 16:00:09 +0000 (00:00 +0800)]
Fixed bug #68901 (use after free)

9 years agoUpdate NEWs
commit | commitdiff | tree
Xinchen Hui [Fri, 10 Apr 2015 14:48:48 +0000 (22:48 +0800)]
Update NEWs

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Xinchen Hui [Fri, 10 Apr 2015 14:48:36 +0000 (22:48 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

9 years agoFixed bug #69420 (Invalid read in zend_std_get_method)
commit | commitdiff | tree
Xinchen Hui [Fri, 10 Apr 2015 14:47:06 +0000 (22:47 +0800)]
Fixed bug #69420 (Invalid read in zend_std_get_method)

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Dmitry Stogov [Wed, 8 Apr 2015 18:24:24 +0000 (21:24 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)
  Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)

9 years agoFixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)
commit | commitdiff | tree
Dmitry Stogov [Wed, 8 Apr 2015 18:22:25 +0000 (21:22 +0300)]
Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)

9 years agoFixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)
commit | commitdiff | tree
Dmitry Stogov [Wed, 8 Apr 2015 18:20:35 +0000 (21:20 +0300)]
Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Ferenc Kovacs [Wed, 8 Apr 2015 17:00:21 +0000 (19:00 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix irc notification for build failure/recover

9 years agofix irc notification for build failure/recover
commit | commitdiff | tree
Ferenc Kovacs [Wed, 8 Apr 2015 17:00:03 +0000 (19:00 +0200)]
fix irc notification for build failure/recover

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Dmitry Stogov [Wed, 8 Apr 2015 12:54:10 +0000 (15:54 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed typo

9 years agoFixed typo
commit | commitdiff | tree
Dmitry Stogov [Wed, 8 Apr 2015 12:53:28 +0000 (15:53 +0300)]
Fixed typo

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Nikita Popov [Mon, 6 Apr 2015 20:06:48 +0000 (22:06 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
Zend/zend_compile.c
Zend/zend_compile.h

9 years agoFix bug #60022
commit | commitdiff | tree
Nikita Popov [Mon, 6 Apr 2015 20:03:04 +0000 (22:03 +0200)]
Fix bug #60022

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Nikita Popov [Mon, 6 Apr 2015 19:44:52 +0000 (21:44 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

9 years agoFix static member destruction
commit | commitdiff | tree
Nikita Popov [Mon, 6 Apr 2015 19:37:19 +0000 (21:37 +0200)]
Fix static member destruction

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Dmitry Stogov [Mon, 6 Apr 2015 15:16:08 +0000 (18:16 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #68652 (segmentation fault in destructor)

Conflicts:
NEWS

9 years agoFixed bug #68652 (segmentation fault in destructor)
commit | commitdiff | tree
Dmitry Stogov [Mon, 6 Apr 2015 15:11:41 +0000 (18:11 +0300)]
Fixed bug #68652 (segmentation fault in destructor)

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Mon, 6 Apr 2015 05:48:37 +0000 (22:48 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #68740 (NULL Pointer Dereference)

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 6 Apr 2015 05:48:27 +0000 (22:48 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #68740 (NULL Pointer Dereference)

9 years agoFixed bug #68740 (NULL Pointer Dereference)
commit | commitdiff | tree
Xinchen Hui [Tue, 31 Mar 2015 21:41:46 +0000 (00:41 +0300)]
Fixed bug #68740 (NULL Pointer Dereference)

(cherry picked from commit 124fb22a13fafa3648e4e15b4f207c7096d8155e)

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Mon, 6 Apr 2015 05:38:03 +0000 (22:38 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #66550 (SQLite prepared statement use-after-free)

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 6 Apr 2015 05:36:55 +0000 (22:36 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #66550 (SQLite prepared statement use-after-free)

9 years agoFix bug #66550 (SQLite prepared statement use-after-free)
commit | commitdiff | tree
Stanislav Malyshev [Mon, 6 Apr 2015 05:27:02 +0000 (22:27 -0700)]
Fix bug #66550 (SQLite prepared statement use-after-free)

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Mon, 6 Apr 2015 00:37:12 +0000 (17:37 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 6 Apr 2015 00:36:52 +0000 (17:36 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.

9 years agoBetter fix for #68601 for perf
commit | commitdiff | tree
Remi Collet [Wed, 17 Dec 2014 09:59:36 +0000 (10:59 +0100)]
Better fix for #68601 for perf
https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467

9 years agoFix bug #68601 buffer read overflow in gd_gif_in.c
commit | commitdiff | tree
Remi Collet [Sat, 13 Dec 2014 08:03:44 +0000 (09:03 +0100)]
Fix bug #68601 buffer read overflow in gd_gif_in.c

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Ferenc Kovacs [Sun, 5 Apr 2015 20:54:57 +0000 (22:54 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add travis failure/recover notification for our irc room

9 years agoadd travis failure/recover notification for our irc room
commit | commitdiff | tree
Ferenc Kovacs [Sun, 5 Apr 2015 20:54:30 +0000 (22:54 +0200)]
add travis failure/recover notification for our irc room

9 years agoMerge branch 'PHP-5.4.40' into PHP-5.5-security
commit | commitdiff | tree
Stanislav Malyshev [Sun, 5 Apr 2015 07:36:57 +0000 (00:36 -0700)]
Merge branch 'PHP-5.4.40' into PHP-5.5-security

* PHP-5.4.40:
  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)
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.

next
Unnamed repository; edit this file 'description' to name the repository.