clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,556 Commits 493 Branches 1,365 Tags 848 MiB
cde53e7fcd
Commit Graph

72556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pierre Joye
c0fae054c9 - fix the fix for bug #50524 2013-01-07 13:03:12 +01:00
Anatoliy Belsky
8a481c711a fix windows build 2013-01-06 18:37:26 +01:00
Derick Rethans
98331c89a1 Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5 2013-01-06 15:10:16 +00:00
Derick Rethans
4ff088d061 Merge branch 'PHP-5.4' into PHP-5.5 2013-01-06 15:07:25 +00:00
Derick Rethans
ba35ae32b7 Merge branch 'PHP-5.3' into PHP-5.4 2013-01-06 15:07:13 +00:00
Lars Strojny
a951693cfb News entry for bug #52126 2013-01-06 15:13:32 +01:00
Martin Jansen
371372714d Add unit test for mail.log ini setting. 2013-01-06 15:04:27 +01:00
Martin Jansen
4a3bf25e3f Add a timestamp to the mail log. 
This patch is loosely based on the one in bug #52126 but instead of
using a UNIX timestamp it uses the date format also being used by
error_log et al.
 2013-01-06 15:04:19 +01:00
Lars Strojny
853ef3c9cb Merge branch 'PHP-5.4' into PHP-5.5 2013-01-06 14:54:40 +01:00
Lars Strojny
bdc1e2302c Adding test for bug #63462 2013-01-06 14:46:49 +01:00
Derick Rethans
ff9c1b12ff Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV. 2013-01-06 13:39:34 +00:00
Lars Strojny
9934efff5f Merge branch 'PHP-5.4' into PHP-5.5 2013-01-06 14:10:07 +01:00
Lars Strojny
d7da1aa694 Coding style, ANSI C compatibility 2013-01-06 14:08:23 +01:00
Xinchen Hui
742b0e5b92 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-01-06 10:23:51 +08:00
Xinchen Hui
cbb5d42b9b Merge branch 'PHP-5.4' into PHP-5.5 2013-01-06 10:23:21 +08:00
Lars Strojny
ec2fff80e7 Bug #23955: allow specifiy max age for setcookie() 2013-01-06 03:22:44 +01:00
Xinchen Hui
a426e0b050 bump year 2013-01-06 10:22:15 +08:00
Xinchen Hui
a3a699e090 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-01-06 10:20:10 +08:00
Xinchen Hui
c2f8e90504 Merge branch 'PHP-5.3' into PHP-5.4 2013-01-06 10:20:00 +08:00
Xinchen Hui
bc11e6fdbb bump year 2013-01-06 10:19:09 +08:00
Lars Strojny
8e5460ad86 Adding test from 5.5 2013-01-06 03:15:08 +01:00
Lars Strojny
67557fcfce Bug #63699: performance improvements for varios ext/date functions 2013-01-06 03:06:09 +01:00
Lars Strojny
f3824ad166 Bug #63699 performance improvements for ext/date by only validating timezone when timezone is set 2013-01-06 02:10:16 +01:00
Pierrick Charron
f85e5950ab Improve resource management for curl handle 
Previous implementation was using its own refcounting (uses field of
the php_curl struct). zend_list_add/remove already implements its own
refcount, so we don't need to use an other one.
 2013-01-05 11:07:59 -05:00
Xinchen Hui
c4f2a20f15 Merge branch 'PHP-5.4' into PHP-5.5 2013-01-04 11:05:53 +08:00
Xinchen Hui
2feea39a33 Update NEWS 2013-01-04 11:05:24 +08:00
Xinchen Hui
aff5d084a5 Merge branch 'PHP-5.3' into PHP-5.4 2013-01-04 11:03:52 +08:00
Xinchen Hui
c3e6de2227 Fixed bug #63899 (Use after scope error in zend_compile) 2013-01-04 11:02:21 +08:00
Stanislav Malyshev
1dda0c55d5 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  remove set but not used variables
 2013-01-03 17:33:13 -08:00
Stanislav Malyshev
a72102f267 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.12-dev
  This will be PHP 5.3.22

Conflicts:
	configure.in
	main/php_version.h
 2013-01-03 17:27:19 -08:00
Stanislav Malyshev
5894aa0950 5.4.12-dev 2013-01-03 17:25:56 -08:00
Johannes Schlüter
c2ad8926e7 Merge branch 'PHP-5.4' into PHP-5.5 2013-01-03 23:00:17 +01:00
Johannes Schlüter
aaecb99c6b Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	configure.in
	main/php_version.h
 2013-01-03 22:59:38 +01:00
Johannes Schlüter
712710bfec This will be PHP 5.3.22 2013-01-03 22:56:46 +01:00
Remi Collet
b3a8609837 remove set but not used variables 2013-01-02 16:48:46 +01:00
Stanislav Malyshev
ff6b9a4b68 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add bug #63762
 2013-01-01 22:10:10 -08:00
Stanislav Malyshev
7ed2fdbf99 add bug #63762 2013-01-01 22:09:32 -08:00
Stanislav Malyshev
39df129161 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add fix #43177
 2013-01-01 21:24:37 -08:00
Stanislav Malyshev
86c46b96b6 add fix #43177 2013-01-01 21:24:11 -08:00
Stanislav Malyshev
80a9a80a52 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
  fix NEWS

Conflicts:
	main/main.c
 2013-01-01 21:20:35 -08:00
Stanislav Malyshev
36e19c9cab Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected. 
Without this fix, a webpage using eval() may return code 500.  That might display
fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
 2013-01-01 21:18:59 -08:00
Stanislav Malyshev
dd288f93e1 fix NEWS 2013-01-01 19:05:25 -08:00
Pierrick Charron
343a9199bb Remove passwd handler from struct when not needed 
CURLOPT_PASSWDFUNCTION was removed in cURL 7.15.5, the passwd field
will not be used for version greater than this one
 2013-01-01 21:12:02 -05:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
f01c295dc6 Merge branch 'PHP-5.4' into PHP-5.5 2013-01-01 16:31:06 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
58dabff8ed Merge branch 'PHP-5.3' into PHP-5.4 2013-01-01 16:25:09 +08:00