Commit graph

74239 commits

Author SHA1 Message Date
Arpad Ray
94ab37f06a Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #50308 - session id not appended properly for empty anchor tags
2013-07-17 16:19:53 +01:00
Arpad Ray
e6ae977082 Fixed bug #50308 - session id not appended properly for empty anchor tags
The issue was actually because a lack of space before a "/" marking the tag
as empty. This was being swallowed in the rule for unquoted values. Fixed
by making that rule exclude quotes (as per spec anyway).
2013-07-17 16:07:26 +01:00
Arpad Ray
0d3d739bf7 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #62129 - rfc1867 crashes php even though turned off
2013-07-17 11:05:23 +01:00
Arpad Ray
ba3234888d Fix bug #62129 - rfc1867 crashes php even though turned off
Patch by gxd305 at gmail dot com
2013-07-17 11:02:48 +01:00
Stanislav Malyshev
c855f44737 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add news for xml fix
2013-07-16 15:39:16 -07:00
Stanislav Malyshev
eb8c15b573 add news for xml fix 2013-07-16 15:38:37 -07:00
Anatol Belski
fd5cdf89a8 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix TS build
2013-07-16 18:05:45 +02:00
Anatol Belski
bb6d74918e fix TS build 2013-07-16 18:05:14 +02:00
Anatol Belski
f37ac6f591 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  added sapi check for dl() test
2013-07-16 15:43:37 +02:00
Anatol Belski
135f81c5ae added sapi check for dl() test 2013-07-16 15:42:38 +02:00
Johannes Schlüter
e1a0c90b8b Merge branch 'PHP-5.4' into PHP-5.5 2013-07-16 13:55:32 +02:00
Johannes Schlüter
d3a4af4db8 Make zval2myslqnd implementations aware of inheritance 2013-07-16 13:52:57 +02:00
Anatol Belski
54b740a7e1 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed typo ensuring header str is \0 terminated
2013-07-16 00:15:29 +02:00
Anatol Belski
bcb39d9c6a Fixed typo ensuring header str is \0 terminated
This was obviously intended to send an empty header if
php_gmtime_r() fails. Currently it could send garbage.
2013-07-16 00:14:05 +02:00
Gustavo Lopes
ceecfaff5a NEWS for 710150c and e2744f1 2013-07-16 00:02:43 +02:00
Gustavo Lopes
710150ccb7 socket: support unix paths in the abstract namespace
Those starting with '\0'.
2013-07-15 23:57:51 +02:00
Gustavo Lopes
e2744f1aa3 socket: fix bug #65260 (SCM_RIGHTS)
The data for messages of type SOL_SOCKET/SCM_RIGHTS was not being
passed correctly. There were actually two bugs: (1) the number of file
descriptors being passed was being read incorrectly (the length of the
cmsg array was being read instead of that of its 'data' element), as a
result it was generally being reported as always three elements
('level', 'type' and 'data') and (2) the allocated block for writing
the file descriptors was being acessed incorrectly because a 1-based
counter was being used as if it was 0-based.

Any of these two bugs would probably be enough to cause heap
corruption.
2013-07-15 23:57:49 +02:00
Anatol Belski
e7a4cf8d7e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix buffer overrun
2013-07-15 17:35:29 +02:00
Anatol Belski
9561e598a0 fix buffer overrun 2013-07-15 17:34:36 +02:00
Anatol Belski
904c5d7ba8 kick unused var 2013-07-15 17:23:16 +02:00
Bruno CHALOPIN
2ec7b1c388 Remove PWS (Personal Web Server) references 2013-07-15 00:38:29 -07:00
Stanislav Malyshev
68e630b72f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
  fix invalid variable name at ext/spl/internal/multipleiterator.inc
2013-07-15 00:36:35 -07:00
sasezaki
e617679c0b fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too) 2013-07-15 00:36:29 -07:00
kazusuke sasezaki
76775a3aa7 fix invalid variable name at ext/spl/internal/multipleiterator.inc 2013-07-15 00:36:19 -07:00
Stanislav Malyshev
0aadbf7578 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  revert false fix
  typo fixes
  less serious compatAbility fixes
  typos (orig)

