]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Tue, 28 Apr 2015 06:30:57 +0000 (23:30 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Upgrade PCRE to 8.36, it fixes some crashes

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Tue, 28 Apr 2015 06:22:44 +0000 (23:22 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Upgrade PCRE to 8.36, it fixes some crashes

10 years agoUpgrade PCRE to 8.36, it fixes some crashes
commit | commitdiff | tree
Stanislav Malyshev [Tue, 28 Apr 2015 06:15:27 +0000 (23:15 -0700)]
Upgrade PCRE to 8.36, it fixes some crashes

We probably will need to go to 8.37 once it is released.

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Derick Rethans [Sun, 26 Apr 2015 10:04:35 +0000 (11:04 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoFixed location reading due to file format changes
commit | commitdiff | tree
Derick Rethans [Sun, 26 Apr 2015 10:04:16 +0000 (11:04 +0100)]
Fixed location reading due to file format changes

10 years ago- Updated to version 2015.4 (2015d)
commit | commitdiff | tree
Derick Rethans [Fri, 24 Apr 2015 16:22:33 +0000 (17:22 +0100)]
- Updated to version 2015.4 (2015d)

10 years agoEmpty merge
commit | commitdiff | tree
Derick Rethans [Fri, 24 Apr 2015 16:22:32 +0000 (17:22 +0100)]
Empty merge

10 years ago- Updated to version 2015.4 (2015d)
commit | commitdiff | tree
Derick Rethans [Fri, 24 Apr 2015 16:22:31 +0000 (17:22 +0100)]
- Updated to version 2015.4 (2015d)

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Yasuo Ohgaki [Fri, 24 Apr 2015 07:05:50 +0000 (16:05 +0900)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Set NULL after efree

10 years agoSet NULL after efree
commit | commitdiff | tree
Yasuo Ohgaki [Fri, 24 Apr 2015 07:04:01 +0000 (16:04 +0900)]
Set NULL after efree

10 years agoAdd entry for bug #69152 in 5.6.8
commit | commitdiff | tree
Lior Kaplan [Wed, 22 Apr 2015 16:40:56 +0000 (19:40 +0300)]
Add entry for bug #69152 in 5.6.8

10 years agoAdd entry for bug #69152 in 5.5.24
commit | commitdiff | tree
Lior Kaplan [Wed, 22 Apr 2015 16:38:26 +0000 (19:38 +0300)]
Add entry for bug #69152 in 5.5.24

10 years agoFormat alignment
commit | commitdiff | tree
Lior Kaplan [Wed, 22 Apr 2015 15:19:45 +0000 (18:19 +0300)]
Format alignment

10 years agoBug #68846 was fixed in 5.6.8 by 934d6ed9
commit | commitdiff | tree
Lior Kaplan [Wed, 22 Apr 2015 15:10:37 +0000 (18:10 +0300)]
Bug #68846 was fixed in 5.6.8 by 934d6ed9

10 years agoAdd merged bug fixes into 5.5.24
commit | commitdiff | tree
Lior Kaplan [Wed, 22 Apr 2015 14:41:34 +0000 (17:41 +0300)]
Add merged bug fixes into 5.5.24

Done in commits 25cb6f00 and 363e6ce6

10 years agoSince 5.6 stat.cwd using emalloc (Thanks to Remi)
commit | commitdiff | tree
Xinchen Hui [Wed, 22 Apr 2015 07:14:00 +0000 (15:14 +0800)]
Since 5.6 stat.cwd using emalloc (Thanks to Remi)

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Xinchen Hui [Tue, 21 Apr 2015 14:44:45 +0000 (22:44 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoRemove tail blank which is committed by accident
commit | commitdiff | tree
Xinchen Hui [Tue, 21 Apr 2015 14:44:22 +0000 (22:44 +0800)]
Remove tail blank which is committed by accident

10 years agoUpdate NEWS
commit | commitdiff | tree
Xinchen Hui [Tue, 21 Apr 2015 14:37:25 +0000 (22:37 +0800)]
Update NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Xinchen Hui [Tue, 21 Apr 2015 14:37:00 +0000 (22:37 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoFixed Bug #69467 (Wrong checked for the interface by using Trait)
commit | commitdiff | tree
Xinchen Hui [Tue, 21 Apr 2015 14:36:32 +0000 (22:36 +0800)]
Fixed Bug #69467 (Wrong checked for the interface by using Trait)

10 years agoupdated NEWS
commit | commitdiff | tree
Anatol Belski [Sun, 19 Apr 2015 18:33:09 +0000 (20:33 +0200)]
updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Sun, 19 Apr 2015 18:32:37 +0000 (20:32 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  fix more dir separators

10 years agoupdated NEWS
commit | commitdiff | tree
Anatol Belski [Sun, 19 Apr 2015 18:30:43 +0000 (20:30 +0200)]
updated NEWS

10 years agofix more dir separators
commit | commitdiff | tree
Anatol Belski [Sun, 19 Apr 2015 18:27:28 +0000 (20:27 +0200)]
fix more dir separators

10 years agoMerge remote-tracking branch 'github/pr/637' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Sun, 19 Apr 2015 00:51:42 +0000 (17:51 -0700)]
Merge remote-tracking branch 'github/pr/637' into PHP-5.6

* github/pr/637:
  Remove unused code from ext/json.

10 years agorelax tests with huge year (new zic)
commit | commitdiff | tree
Remi Collet [Sat, 18 Apr 2015 08:00:15 +0000 (10:00 +0200)]
relax tests with huge year (new zic)

10 years agoignore second value for huge timestamp test (new zic)
commit | commitdiff | tree
Remi Collet [Sat, 18 Apr 2015 07:37:06 +0000 (09:37 +0200)]
ignore second value for huge timestamp test (new zic)

10 years agorelax test for date < INT32_MIN (new zic)
commit | commitdiff | tree
Remi Collet [Sat, 18 Apr 2015 07:28:29 +0000 (09:28 +0200)]
relax test for date < INT32_MIN (new zic)

10 years agorelax bigbang content (new zic)
commit | commitdiff | tree
Remi Collet [Sat, 18 Apr 2015 07:11:39 +0000 (09:11 +0200)]
relax bigbang content (new zic)

10 years agoMake date transitions tests more flexible
commit | commitdiff | tree
Remi Collet [Sat, 18 Apr 2015 05:47:47 +0000 (07:47 +0200)]
Make date transitions tests more flexible

zic in recent glibc (2.20) introduce a new transitionn
so use a range to avoid failure when total number
of transitions is different (243/244)

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Hannes Magnusson [Fri, 17 Apr 2015 17:14:12 +0000 (10:14 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  phpweb now publishes SHA256s -- and please don't cc php-announce@ - make it seperate mail
  Fixed res leak

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Hannes Magnusson [Fri, 17 Apr 2015 17:06:31 +0000 (10:06 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  phpweb now publishes SHA256s -- and please don't cc php-announce@ - make it seperate mail
  Fixed res leak

10 years agophpweb now publishes SHA256s -- and please don't cc php-announce@ - make it seperate...
commit | commitdiff | tree
Hannes Magnusson [Fri, 17 Apr 2015 17:05:32 +0000 (10:05 -0700)]
phpweb now publishes SHA256s -- and please don't cc php-announce@ - make it seperate mail

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Fri, 17 Apr 2015 15:13:45 +0000 (17:13 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix column name attribute with ODBC 3.0
  migrate SQLAllocStmt for ODBC 3.0 compliance

10 years agofix column name attribute with ODBC 3.0
commit | commitdiff | tree
Anatol Belski [Fri, 17 Apr 2015 15:10:46 +0000 (17:10 +0200)]
fix column name attribute with ODBC 3.0

10 years agomigrate SQLAllocStmt for ODBC 3.0 compliance
commit | commitdiff | tree
Anatol Belski [Fri, 17 Apr 2015 14:09:35 +0000 (16:09 +0200)]
migrate SQLAllocStmt for ODBC 3.0 compliance

10 years agoskip test when xml not available
commit | commitdiff | tree
Remi Collet [Fri, 17 Apr 2015 13:20:22 +0000 (15:20 +0200)]
skip test when xml not available

10 years agoRun gmp_random tests more quickly
commit | commitdiff | tree
Nikita Popov [Thu, 16 Apr 2015 14:29:57 +0000 (16:29 +0200)]
Run gmp_random tests more quickly

10 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

10 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()

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

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

10 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

10 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

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

10 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

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

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

10 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

10 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

10 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

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

10 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

10 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

10 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

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

10 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

10 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

10 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

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

10 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

10 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

10 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

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

10 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)

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

10 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)

10 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

10 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

10 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

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

10 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

10 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

10 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

10 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)

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

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

10 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

10 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)

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

10 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

10 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

10 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)

10 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

10 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

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

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

10 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

10 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

10 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)

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