clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,605 Commits 494 Branches 1,367 Tags 801 MiB
785e66adb5
Commit Graph

72605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lars Strojny
785e66adb5 PR #260: Update css for 404 pages to feel more up to date and have a consistent layout across browsers 2013-01-14 20:43:14 +01:00
Lars Strojny
97157b376f Merge branch 'PHP-5.4' into PHP-5.5 2013-01-14 18:53:40 +01:00
Lars Strojny
bf9ad4e661 Support BITMAPV5HEADER in getimagesize(): https://en.wikipedia.org/wiki/BMP_file_format#DIB_header_.28bitmap_information_header.29 2013-01-14 18:52:38 +01:00
Lars Strojny
3ec2281298 Merge branch 'PHP-5.4' into PHP-5.5 2013-01-14 18:00:00 +01:00
Lars Strojny
1e9a3ed234 Fix bug #63916: PDO::PARAM_INT casts to 32bit int internally even on 64bit builds in pdo_sqlite 2013-01-14 17:59:11 +01:00
Lars Strojny
b16463a9fb Merge branch 'PHP-5.4' into PHP-5.5 2013-01-14 17:36:07 +01:00
Lars Strojny
99d087e5d4 Fixed bug #63921: sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API 2013-01-14 17:35:07 +01:00
Xinchen Hui
be07f815f2 Use zend_unmangle_property_name_ex to save strlen 2013-01-14 17:08:21 +08:00
Xinchen Hui
62059c16ee Fixed bug #63980 (object members get trimmed by zero bytes) 2013-01-14 16:23:22 +08:00
Adam Harvey
fe27146b1b Tinker with UPGRADING's wording for the format string changes for clarity. 2013-01-14 13:54:43 +08:00
Stanislav Malyshev
30fd25bb49 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #63982: isset() inconsistently produces a fatal error on protected property
  different OSes have different messages, and that's not what the test is about anyway
 2013-01-13 17:27:05 -08:00
Stanislav Malyshev
1a96fe0b32 fix bug #63982: isset() inconsistently produces a fatal error on protected property 2013-01-13 17:08:52 -08:00
Stanislav Malyshev
c6203da6c2 different OSes have different messages, and that's not what the test is about anyway 2013-01-13 16:58:27 -08:00
Arnaud Le Blanc
718afb9acf Merge branch 'PHP-5.4' into PHP-5.5 2013-01-13 15:47:12 +01:00
Arnaud Le Blanc
a06313fe5a fixed alternate form for 'x' and 'X' formats 
same fix exists in original code:
https://svn.apache.org/viewvc?view=revision&revision=1152309
 2013-01-13 15:45:15 +01:00
Dmitry Stogov
52dd0d1c73 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed uninitialized zval.type (Yoram)
 2013-01-10 18:54:37 +04:00
Dmitry Stogov
046ae2f77c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed uninitialized zval.type (Yoram)
 2013-01-10 18:54:19 +04:00
Dmitry Stogov
e1410b5a70 Fixed uninitialized zval.type (Yoram) 2013-01-10 18:53:10 +04:00
ULF WENDEL
f787e21ef5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  MySQL 5.6 EXPIRE PASSWORD flag tests
 2013-01-10 14:53:46 +01:00
ULF WENDEL
36e88d78e6 MySQL 5.6 EXPIRE PASSWORD flag tests 2013-01-10 14:51:14 +01:00
Remi Collet
b3a934bdb3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
 2013-01-10 11:18:25 +01:00
Remi Collet
f659ec108f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
 2013-01-10 11:17:53 +01:00
Remi Collet
dc9f0e70b7 Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) 
See commit c05ee74e7f
 2013-01-10 11:14:38 +01:00
Andrey Hristov
846e506a3d Merge branch 'PHP-5.4' into PHP-5.5 2013-01-09 19:15:29 +01:00
Andrey Hristov
d430b5a4eb Add mysqli support - constants and checking in mysqli_options() for the 
new constant for password expriration
 2013-01-09 19:14:48 +01:00
Andrey Hristov
790096b68b Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/mysqlnd/mysqlnd_enum_n_def.h
 2013-01-09 19:03:56 +01:00
Andrey Hristov
258c76eb41 backport handling of expired passwords in mysqlnd to 5.4 2013-01-09 18:58:29 +01:00
Andrey Hristov
1f7f8429af Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/mysqlnd/mysqlnd.c
 2013-01-09 18:40:57 +01:00
Andrey Hristov
bcd278ad7f fix compilation error after merge 2013-01-09 18:39:59 +01:00
Andrey Hristov
cb6071ef54 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/mysqlnd/mysqlnd.c
 2013-01-09 18:30:56 +01:00
Andrey Hristov
6a6ec195ac Merge branch 'PHP-5.3' into PHP-5.4 2013-01-09 18:27:50 +01:00
Andrey Hristov
12e759c2ea Use during connect the flags set with set_client_option() 2013-01-09 18:27:06 +01:00
Andrey Hristov
ddcb67d446 support for password expiration in mysqlnd, through a flag 2013-01-09 15:33:07 +01:00
Andrey Hristov
83f736aad4 Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5 2013-01-09 15:07:26 +01:00
Dmitry Stogov
c3ebd6305e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed compilator bug that might cause jump depended on unitialized value
 2013-01-09 17:52:48 +04:00
Andrey Hristov
b8a369f522 Add new constants 2013-01-09 14:50:43 +01:00
Dmitry Stogov
625000ab44 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed compilator bug that might cause jump depended on unitialized value
 2013-01-09 17:36:44 +04:00
Dmitry Stogov
d4650c5d69 Fixed compilator bug that might cause jump depended on unitialized value 2013-01-09 17:16:47 +04:00
Dmitry Stogov
326f896739 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #63882 (zend_std_compare_objects crash on recursion)

Conflicts:
	NEWS
 2013-01-09 11:32:40 +04:00
Dmitry Stogov
f9e8678dd3 Fixed bug #63882 (zend_std_compare_objects crash on recursion) 2013-01-09 11:30:50 +04:00
Xinchen Hui
6deb8361f3 Merge branch 'PHP-5.4' into PHP-5.5 2013-01-09 10:57:47 +08:00
Xinchen Hui
f3b1b85169 update NEWS 2013-01-09 10:55:50 +08:00
Xinchen Hui
15aaa9c660 Merge branch 'PHP-5.3' into PHP-5.4 2013-01-09 10:54:23 +08:00
Xinchen Hui
c05ee74e7f Fixed bug #63943 (Bad warning text from strpos() on empty needle) 2013-01-09 10:53:20 +08:00
Adam Harvey
9566314d62 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add NEWS for the previously cherry picked commit.
  sapi/litespeed/lsapi_main.c: Fix bug #63228

Conflicts:
	sapi/litespeed/lsapi_main.c
 2013-01-08 11:45:26 +08:00
Adam Harvey
6e684e6a6c Add NEWS for the previously cherry picked commit. 2013-01-08 11:40:51 +08:00
George Wang
9c52d09ebc sapi/litespeed/lsapi_main.c: Fix bug #63228 
Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]
 2013-01-08 11:40:13 +08:00
Andrey Hristov
cde53e7fcd fix different values of mysqli_stmt_affected_rows between libmysql 
and mysqlnd (in favor of libmysql) before execute and after prepare()
 2013-01-07 16:36:21 +01:00
Pierre Joye
f4142a92b2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - fix the fix for bug #50524
 2013-01-07 13:04:29 +01:00
Pierre Joye
a71e91626a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - fix the fix for bug #50524
 2013-01-07 13:04:04 +01:00