clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 23:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,783 Commits 494 Branches 1,367 Tags 809 MiB
8b74d46026
Commit Graph

31958 Commits

Author SHA1 Message Date
Anatol Belski
8b74d46026 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fixed EOL
 2013-06-11 08:33:19 +02:00
Anatol Belski
bd4f6ad8a0 fixed EOL 2013-06-11 08:32:54 +02:00
Anatol Belski
c90e95baf6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  added closing ?>
 2013-06-11 08:26:07 +02:00
Anatol Belski
28e264db2a added closing ?> 2013-06-11 08:25:38 +02:00
Stanislav Malyshev
8ac131503d Merge branch 'PHP-5.5' 
* PHP-5.5:
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'
 2013-06-10 14:31:57 -07:00
Stanislav Malyshev
4427d1dcfd Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Anatol Belski
d7c943e2a1 Merge branch 'PHP-5.5' 
* PHP-5.5:
  split the test for 32 and 64 bit
 2013-06-10 22:49:56 +02:00
Anatol Belski
ec79075394 split the test for 32 and 64 bit 2013-06-10 22:49:30 +02:00
Stanislav Malyshev
09bc6d7cf6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
 2013-06-10 13:37:56 -07:00
Stanislav Malyshev
84e35fb2e0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
 2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa typo fixes (argument) 2013-06-10 13:36:17 -07:00
Veres Lajos
ed2e84e239 typo fixes (accommodate, parameter) 2013-06-10 13:36:03 -07:00
Anatol Belski
0f9cf35315 Backported the fix for bug #53437 2013-06-10 19:52:29 +02:00
Anatol Belski
b80b8373af Merge branch 'PHP-5.5' 
* PHP-5.5:
  fixed the test
 2013-06-10 18:31:40 +02:00
Anatol Belski
760c85a70a fixed the test 2013-06-10 18:31:18 +02:00
Anatol Belski
44d9060648 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix a BC breach related to bug #53437
 2013-06-10 17:50:13 +02:00
Anatol Belski
02f3922047 Fix a BC breach related to bug #53437 
days and special_amount properties are exported as int again
 2013-06-10 17:48:13 +02:00
Jakub Vrana
46d3738d0a Fix image method signatures 2013-06-10 02:24:03 -07:00
Jakub Vrana
b787fdebba Fix image method signatures 2013-06-10 02:13:13 -07:00
Stanislav Malyshev
1355908149 Merge branch 'PHP-5.5' 
* PHP-5.5:
  PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
 2013-06-10 01:53:36 -07:00
Stanislav Malyshev
7a2d9690fe Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
 2013-06-10 01:53:29 -07:00
Antonio Diaz Ruiz
8a8bef1b73 PHPTests for the DOMDocument::loadHTMLfile method. 
They cover
- The basic behaviour
- When the method receives as argument a file which doesn't exist
- When the argument is an empty string
- When an empty file is loaded
- When a not-well formed html file is loaded

It also includes 2 auxilary files
- An empty html file
- A not well formed html file
 2013-06-10 01:50:00 -07:00
Dmitry Stogov
14a943ae86 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Callback has to be restored in MSHUTDOWN
 2013-06-10 12:34:34 +04:00
Dmitry Stogov
731b4a3fa4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Callback has to be restored in MSHUTDOWN
 2013-06-10 12:34:08 +04:00
Dmitry Stogov
336a8e1943 Callback has to be restored in MSHUTDOWN 2013-06-10 12:32:53 +04:00
Dmitry Stogov
738dfc69e7 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed comments
 2013-06-10 12:06:14 +04:00
Dmitry Stogov
53e6529203 Fixed comments 2013-06-10 12:05:20 +04:00
Dmitry Stogov
95d88cc66a Merge branch 'PHP-5.5' 
* PHP-5.5:
  Avoid multiple allocations of the same key in different processes
 2013-06-10 11:44:54 +04:00
Dmitry Stogov
23a9bb09ba Avoid multiple allocations of the same key in different processes 2013-06-10 11:43:03 +04:00
Dmitry Stogov
456ef2ebfa Merge branch 'PHP-5.5' 
* PHP-5.5:
  Compact HashTables before storing them in shared memory

Conflicts:
	ext/opcache/ZendAccelerator.c
 2013-06-10 11:25:41 +04:00
Dmitry Stogov
540488bf55 Compact HashTables before storing them in shared memory 2013-06-10 11:22:19 +04:00
Dmitry Stogov
841e1f0364 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Use size_t instead of int
 2013-06-10 10:37:53 +04:00
Dmitry Stogov
2e9d3e8b39 Use size_t instead of int 2013-06-10 10:36:35 +04:00
Xinchen Hui
00c7440b81 Merge branch 'PHP-5.5' 2013-06-09 22:26:18 +08:00
Xinchen Hui
3f229f4364 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-09 22:25:49 +08:00
Xinchen Hui
f338510c94 Merge branch 'PHP-5.3' into PHP-5.4 2013-06-09 22:25:07 +08:00
Xinchen Hui
75c57122e3 Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems) 2013-06-09 22:24:48 +08:00
Matteo Beccati
2c0f09540e Fixed signedness warning 2013-06-07 09:38:58 +02:00
Matteo Beccati
19ead23e8e Fixed bug #63657 (pgsqlCopyFrom/To methods use Postgres < 7.3 syntax) 
Although still supported (for now), I've replaced with pre-9.0 syntax.
Still not cutting edge, but it works with any version PDO_pgsql is
compatible with (7.4+) and will possibly keep working for longer than
what we already had.
 2013-06-07 09:36:54 +02:00
Anatol Belski
c6b569011a Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #64934 Apache2 TS crash with get_browser()
 2013-06-06 18:53:41 +02:00
Anatol Belski
bbdbef40db Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed bug #64934 Apache2 TS crash with get_browser()
 2013-06-06 18:52:39 +02:00
Anatol Belski
25cae37b13 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #64934 Apache2 TS crash with get_browser()
 2013-06-06 18:51:32 +02:00
Anatol Belski
1aee7ad636 Fixed bug #64934 Apache2 TS crash with get_browser() 
In favour of reading the browscap.ini into a true global var
only once in MINIT, the price for that is to deep copy the
any data from it.
 2013-06-06 18:49:04 +02:00
Stanislav Malyshev
3c8c200d0a Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix CVE-2013-2110 - use correct formula to calculate string size
 2013-06-04 22:01:02 -07:00
Stanislav Malyshev
785f4c5fc6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix CVE-2013-2110 - use correct formula to calculate string size
 2013-06-04 22:00:45 -07:00
Stanislav Malyshev
efdeec3c0e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix CVE-2013-2110 - use correct formula to calculate string size
 2013-06-04 21:58:44 -07:00
Stanislav Malyshev
93e0d78ec6 fix CVE-2013-2110 - use correct formula to calculate string size 2013-06-04 21:56:33 -07:00
Matteo Beccati
b62b8b4528 Fixed Bug #42614 (PDO_pgsql: add pg_get_notify support) 2013-06-05 01:58:55 +02:00
Matteo Beccati
baabd11929 Refactored custom PDO_pgsql methods to trigger errors/exceptions 
BC Break: the custom methods were previously just return false on
failure. Now they throw an exception with a proper error message.
An hopefully welcome improvement, but some application might be
depending on the old behaviour. FWIW the PDO::pgsqlCopy* methods
are not documented, even though they are available since 5.3.x.
 2013-06-05 01:58:37 +02:00