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
75,308 Commits 494 Branches 1,367 Tags 809 MiB
10c547018f
Commit Graph

32255 Commits

Author SHA1 Message Date
Stanislav Malyshev
10c547018f Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added recursivetreeiterator::setPostfix() method
 2013-07-21 22:22:02 -07:00
Joshua Thijssen
5027fa79d7 Added recursivetreeiterator::setPostfix() method 2013-07-21 22:20:58 -07:00
Stanislav Malyshev
1a05648e6d Merge branch 'PHP-5.5' 
* PHP-5.5:
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should contain the typo)
  mssql.compatability_mode fix

Conflicts:
	configure.in
	main/php_version.h
 2013-07-21 21:17:59 -07:00
Veres Lajos
e7a00a2566 add a few comment 2013-07-21 21:14:38 -07:00
Lajos Veres
f51b8d8820 allow both the old and new cfg argument to work. (the old of course should contain the typo) 2013-07-21 21:12:19 -07:00
Veres Lajos
b8941a73cc mssql.compatability_mode fix 2013-07-21 21:12:16 -07:00
Stanislav Malyshev
02457554a3 Merge branch 'PHP-5.5' 
* PHP-5.5:
  backward compatibility
  HASH_KEY_NON_EXISTANT fix
 2013-07-21 20:10:31 -07:00
Veres Lajos
4749457a49 HASH_KEY_NON_EXISTANT fix 2013-07-21 20:09:53 -07:00
Xinchen Hui
a522f2d1c9 Merge branch 'PHP-5.5' 2013-07-21 21:07:50 +08:00
Xinchen Hui
c7b58e4967 Merge branch 'PHP-5.4' into PHP-5.5 2013-07-21 21:07:27 +08:00
Xinchen Hui
3380de9774 Fixed bug #65304 (Use of max int in array_sum) 2013-07-21 21:07:19 +08:00
Gustavo André dos Santos Lopes
cbd1faf077 Merge branch 'PHP-5.5' 
* PHP-5.5:
  intl: remove extra quotes from arginfo params
 2013-07-21 03:30:42 +02:00
Gustavo André dos Santos Lopes
3363e04fb4 intl: remove extra quotes from arginfo params 2013-07-21 03:30:28 +02:00
Rui Hirokawa
cb607d4f78 updated test script for bug #65045. 2013-07-21 10:18:33 +09:00
Anatol Belski
c6651942ce Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix header include
  new NEWS for next release
 2013-07-18 15:29:17 +02:00
Anatol Belski
d8dd4d9b02 fix header include 
stddef.h is needed to have offsetof macros on windows (at least)
 2013-07-18 15:28:20 +02:00
Johannes Schlüter
f7e204d7ed Slightly modernize ext_skel and sekelton/ 
- .svnignore ->.gitignore
- Add .gitignore entries for DSO stand-alone builds stuff
- Docs don't use CVS but SVN
- reorder extname.c file so it needs less forward declarations
- take forward declarations out of php_extname.h
- Drop #if for 12 years old PHP version compatibility
 2013-07-17 23:18:13 +02:00
Arpad Ray
b594949144 Merge branch 'PHP-5.5' 
* PHP-5.5:
  regenerate url scanner
  Fixed bug #50308 - session id not appended properly for empty anchor tags
 2013-07-17 16:28:12 +01:00
Arpad Ray
31edf4df56 regenerate url scanner 2013-07-17 16:28:01 +01:00
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
fb53871d94 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix bug #62129 - rfc1867 crashes php even though turned off
 2013-07-17 11:09:37 +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
Anatol Belski
be721d5d8b Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix TS build
 2013-07-16 18:06:05 +02: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
12aec9ec8e Merge branch 'PHP-5.5' 
* PHP-5.5:
  added sapi check for dl() test
 2013-07-16 15:43:59 +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
dc489c30f0 Merge branch 'PHP-5.5' 2013-07-16 13:56:06 +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
83a60d45f5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed typo ensuring header str is \0 terminated
 2013-07-16 00:15:54 +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
2443df37fd Merge branch 'PHP-5.5' 
* PHP-5.5:
  NEWS for 710150c and e2744f1
  socket: support unix paths in the abstract namespace
  socket: fix bug #65260 (SCM_RIGHTS)
 2013-07-16 00:03:00 +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
af377da60a Merge branch 'PHP-5.5' 
* PHP-5.5:
  kick unused var
 2013-07-15 17:23:48 +02:00
Anatol Belski
904c5d7ba8 kick unused var 2013-07-15 17:23:16 +02:00
Stanislav Malyshev
6aa694a8d8 Merge branch 'PHP-5.5' 
* PHP-5.5:
  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:43 -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
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
c2088f8b81 revert false fix 2013-07-15 00:19:56 -07:00