php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
86,029 Commits 549 Branches 1,486 Tags
54868c84cebec2176208319ebbdbc92b4d7ff5a3
Commit Graph

86029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski 54868c84ce fix int to void* cast on x64 2014-11-12 17:57:15 +01:00
Matteo Beccati 55e01cda7a Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed NEWS
 2014-11-12 16:54:33 +01:00
Matteo Beccati 86127a077f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed NEWS
 2014-11-12 16:54:17 +01:00
Matteo Beccati faaea4f304 Fixed NEWS 
Some entries had been mistakenly removed in ad468d20b1
 2014-11-12 16:51:26 +01:00
Ferenc Kovacs 428f36198e Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
 2014-11-12 14:51:39 +01:00
Ferenc Kovacs 00e763f499 update NEWS 2014-11-12 14:51:18 +01:00
Ferenc Kovacs 37143666d4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
 2014-11-12 14:46:07 +01:00
Ferenc Kovacs fea84a1c9c update NEWS 2014-11-12 14:45:39 +01:00
Ferenc Kovacs 7691e58d30 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
 2014-11-12 14:29:11 +01:00
Ferenc Kovacs 5f15d6f0d8 update NEWS 2014-11-12 14:28:45 +01:00
Matteo Beccati 1f1b412e5a Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64
  Remove unneeded md5 hashing from PHP-5.6 branch. It's removed from master already by my previous commit.

Conflicts:
	ext/session/session.c
 2014-11-12 11:23:24 +01:00
Matteo Beccati 07655ffe7e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64
 2014-11-12 11:22:48 +01:00
Matteo Beccati 65fee90462 Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64 2014-11-12 11:21:11 +01:00
Julien Pauli 14d3e173aa Fixed wrong NEWS 2014-11-12 10:59:54 +01:00
Yasuo Ohgaki 9e072d9565 Remove unneeded md5 hashing from PHP-5.6 branch. 
It's removed from master already by my previous commit.
 2014-11-12 13:43:54 +09:00
Stanislav Malyshev 0326471a0a Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix loop - size_t is unsigned so can not be negative
  fix copypaste error

Conflicts:
	ext/standard/html.c
 2014-11-11 16:35:41 -08:00
Stanislav Malyshev 32fd4590a5 fix loop - size_t is unsigned so can not be negative 2014-11-11 16:34:50 -08:00
Stanislav Malyshev 1b143f4033 fix loop - size_t is unsigned so can not be negative 2014-11-11 16:33:02 -08:00
Stanislav Malyshev 4571cc2195 fix copypaste error 2014-11-11 16:33:02 -08:00
Stanislav Malyshev 99b538a722 Merge branch 'PHp-5.4' into PHP-5.5 
* PHp-5.4:
  5.4.36-dev
  Fixed bug #66584 Segmentation fault on statement deallocation

Conflicts:
	configure.in
	main/php_version.h
 2014-11-11 16:32:38 -08:00
Stanislav Malyshev 98b22864ff 5.4.36-dev 2014-11-11 16:31:38 -08:00
Matteo Beccati 2323e95df9 Fixed bug #66584 Segmentation fault on statement deallocation 2014-11-11 16:25:31 -08:00
Ferenc Kovacs cf468b0f5c Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
 2014-11-12 00:25:34 +01:00
Ferenc Kovacs 74d6c23b39 update NEWS 2014-11-12 00:25:16 +01:00
Ferenc Kovacs 9207179935 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
  update NEWS
  update NEWS
 2014-11-12 00:21:16 +01:00
Ferenc Kovacs a2e7b9162c update NEWS 2014-11-12 00:21:04 +01:00
Ferenc Kovacs 654bb8faf3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  update NEWS
 2014-11-12 00:20:54 +01:00
Ferenc Kovacs 791fc70025 update NEWS 2014-11-12 00:19:51 +01:00
Ferenc Kovacs b05e123cde Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
 2014-11-12 00:18:55 +01:00
Ferenc Kovacs db5ad4c51f update NEWS 2014-11-12 00:18:13 +01:00
Anatol Belski 1264731dd1 fix printf spec 2014-11-11 20:28:28 +01:00
Anatol Belski 0e6c7c6165 fix datatype mismatch and unused var warning 2014-11-11 20:16:13 +01:00
Anatol Belski 524f854193 eliminate duplicated identical function definitions 2014-11-11 18:24:21 +01:00
Anatol Belski 9757d9adbf generalize --with-php-build option handling 2014-11-11 18:24:20 +01:00
Anatol Belski c0db5cd93d refactor zts related config 2014-11-11 18:24:19 +01:00
Derick Rethans 3e8975bc95 Merge branch 'PHP-5.6' 2014-11-11 14:01:31 -03:00
Derick Rethans a19d96fc58 Merge branch 'PHP-5.5' into PHP-5.6 2014-11-11 14:01:26 -03:00
Derick Rethans 695a102ede - Updated to version 2014.10 (2014j) 2014-11-11 14:01:24 -03:00
Xinchen Hui 8511b33bd0 Update NEWs 2014-11-11 16:33:36 +08:00
Xinchen Hui 75b6f97334 Merge branch 'PHP-5.6' 
Conflicts:
	ext/soap/soap.c
 2014-11-11 16:31:32 +08:00
Xinchen Hui 399ec40a76 Update NEWS 2014-11-11 16:24:59 +08:00
Xinchen Hui e003c56c74 Merge branch 'PHP-5.5' into PHP-5.6 2014-11-11 16:23:18 +08:00
Xinchen Hui 327d4f9afb Fixed bug #68361 (Segmentation fault on SoapClient::__getTypes) 2014-11-11 16:22:49 +08:00
Anatol Belski 6d215f8cee fix trailing slash 2014-11-11 00:51:21 +01:00
Anatol Belski d509e79d70 further fixes to win build 
- fixed pdb generation with vs
- made object-out-dir to use an absolute path, that fixes path issues
  with x86/x64 and nmake snap
 2014-11-11 00:38:37 +01:00
Anatol Belski 64c081f347 moved libs and debug/release mode setup into functions 2014-11-10 23:30:16 +01:00
Anatol Belski 96805364fa fix var declaration used by macro conditions 2014-11-10 23:30:15 +01:00
Anatol Belski 5ad7cad103 fix sprintf spec 2014-11-10 23:30:15 +01:00
Anatol Belski 940e69147e fix var usage only when unistd.h available 2014-11-10 23:30:14 +01:00
Anatol Belski c3471cc1c9 cleanup unused variable 2014-11-10 23:30:13 +01:00