Conflicts:
	ext/mysql/php_mysql.c
2013-07-15 00:27:57 -07:00
Veres Lajos
2c73ce4363 revert false fix 2013-07-15 00:23:17 -07:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
b79b13b4ef less serious compatAbility fixes 2013-07-15 00:21:39 -07:00
Veres Lajos
bb64106f64 typos (orig) 2013-07-15 00:20:49 -07:00
Veres Lajos
f23a5fbc8e revert false fix 2013-07-15 00:19:07 -07:00
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Veres Lajos
b8a2b254a1 typos (orig) 2013-07-15 00:18:32 -07:00
Veres Lajos
227556c6a2 less serious compatAbility fixes 2013-07-15 00:17:35 -07:00
Stanislav Malyshev
8c663fd4cc Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #62665: add curl.cainfo to php.ini

Conflicts:
	php.ini-development
	php.ini-production
2013-07-14 23:56:59 -07:00
Stanislav Malyshev
2bad01e61b Fix bug #62665: add curl.cainfo to php.ini
Conflicts:

	php.ini-development
	php.ini-production
2013-07-14 23:56:03 -07:00
Stanislav Malyshev
07ab23655a Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add news for bug #65219
2013-07-14 17:07:24 -07:00
Stanislav Malyshev
a51b50000d add news for bug #65219 2013-07-14 17:07:06 -07:00
Stanislav Malyshev
9cc9d32e6a Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Add built-in web server to invocation list
  Terminology: change embedded web server to built-in web server to align with cli usage
  Align -B and -E parameter names with cli usage (begin_code and end_code)
  Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record
2013-07-14 17:01:43 -07:00
Lior Kaplan
f4b9b20b35 Add built-in web server to invocation list 2013-07-14 17:00:56 -07:00
Lior Kaplan
bcef0ebc2d Terminology: change embedded web server to built-in web server to align with cli usage 2013-07-14 16:42:23 -07:00
Lior Kaplan
07501dc1a2 Align -B and -E parameter names with cli usage (begin_code and end_code) 2013-07-14 16:42:09 -07:00
Anatol Belski
6e3134610c Merge branch 'PHP-5.4' of https://github.com/php/php-src into PHP-5.4 2013-07-14 20:48:26 +02:00
Anatol Belski
168a5bb6df Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix uninitialized memory usage
2013-07-14 20:46:19 +02:00
Anatol Belski
add0833681 fix uninitialized memory usage 2013-07-14 20:44:29 +02:00
Stanley Sufficool
67c03eac62 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
2013-07-14 11:18:11 -07:00
Stanley Sufficool
d012bdca03 Fix Bug #65219
DBSETLDBNAME should be called before login to set DBNAME in login record
2013-07-14 11:16:42 -07:00
Stanley Sufficool
6e32a871a4 Merge branch 'PHP-5.3' of https://git.php.net/push/php-src into PHP-5.3
* 'PHP-5.3' of https://git.php.net/push/php-src: (23 commits)
  Merge PHP 5.3.27 NEWS
  add test for bug #65236
  truncate results at depth of 255 to prevent corruption
  fix assembly of safe_address() for x86 and x86_64
  Add bison 2.6.4 to the list of supported versions
  Update git rules (5.5 is stable, 5.3 sec only)
  This will be PHP 5.3.28
  Fixed bug #63186 (compile failure on netbsd)
  ensure the error_reporting level to get expected notice
  fixed tests
  missing tests for bug #53437
  missing colon
  Backported the fix for bug #53437
  Fixed test script
  Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
  Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)
  Fixed bug #64934 Apache2 TS crash with get_browser()
  Add NEWS for PHP 5.3.26
  Fixed bug #64960 (Segfault in gc_zval_possible_root)
  fix CVE-2013-2110 - use correct formula to calculate string size
  ...
2013-07-14 11:10:36 -07:00
Xinchen Hui
e20fc85454 Update NEWS 2013-07-14 11:56:37 +08:00
Xinchen Hui
2c4f823437 Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
2013-07-14 11:53:56 +08:00
Xinchen Hui
ebad5178c4 Fixed bug #65254 (Exception not catchable when exception thrown in autoload with a namespace). 2013-07-14 11:47:06 +08:00