clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,749 Commits 494 Branches 1,367 Tags 807 MiB
77f5caae53
Commit Graph

32481 Commits

Author SHA1 Message Date
Christopher Jones
77f5caae53 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Remove compilation warning "warning: no newline at end of file"
 2013-08-20 11:04:51 -07:00
Christopher Jones
433225a929 Remove compilation warning "warning: no newline at end of file" 2013-08-20 11:04:26 -07:00
Christopher Jones
4883fc5365 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Remove compilation warnings: "warning: no newline at end of file"
 2013-08-20 11:03:26 -07:00
Christopher Jones
ec3f8d2b1f Remove compilation warnings: "warning: no newline at end of file" 2013-08-20 11:01:20 -07:00
Christopher Jones
8457636240 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix compile warning "intl_cppshims.h:34:7: warning: no newline at end of file"
 2013-08-20 10:55:16 -07:00
Christopher Jones
dfb187752e Fix compile warning "intl_cppshims.h:34:7: warning: no newline at end of file" 2013-08-20 10:55:10 -07:00
Christopher Jones
0e56277d35 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Tabify
  Eliminate compiler warnings: "warning: pointer targets in initialization differ in signedness"
  Eliminate compiler warnings "warning: pointer targets in initialization differ in signedness"
 2013-08-20 10:47:00 -07:00
Christopher Jones
db0166af2f Tabify 2013-08-20 10:46:15 -07:00
Christopher Jones
0ab8475db2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Eliminate compiler warnings: "warning: pointer targets in initialization differ in signedness"
  Eliminate compiler warnings "warning: pointer targets in initialization differ in signedness"
 2013-08-20 10:42:20 -07:00
Christopher Jones
d82f9339fe Eliminate compiler warnings: "warning: pointer targets in initialization differ in signedness" 2013-08-20 10:41:29 -07:00
Christopher Jones
eba85f91d8 Eliminate compiler warnings "warning: pointer targets in initialization differ in signedness" 2013-08-20 10:41:01 -07:00
Christopher Jones
8d614dcf54 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Remove some compilation warnings:   'unused variable' and   'enumeration value not handled in switch'
 2013-08-20 10:34:47 -07:00
Christopher Jones
7160adf4ad Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Remove some compilation warnings:   'unused variable' and   'enumeration value not handled in switch'
 2013-08-20 10:34:13 -07:00
Christopher Jones
b455ba971c Remove some compilation warnings: 
'unused variable' and
  'enumeration value not handled in switch'
 2013-08-20 10:33:00 -07:00
Anatol Belski
827100df82 split the glob() test to test different basedir 2013-08-20 13:40:19 +02:00
Yasuo Ohgaki
fdef0e38f7 Revert wrong description 2013-08-20 17:38:17 +09:00
Yasuo Ohgaki
7d538cf8dd Fixed test bug 2013-08-20 14:25:12 +09:00
Christopher Jones
24288eb4d1 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Remove compile warning:
      warning: unused variable ‘j’ [-Wunused-variable]
 2013-08-19 17:58:53 -07:00
Christopher Jones
1a00b9bd26 Remove compile warning: 
warning: unused variable ‘j’ [-Wunused-variable]
 2013-08-19 17:58:42 -07:00
Christopher Jones
5697aa5728 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Remove compile warnings:
      warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable]
      warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
  Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]
  Remove compile warnings:
      variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable]
      unused variable ‘last’ [-Wunused-variable]
      unused variable ‘j’ [-Wunused-variable]
  Remove compile warning "variable ‘mekeylen’ set but not used"
 2013-08-19 17:51:04 -07:00
Christopher Jones
83469477e7 Remove compile warnings: 
warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable]
  warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
 2013-08-19 17:48:46 -07:00
Christopher Jones
f69a5c520f Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable] 2013-08-19 17:46:50 -07:00
Christopher Jones
cf7f50748a Remove compile warnings: 
variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable]
  unused variable ‘last’ [-Wunused-variable]
  unused variable ‘j’ [-Wunused-variable]
 2013-08-19 17:44:36 -07:00
Christopher Jones
279b4fe614 Remove compile warning "variable ‘mekeylen’ set but not used" 2013-08-19 17:40:15 -07:00
Christopher Jones
19476f51f2 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
  Update NEWS
 2013-08-19 17:18:28 -07:00
