clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 07:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
87,836 Commits 494 Branches 1,367 Tags 803 MiB
614a628ace
Commit Graph

87836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
614a628ace fix data type 2015-02-04 18:13:24 +01:00
Julien Pauli
c65f77d195 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS
 2015-02-04 17:46:14 +01:00
Julien Pauli
a79f332333 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
 2015-02-04 17:45:38 +01:00
Julien Pauli
959cecf046 Updated NEWS 2015-02-04 17:43:36 +01:00
Julien Pauli
58dee64f51 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
 2015-02-04 17:40:07 +01:00
Julien Pauli
583af4979b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
 2015-02-04 17:39:34 +01:00
Julien Pauli
f51b73c833 Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)" 
This reverts commit 8e19705a93.
 2015-02-04 17:39:16 +01:00
Julien Pauli
f262e5f250 Merge branch 'PHP-5.6' 
* PHP-5.6:
  5.6.7 now
  5.5.23 now

Conflicts:
	configure.in
	main/php_version.h
 2015-02-04 17:34:28 +01:00
Julien Pauli
421d309908 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.5.23 now

Conflicts:
	configure.in
	main/php_version.h
 2015-02-04 17:32:46 +01:00
Dmitry Stogov
a787719d4f Removed TSRMLS_D 2015-02-04 18:47:30 +03:00
Julien Pauli
e6ea244004 5.6.7 now 2015-02-04 16:37:49 +01:00
Julien Pauli
b86529f751 5.5.23 now 2015-02-04 16:35:32 +01:00
Dmitry Stogov
8b46d45a9d Simplify code and add comments 2015-02-04 17:56:14 +03:00
Dmitry Stogov
9e70d7672d Move zend_object->guards into additional slot of zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced. 2015-02-04 15:24:13 +03:00
Dmitry Stogov
87377c1707 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Revert "json_decode() should generate a syntax error when given ""."
  Update NEWS
 2015-02-04 15:23:40 +03:00
Julien Pauli
dee113ba4a Merge branch 'PHP-5.6' 
* PHP-5.6:
  Revert "json_decode() should generate a syntax error when given ""."
  Update NEWS
 2015-02-04 13:10:59 +01:00
Julien Pauli
93315c4e1d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Revert "json_decode() should generate a syntax error when given ""."
  Update NEWS
 2015-02-04 12:48:57 +01:00
Julien Pauli
c85f12e3ac Revert "json_decode() should generate a syntax error when given ""." 
This reverts commit a7b3abe4e6.
 2015-02-04 12:48:17 +01:00
Dmitry Stogov
7169698088 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Add note aout $HTTP_RAW_POST_DATA
 2015-02-04 12:35:59 +03:00
Michael Wallner
ef058b7cb5 Add note aout $HTTP_RAW_POST_DATA 2015-02-04 10:22:52 +01:00
Dmitry Stogov
2428fd1c8b Use object pointers instead of handles 2015-02-04 12:01:55 +03:00
Michael Wallner
afcaa52c73 Merge branch 'PHP-5.6' 
* PHP-5.6:
  make buildconf work as expected; autoconf really needs some help with all those external m4s

Conflicts:
	build/build2.mk
 2015-02-04 09:50:14 +01:00
Michael Wallner
4c3b4dc74a make buildconf work as expected; 
autoconf really needs some help with all those external m4s
 2015-02-04 09:39:02 +01:00
Xinchen Hui
118ed493e1 Update UPGRADING 2015-02-04 14:25:06 +08:00
Xinchen Hui
17286ab869 Attempt to port odbc 2015-02-04 13:58:22 +08:00
Xinchen Hui
77b164edfd Update UPGRADING 2015-02-04 11:42:19 +08:00
Xinchen Hui
6fe8dce671 Merge branch 'resource-api' of https://github.com/laruence/php-src 2015-02-04 11:39:57 +08:00
Yasuo Ohgaki
6230493005 Update UPGRADING.INTERNALS Session section 2015-02-04 11:54:16 +09:00
Yasuo Ohgaki
dbb1298fdb Fixed typos in comments 2015-02-04 05:00:03 +09:00
Anatol Belski
55cefb2814 fix condition 
the headers member is allocated together with the SAPI globals struct
 2015-02-03 17:52:19 +01:00
Anatol Belski
73a6e7e24a fix int to void * cast 2015-02-03 17:52:18 +01:00
Anatol Belski
d920cc427b fix incompatible pointer warning 
php_alphasort() isn't directly compatible with qsort() cb def
 2015-02-03 17:52:18 +01:00
Anatol Belski
fe39840450 fix incompatible pointer type warning 2015-02-03 17:52:17 +01:00
Xinchen Hui
6c7d3ce09a Fixed pgsql tests 2015-02-03 23:50:58 +08:00
Xinchen Hui
ef1505821b Merge branch 'PHP-5.6' 2015-02-03 23:24:53 +08:00
Xinchen Hui
1bb7647c6e Fixed indent 2015-02-03 23:24:34 +08:00
Xinchen Hui
38829b3b4b Merge branch 'master' into resource-api 2015-02-03 23:01:48 +08:00
Dmitry Stogov
6720716682 Optimize class lookup 2015-02-03 17:39:05 +03:00
Xinchen Hui
22d8393bfa Merge branch 'fix-typo-new-output-api' of https://github.com/n0ts/php-src 2015-02-03 22:29:25 +08:00
Xinchen Hui
5a5c855154 attempt to port oci 2015-02-03 22:17:25 +08:00
Xinchen Hui
64caa97e02 Fixed test fails 2015-02-03 22:09:37 +08:00
Xinchen Hui
2c842dfce0 Fixed shmop tests fails 2015-02-03 22:07:31 +08:00
Xinchen Hui
d4546601f3 Fixed mysql tests fails 2015-02-03 22:04:24 +08:00
Yasuo Ohgaki
bffdc4c37e Update NEWS 2015-02-03 19:48:53 +09:00
Yasuo Ohgaki
539fd65915 Update NEWS 2015-02-03 19:45:20 +09:00
Yasuo Ohgaki
feef180e6c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed Bug #67988 htmlspecialchars() does not respect default_charset specified by ini_set.

Conflicts:
	main/main.c
	tests/basic/encoding.phpt
 2015-02-03 19:00:13 +09:00
Yasuo Ohgaki
436ba1c488 Fixed Bug #67988 htmlspecialchars() does not respect default_charset specified by ini_set. 2015-02-03 18:52:46 +09:00
Yasuo Ohgaki
30b4a32e09 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed Bug #65199 pg_copy_from() modifies input array variable

Conflicts:
	ext/pgsql/pgsql.c
 2015-02-03 15:40:59 +09:00
Yasuo Ohgaki
36f73412c1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #65199 pg_copy_from() modifies input array variable
 2015-02-03 15:27:19 +09:00
Yasuo Ohgaki
f8a8ccaba2 Fixed Bug #65199 pg_copy_from() modifies input array variable 2015-02-03 15:26:02 +09:00