clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,640 Commits 491 Branches 1,363 Tags 844 MiB
f4319a4f73
Commit Graph

76640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev
184b6d9e73 fix memory leak 2015-01-04 21:07:57 -08:00
Stanislav Malyshev
eeae4651f7 Merge branch 'pull-request/975' into PHP-5.5 
* pull-request/975:
  Fixes #66764 -  configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
 2015-01-04 20:54:29 -08:00
Stanislav Malyshev
5639c3350e Merge branch 'pull-request/742' into PHP-5.5 
* pull-request/742:
  Fixed typo
  GD: imagepalettetotruecolor tests
 2015-01-04 19:47:54 -08:00
Stanislav Malyshev
75f93ed663 fix GD tests with no GD loaded 2015-01-04 19:45:57 -08:00
Anatol Belski
4ed261870f updated libmagic.patch in 5.5 2015-01-04 17:05:42 +01:00
Anatol Belski
c772261319 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated libmagic.patch in 5.4
 2015-01-04 17:04:53 +01:00
Anatol Belski
ebb98e7aeb updated libmagic.patch in 5.4 2015-01-04 17:04:13 +01:00
Anatol Belski
d3f171117c updated NEWS 2015-01-04 14:23:33 +01:00
Anatol Belski
5fe54dbaf9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #68735 fileinfo out-of-bounds memory access
 2015-01-04 14:22:37 +01:00
Anatol Belski
ede59c8feb Fixed bug #68735 fileinfo out-of-bounds memory access 2015-01-04 14:20:21 +01:00
Anatol Belski
b644dcfb72 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  removed dead code
 2015-01-04 09:40:56 +01:00
Remi Collet
919abf0cb1 removed dead code 2015-01-04 09:40:19 +01:00
Ferenc Kovacs
83db775323 Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly 2015-01-03 19:18:07 +01:00
Greg Roach
244fc1e053 Fixes #67960 - Long/short day names reversed in jddayofweek() 2015-01-02 10:14:12 +01:00
Stanislav Malyshev
b585a3aed7 Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize()) 2015-01-01 16:19:05 -08:00
Anatol Belski
99162b8198 updated libmagic.patch 2014-12-30 20:21:28 +01:00
Anatol Belski
d92a87d7cb Fixed bug #68671 incorrect expression in libmagic 2014-12-30 19:37:27 +01:00
Adam Harvey
211f4ceeae Check the return value of lo_export. 
Patch by Ondřej Surý. Fixes bug #68697 (lo_export return -1 on failure).
 2014-12-30 17:47:19 +00:00
Anatol Belski
d5123415f6 Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream 2014-12-30 16:50:22 +01:00
Anatol Belski
6e36ded569 remove BOM from NEWS 2014-12-30 16:47:10 +01:00
Stanislav Malyshev
71c970077d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  FIx bug #68618 (out of bounds read crashes php-cgi)
 2014-12-30 01:26:00 -08:00
Stanislav Malyshev
f9ad308669 FIx bug #68618 (out of bounds read crashes php-cgi) 2014-12-30 01:23:05 -08:00
Kalle Sommer Nielsen
fbf3a6bc1a Fixed bug #68676 (Explicit Double Free) 2014-12-29 11:04:23 +01:00
Keyur Govande
aa192f57c9 Fix for failing tests. gcc 4.8.3 would optimize away the assigment. 2014-12-26 20:36:19 +00:00
Xinchen Hui
80260bcfa6 Fixed test 2014-12-25 06:20:52 -05:00
Nikita Popov
aa394e70ff Fix bug #67111 
Loop variables need to be freed for both "break" and "continue".

I'm adding the test to Zend/ because it's good to have a test for
this even without opcache.
 2014-12-19 21:42:42 +01:00
Remi Collet
5fc2fede9c Better fix for #68601 for perf 
81e9a993f2
 2014-12-17 10:59:36 +01:00
Ferenc Kovacs
5a67d9a229 add missing NEWS entry 2014-12-17 02:13:59 +01:00
Ferenc Kovacs
925fa271ec Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add missing NEWS entry
  5.4.37

Conflicts:
	configure.in
	main/php_version.h
 2014-12-17 02:13:13 +01:00
Ferenc Kovacs
cd387b4575 add missing NEWS entry 2014-12-17 02:10:36 +01:00
Stanislav Malyshev
8fe4cc6d28 5.4.37 2014-12-16 11:44:41 -08:00
Stanislav Malyshev
8efd73c4d2 update news 2014-12-16 10:18:07 -08:00
Stanislav Malyshev
622a346302 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add CVE
  add missing test file
  Fix bug #68594 - Use after free vulnerability in unserialize()
 2014-12-16 10:17:07 -08:00
Stanislav Malyshev
53f129a44d add CVE 2014-12-16 10:16:31 -08:00
Stanislav Malyshev
b75867fff0 add missing test file 2014-12-16 10:15:17 -08:00
Stanislav Malyshev
630f9c33c2 Fix bug #68594 - Use after free vulnerability in unserialize() 2014-12-16 10:15:17 -08:00
Remi Collet
9c4de388c6 fix perms 2014-12-16 08:37:48 +01:00
Andrea Faulds
f804a3614e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix undefined behaviour in strnatcmp
  update NEWS
  move the test to the right place
  Fixed bug #68545 NULL pointer dereference in unserialize.c

Conflicts:
	NEWS
 2014-12-13 22:28:45 +00:00
Andrea Faulds
034e6decb3 Fix undefined behaviour in strnatcmp 2014-12-13 22:27:10 +00:00
Remi Collet
ba62b9bbf8 NEWS 2014-12-13 09:04:57 +01:00
Remi Collet
07b5896a13 Fix bug #68601 buffer read overflow in gd_gif_in.c 2014-12-13 09:03:44 +01:00
Jille Timmermans
9beb3763db pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary 2014-12-12 18:16:12 +01:00
Julien Pauli
d43d0663af Updated NEWS 2014-12-12 16:50:32 +01:00
mcq8
86f1875536 Fix bug #68532: convert.base64-encode omits padding bytes 2014-12-12 16:42:38 +01:00
Julien Pauli
d6eb3b49c8 Updated NEWS 2014-12-12 15:06:04 +01:00
Kévin Dunglas
ee226b961c Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor) 2014-12-12 14:58:23 +01:00
Julien Pauli
fbe9b2c088 Updated NEWS 2014-12-12 14:18:27 +01:00
Anatol Belski
3affc0e8a2 Fixed bug #68583 Crash in timeout thread 
This replaces the GUI element used for execution timeout handling
on Windows. Instead a timer queue technique is used, which is indeed
a thread pool. A timer queue timer is a lightweight object handled
but that thread pool and the timer thread spends most of the time
sleeping and waiting for an alert.

Please note also that this introduces neither binary nor source
breach. The custom timeout thread functions are deleted, however
they was not exported throug DLL, so couldn't be used by any
external code. As well they couldn't be used anywhere in the core
except in executor api, because those custom timeout thread
functions they used to operate on static variables which would
be overwritten (and that would blow).

So instead a relatively modern technique is used for the timeout
handling. It's still not perfect because the executor still has to
check EX(timed_out). This can be a topic for an improvement in
master. But brobably can be tricky as currently it seems to be not
possible to signal an individual thread. Also note another issue
that static variables aren't thread safe, but the current timer
implementation is.
 2014-12-12 10:43:31 +01:00
Stanislav Malyshev
97df260b27 update NEWS 2014-12-11 10:41:17 -08:00
Anatol Belski
0323f66fa2 move the test to the right place 2014-12-11 10:39:47 -08:00