Christopher Jones
d5979c88ea Reduce (some more) compile noise of 'unused variable' and 'may be used 
uninitialized' warnings.
 2013-08-19 17:17:54 -07:00
Michael Wallner
73cd2e0ab1 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix bug #65481 (shutdown segfault due to serialize)
 2013-08-20 00:09:26 +02:00
Michael Wallner
9d2cdacf4a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #65481 (shutdown segfault due to serialize)

Conflicts:
	ext/standard/var_unserializer.c
 2013-08-20 00:08:55 +02:00
Michael Wallner
1ac4d8f2c6 fix bug #65481 (shutdown segfault due to serialize) 2013-08-20 00:05:11 +02:00
Adam Harvey
2a46fc0470 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Track created curl_slist structs by option so they can be updated in situ.

Conflicts:
	ext/curl/interface.c
 2013-08-19 12:19:13 -07:00
Adam Harvey
69f12ad582 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Track created curl_slist structs by option so they can be updated in situ.

Conflicts:
	ext/curl/interface.c
 2013-08-19 12:16:36 -07:00
Adam Harvey
aa7d3d8e6d Track created curl_slist structs by option so they can be updated in situ. 
At present, when curl_setopt() is called with an option that requires the
creation of a curl_slist, we simply push the new curl_slist onto a list to be
freed when the curl handle is freed. This avoids a memory leak, but means that
repeated calls to curl_setopt() on the same handle with the same option wastes
previously allocated memory on curl_slist structs that will no longer be read.

This commit changes the zend_llist that was previously used to track the lists
to a HashTable keyed by the option number, which means that we can simply
update the hash table each time curl_setopt() is called.

Fixes bug #65458 (curl memory leak).
 2013-08-19 12:01:04 -07:00
Anatol Belski
f4df40108b fixed glob() edge case on windows, ref bug #47358 2013-08-19 14:21:16 +02:00
Anatol Belski
f61b648da4 modified the new glob() test for master 2013-08-19 11:22:18 +02:00
Anatol Belski
6c570ad322 Merge branch 'PHP-5.5' 
* PHP-5.5:
  added new glob() test
 2013-08-19 11:21:47 +02:00
Anatol Belski
cdc64f0345 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  added new glob() test
 2013-08-19 11:19:42 +02:00
Anatol Belski
4bad49e3bc added new glob() test 2013-08-19 11:17:13 +02:00
Stanislav Malyshev
cfe5833579 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix using wrong buffer pointer
 2013-08-19 01:07:50 -07:00
Stanislav Malyshev
8e0f110099 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix using wrong buffer pointer
 2013-08-19 01:04:19 -07:00
Stanislav Malyshev
cf96aa155e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix using wrong buffer pointer
 2013-08-19 01:03:18 -07:00
Stanislav Malyshev
c1c49d6e39 fix using wrong buffer pointer 2013-08-19 01:02:12 -07:00
Stanislav Malyshev
12c2a8a5eb Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix for php bug #64802 includes test case
 2013-08-18 16:55:03 -07:00
Stanislav Malyshev
bd29ff7c38 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix for php bug #64802 includes test case

Conflicts:
	ext/openssl/openssl.c
 2013-08-18 15:45:17 -07:00
Mark Jones
9973658a44 Fix for php bug #64802 includes test case 2013-08-18 15:42:37 -07:00
Stanislav Malyshev
1794291ebe Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Use pkg-config to detect iodbc
 2013-08-18 14:16:24 -07:00
Ole Markus With
a3fa25e857 Use pkg-config to detect iodbc 2013-08-18 14:16:17 -07:00
Stanislav Malyshev
8845262995 Merge branch 'pull-request/411' 
* pull-request/411:
  Use pkg-config to detect iodbc
 2013-08-18 14:15:53 -07:00
Stanislav Malyshev
2ee7e122a7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add -P option to use the current binary
  Create test to the extension xmlrpc
 2013-08-18 14:09:19 -07:00
Stanislav Malyshev
f4da131328 Merge branch 'pull-request/412' 
* pull-request/412:
  Create test to the extension xmlrpc
 2013-08-18 14:08:57 -07:00
root
ac2d2b9b72 Create test to the extension xmlrpc 2013-08-18 13:59:39 -07:00